bump multus version

- deploy multus thin plugin. update manifests accordingly - use sha256 digest as there is no recent release version of multus for now. Signed-off-by: adrianc <[email protected]>
Mellanox · Jun 24, 2024 · 18296b0 · 18296b0
1 parent cd0c869
commit 18296b0
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 22 deletions.
diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
@@ -362,9 +362,9 @@ secondaryNetwork:
     #       memory: "50Mi"
   multus:
     deploy: true
-    image: multus-cni
+    image: multus-cni@sha256
     repository: ghcr.io/k8snetworkplumbingwg
-    version: v3.9.3
+    version: ce1f91d6b49cb27bd0b92ac1c092727f0e5eca515728d994bfeda11e8b814cb8
     # imagePullSecrets: []
     # config: ''
     # containerResources:

diff --git a/hack/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml b/hack/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml
@@ -23,7 +23,7 @@ spec:
     singular: network-attachment-definition
     kind: NetworkAttachmentDefinition
     shortNames:
-    - net-attach-def
+      - net-attach-def
   versions:
     - name: v1
       served: true

diff --git a/hack/release.yaml b/hack/release.yaml
@@ -46,9 +46,9 @@ CniPlugins:
   repository: ghcr.io/k8snetworkplumbingwg
   version: v1.5.0
 Multus:
-  image: multus-cni
+  image: multus-cni@sha256
   repository: ghcr.io/k8snetworkplumbingwg
-  version: v3.9.3
+  version: cc3303520e83f8c158511d64176c136aeab3b22e190029611d005e90a5e57775
 Ipoib:
   image: ipoib-cni
   repository: ghcr.io/mellanox

diff --git a/manifests/state-multus-cni/0010-cluter_role.yml b/manifests/state-multus-cni/0010-cluter_role.yml
@@ -34,6 +34,8 @@ rules:
       - pods/status
     verbs:
       - get
+      - list
+      - watch
       - update
   - apiGroups:
       - ""

diff --git a/manifests/state-multus-cni/0040-configmap.yml b/manifests/state-multus-cni/0040-configmap.yml
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-{{ if .CrSpec.Config -}}
+{{- if .CrSpec.Config }}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -22,4 +22,4 @@ metadata:
     app: multus
 data:
   cni-conf.json: '{{ .CrSpec.Config }}'
-{{ end -}}
+{{- end }}
diff --git a/manifests/state-multus-cni/0050-multus-ds.yml b/manifests/state-multus-cni/0050-multus-ds.yml
@@ -19,8 +19,12 @@ spec:
         tier: node
         app: multus
         name: multus
+      annotations:
+        cluster-autoscaler.kubernetes.io/enable-ds-eviction: "false"
     spec:
       hostNetwork: true
+      priorityClassName: "system-node-critical"
+      terminationGracePeriodSeconds: 10
       {{- if .NodeAffinity }}
       affinity:
         nodeAffinity:
@@ -40,21 +44,34 @@ spec:
         - key: nvidia.com/gpu
           operator: Exists
           effect: NoSchedule
+      initContainers:
+        - name: install-multus-binary
+          image: {{ .CrSpec.Repository }}/{{ .CrSpec.Image }}:{{ .CrSpec.Version }}
+          command: ["/install_multus"]
+          args:
+            - "--type"
+            - "thin"
+          resources:
+            requests:
+              cpu: "10m"
+              memory: "15Mi"
+          securityContext:
+            privileged: true
+          terminationMessagePolicy: FallbackToLogsOnError
+          volumeMounts:
+            - name: cnibin
+              mountPath: /host/opt/cni/bin
+              mountPropagation: Bidirectional
       containers:
         - name: kube-multus
           image: {{ .CrSpec.Repository }}/{{ .CrSpec.Image }}:{{ .CrSpec.Version }}
-          command: ["/entrypoint.sh"]
+          command: ["/thin_entrypoint"]
           args:
-            - "--cni-version=0.3.1"
             # /tmp/multus-conf/00-multus.conf is where multus-cfg ConfigMap is mounted then entrypoint.sh copy it to
             # /host/etc/cni/net.d/00-multus.conf
             - "--multus-conf-file={{- if .CrSpec.Config -}}/tmp/multus-conf/00-multus.conf{{- else -}}auto{{- end -}}"
-          # Remove multus config file to prevent failing of creating/deleting pods since multus will fail due to
-          # permission issue, https://github.com/intel/multus-cni/issues/592
-          lifecycle:
-            preStop:
-              exec:
-                command: ["/bin/sh", "-c", "rm -f /host/etc/cni/net.d/00-multus.conf"]
+            - "--multus-autoconfig-dir=/host/etc/cni/net.d"
+            - "--cni-conf-dir=/host/etc/cni/net.d"
           {{- with .RuntimeSpec.ContainerResources }}
           {{- with index . "kube-multus" }}
           resources:
@@ -78,13 +95,14 @@ spec:
           {{- end }}
           securityContext:
             privileged: true
+          terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
             - name: cni
               mountPath: /host/etc/cni/net.d
             - name: cnibin
               mountPath: /host/opt/cni/bin
           {{- if .CrSpec.Config }}
-            - name: multus-cfg
+            - name: multus-cni-config
               mountPath: /tmp/multus-conf
           {{- end }}
       volumes:
@@ -95,10 +113,10 @@ spec:
           hostPath:
             path: {{ .RuntimeSpec.CniBinDirectory }}
       {{- if .CrSpec.Config }}
-        - name: multus-cfg
+        - name: multus-cni-config
           configMap:
             name: multus-cni-config
             items:
-              - key: cni-conf.json
-                path: 00-multus.conf
-      {{- end }}
+            - key: cni-conf.json
+              path: 00-multus.conf
+      {{- end}}
diff --git a/pkg/state/state_multus_cni_test.go b/pkg/state/state_multus_cni_test.go
@@ -281,14 +281,14 @@ var _ = Describe("Multus CNI state", func() {
 
 			Expect(daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts).To(ContainElement(
 				corev1.VolumeMount{
-					Name:      "multus-cfg",
+					Name:      "multus-cni-config",
 					MountPath: "/tmp/multus-conf",
 				},
 			))
 
 			Expect(daemonSet.Spec.Template.Spec.Volumes).To(ContainElement(
 				corev1.Volume{
-					Name: "multus-cfg",
+					Name: "multus-cni-config",
 					VolumeSource: corev1.VolumeSource{
 						ConfigMap: &corev1.ConfigMapVolumeSource{
 							LocalObjectReference: corev1.LocalObjectReference{
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,8 @@ rules: @@
           - pods/status
         verbs:
           - get
+          - list
+          - watch
           - update
       - apiGroups:
           - ""
@@ Expand Down @@