whereabouts: bump to v0.5.4

Signed-off-by: Jed Lejosne <[email protected]>
kubevirt · Aug 2, 2022 · 6f3e155 · 6f3e155
1 parent c8c66f6
commit 6f3e155
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 28 deletions.
diff --git a/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml b/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml
@@ -161,6 +161,24 @@ rules:
   - pods
   verbs:
   - list
+  - watch
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  - events.k8s.io
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -184,8 +202,10 @@ metadata:
   name: ip-reconciler
   namespace: kube-system
 spec:
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
+      backoffLimit: 0
       template:
         metadata:
           labels:
@@ -195,7 +215,7 @@ spec:
           - command:
             - /ip-reconciler
             - -log-level=verbose
-            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
             name: whereabouts
             resources:
               requests:
@@ -211,7 +231,9 @@ spec:
           - hostPath:
               path: /etc/cni/net.d
             name: cni-net-dir
+      ttlSecondsAfterFinished: 300
   schedule: '*/5 * * * *'
+  successfulJobsHistoryLimit: 0
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -233,12 +255,18 @@ spec:
         tier: node
     spec:
       containers:
-      - env:
+      - args:
+        - -c
+        - |
+          SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
+        command:
+        - /bin/sh
+        env:
         - name: WHEREABOUTS_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
         name: whereabouts
         resources:
           limits:

diff --git a/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml b/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml
@@ -161,6 +161,24 @@ rules:
   - pods
   verbs:
   - list
+  - watch
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  - events.k8s.io
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -184,8 +202,10 @@ metadata:
   name: ip-reconciler
   namespace: kube-system
 spec:
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
+      backoffLimit: 0
       template:
         metadata:
           labels:
@@ -195,7 +215,7 @@ spec:
           - command:
             - /ip-reconciler
             - -log-level=verbose
-            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
             name: whereabouts
             resources:
               requests:
@@ -211,7 +231,9 @@ spec:
           - hostPath:
               path: /etc/cni/net.d
             name: cni-net-dir
+      ttlSecondsAfterFinished: 300
   schedule: '*/5 * * * *'
+  successfulJobsHistoryLimit: 0
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -233,12 +255,18 @@ spec:
         tier: node
     spec:
       containers:
-      - env:
+      - args:
+        - -c
+        - |
+          SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
+        command:
+        - /bin/sh
+        env:
         - name: WHEREABOUTS_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
         name: whereabouts
         resources:
           limits:

diff --git a/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml b/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml
@@ -161,6 +161,24 @@ rules:
   - pods
   verbs:
   - list
+  - watch
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  - events.k8s.io
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -184,8 +202,10 @@ metadata:
   name: ip-reconciler
   namespace: kube-system
 spec:
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
+      backoffLimit: 0
       template:
         metadata:
           labels:
@@ -195,7 +215,7 @@ spec:
           - command:
             - /ip-reconciler
             - -log-level=verbose
-            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
             name: whereabouts
             resources:
               requests:
@@ -211,7 +231,9 @@ spec:
           - hostPath:
               path: /etc/cni/net.d
             name: cni-net-dir
+      ttlSecondsAfterFinished: 300
   schedule: '*/5 * * * *'
+  successfulJobsHistoryLimit: 0
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -233,12 +255,18 @@ spec:
         tier: node
     spec:
       containers:
-      - env:
+      - args:
+        - -c
+        - |
+          SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
+        command:
+        - /bin/sh
+        env:
         - name: WHEREABOUTS_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
         name: whereabouts
         resources:
           limits:

diff --git a/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml b/...nifests/whereabouts/whereabouts-v0.5.yaml → ...fests/whereabouts/whereabouts-v0.5.4.yaml
@@ -161,6 +161,24 @@ rules:
   - pods
   verbs:
   - list
+  - watch
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  - events.k8s.io
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -184,8 +202,10 @@ metadata:
   name: ip-reconciler
   namespace: kube-system
 spec:
+  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
+      backoffLimit: 0
       template:
         metadata:
           labels:
@@ -195,7 +215,7 @@ spec:
           - command:
             - /ip-reconciler
             - -log-level=verbose
-            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+            image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
             name: whereabouts
             resources:
               requests:
@@ -211,7 +231,9 @@ spec:
           - hostPath:
               path: /etc/cni/net.d
             name: cni-net-dir
+      ttlSecondsAfterFinished: 300
   schedule: '*/5 * * * *'
+  successfulJobsHistoryLimit: 0
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -233,12 +255,18 @@ spec:
         tier: node
     spec:
       containers:
-      - env:
+      - args:
+        - -c
+        - |
+          SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
+        command:
+        - /bin/sh
+        env:
         - name: WHEREABOUTS_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
+        image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
         name: whereabouts
         resources:
           limits:

diff --git a/hack/bump-whereabouts.sh b/hack/bump-whereabouts.sh
@@ -49,6 +49,7 @@ cd -
 manifests_dir=doc
 [[ -d ${tmp_dir}/whereabouts/doc/crds ]] && manifests_dir=doc/crds
 cp hack/kustomization/whereabouts/*.yaml ${tmp_dir}/whereabouts/${manifests_dir}/
+sed -i "s/##VERSION##/${whereabouts_version}/" ${tmp_dir}/whereabouts/${manifests_dir}/kustomization.yaml
 
 target_dir="cluster-provision/k8s/${provider}/manifests/whereabouts"
 mkdir -p ${target_dir}

diff --git a/hack/kustomization/whereabouts/kustomization.yaml b/hack/kustomization/whereabouts/kustomization.yaml
@@ -7,5 +7,6 @@ resources:
 - ./whereabouts.cni.cncf.io_ippools.yaml
 - ./whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml
 
-transformers:
-  - patch-ip-reconciler-job.yaml
+images:
+  - name: ghcr.io/k8snetworkplumbingwg/whereabouts
+    newTag: ##VERSION##-amd64
diff --git a/hack/kustomization/whereabouts/patch-ip-reconciler-job.yaml b/hack/kustomization/whereabouts/patch-ip-reconciler-job.yaml