diff --git a/data/multus/001-multus.yaml b/data/multus/001-multus.yaml index b76fb5af9..b96d03fc9 100644 --- a/data/multus/001-multus.yaml +++ b/data/multus/001-multus.yaml @@ -138,8 +138,10 @@ spec: mountPath: /host/etc/cni/net.d - name: host-run mountPath: /host/run - - name: cnicache - mountPath: /host/var/lib/cni + - name: host-var-lib-cni-multus + mountPath: /var/lib/cni/multus + - name: host-var-lib-kubelet + mountPath: /var/lib/kubelet - name: host-run-k8s-cni-cncf-io mountPath: /run/k8s.cni.cncf.io - name: host-run-netns @@ -181,14 +183,15 @@ spec: - name: cnibin hostPath: path: {{ .CNIBinDir }} - - name: cnicache + - name: hostroot + hostPath: + path: / + - name: multus-daemon-config configMap: name: multus-daemon-config items: - key: daemon-config.json path: daemon-config.json - hostPath: - path: /var/lib/cni - name: host-run hostPath: path: /run diff --git a/hack/components/bump-multus.sh b/hack/components/bump-multus.sh index dc233a1dc..8a6227c64 100755 --- a/hack/components/bump-multus.sh +++ b/hack/components/bump-multus.sh @@ -27,14 +27,8 @@ function __parametize_by_object() { yaml-utils::set_param ${f} spec.template.spec.containers[0].imagePullPolicy '{{ .ImagePullPolicy }}' yaml-utils::update_param ${f} spec.template.spec.initContainers[0].image '{{ .MultusImage }}' yaml-utils::set_param ${f} spec.template.spec.priorityClassName 'system-cluster-critical' - yaml-utils::delete_param ${f} spec.template.spec.containers[0].volumeMounts[2] - yaml-utils::set_param ${f} spec.template.spec.containers[0].volumeMounts[2].name 'cnicache' - yaml-utils::set_param ${f} spec.template.spec.containers[0].volumeMounts[2].mountPath '/host/var/lib/cni' yaml-utils::update_param ${f} spec.template.spec.volumes[0].hostPath.path '{{ .CNIConfigDir }}' yaml-utils::update_param ${f} spec.template.spec.volumes[1].hostPath.path '{{ .CNIBinDir }}' - yaml-utils::delete_param ${f} spec.template.spec.volumes[2] - yaml-utils::set_param ${f} spec.template.spec.volumes[2].name 'cnicache' - yaml-utils::set_param ${f} spec.template.spec.volumes[2].hostPath.path '/var/lib/cni' yaml-utils::delete_param ${f} spec.template.spec.containers[0].resources.limits yaml-utils::update_param ${f} spec.template.spec.containers[0].resources.requests.cpu '"10m"' yaml-utils::update_param ${f} spec.template.spec.containers[0].resources.requests.memory '"15Mi"' diff --git a/pkg/components/components.go b/pkg/components/components.go index 49ffcc13e..f93081b7e 100644 --- a/pkg/components/components.go +++ b/pkg/components/components.go @@ -29,7 +29,7 @@ var ( ) const ( - MultusImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:ccc6ac85da5f32c86d65b291b0a9555f75bb878b66f0af2d05698d05f8ab440b" + MultusImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:09a572e8bdf8a398db024ca252d06cf3ac0a03e07ae547d6a84221d4f6a9f96f" LinuxBridgeCniImageDefault = "quay.io/kubevirt/cni-default-plugins@sha256:5d9442c26f8750d44f97175f36dbd74bef503f782b9adefcfd08215d065c437a" LinuxBridgeMarkerImageDefault = "quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2" KubeMacPoolImageDefault = "quay.io/kubevirt/kubemacpool@sha256:fb07b1be9e0990e3846ef628e993694bf0765602af5907abf98f7e218db0cb4a" diff --git a/test/releases/99.0.0.go b/test/releases/99.0.0.go index 3b6985f48..345b62dac 100644 --- a/test/releases/99.0.0.go +++ b/test/releases/99.0.0.go @@ -13,13 +13,13 @@ func init() { ParentName: "multus", ParentKind: "DaemonSet", Name: "kube-multus", - Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:ccc6ac85da5f32c86d65b291b0a9555f75bb878b66f0af2d05698d05f8ab440b", + Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:09a572e8bdf8a398db024ca252d06cf3ac0a03e07ae547d6a84221d4f6a9f96f", }, { ParentName: "multus", ParentKind: "DaemonSet", Name: "install-multus-binary", - Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:ccc6ac85da5f32c86d65b291b0a9555f75bb878b66f0af2d05698d05f8ab440b", + Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:09a572e8bdf8a398db024ca252d06cf3ac0a03e07ae547d6a84221d4f6a9f96f", }, { ParentName: "bridge-marker",