diff --git a/components.yaml b/components.yaml index 04eff5341..31a8a9be0 100644 --- a/components.yaml +++ b/components.yaml @@ -37,10 +37,10 @@ components: metadata: v0.11.1 multus: url: https://github.com/k8snetworkplumbingwg/multus-cni - commit: f03765681fe81ee1e0633ee1734bf48ab3bccf2b + commit: 3c33f6f02886da801643391f13d601c11ed6c9c6 branch: master update-policy: tagged - metadata: v4.0.2 + metadata: v4.1.0 multus-dynamic-networks: url: https://github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller commit: 489cb557d9a7b706a42a3fd233fb1977767bf2be diff --git a/data/multus/001-multus.yaml b/data/multus/001-multus.yaml index a2a9cc268..ba4704acf 100644 --- a/data/multus/001-multus.yaml +++ b/data/multus/001-multus.yaml @@ -61,7 +61,9 @@ rules: - pods/status verbs: - get + - list - update + - watch - apiGroups: - "" - events.k8s.io @@ -103,13 +105,13 @@ data: daemon-config.json: | { "chrootDir": "/hostroot", - "confDir": "/host/etc/cni/net.d", - "logLevel": "verbose", - "socketDir": "/host/run/multus/", "cniVersion": "0.3.1", + "logLevel": "verbose", + "logToStderr": true, "cniConfigDir": "/host/etc/cni/net.d", + "multusAutoconfigDir": "/host/etc/cni/net.d", "multusConfigFile": "auto", - "multusAutoconfigDir": "/host/etc/cni/net.d" + "socketDir": "/host/run/multus/" } --- apiVersion: apps/v1 @@ -148,15 +150,22 @@ spec: memory: "15Mi" securityContext: privileged: true + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - name: cni mountPath: /host/etc/cni/net.d + # multus-daemon expects that cnibin path must be identical between pod and container host. + # e.g. if the cni bin is in /opt/cni/bin on the container host side, then it should be mount to /opt/cni/bin in multus-daemon, + # not to any other directory, like /opt/bin or /usr/bin. + - name: cnibin + mountPath: /opt/cni/bin - name: host-run mountPath: /host/run - name: host-var-lib-cni-multus mountPath: /var/lib/cni/multus - name: host-var-lib-kubelet mountPath: /var/lib/kubelet + mountPropagation: HostToContainer - name: host-run-k8s-cni-cncf-io mountPath: /run/k8s.cni.cncf.io - name: host-run-netns @@ -168,6 +177,11 @@ spec: - name: hostroot mountPath: /hostroot mountPropagation: HostToContainer + env: + - name: MULTUS_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName imagePullPolicy: {{ .ImagePullPolicy }} lifecycle: preStop: @@ -186,6 +200,7 @@ spec: memory: "15Mi" securityContext: privileged: true + terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - name: cnibin mountPath: /host/opt/cni/bin diff --git a/pkg/components/components.go b/pkg/components/components.go index 6eb9220ae..4ccfe1d30 100644 --- a/pkg/components/components.go +++ b/pkg/components/components.go @@ -30,7 +30,7 @@ var ( ) const ( - MultusImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:3fbcc32bd4e4d15bd93c96def784a229cd84cca27942bf4858b581f31c97ee02" + MultusImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:5e8b897b268e5071ad955888abd5e529f14f7c219be1c6c69536439a1689622d" MultusDynamicNetworksImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:83b460502671fb4f34116363a1a39b2ddfc9d14a920ee0a6413bfc3bd0580404" LinuxBridgeCniImageDefault = "quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be" LinuxBridgeMarkerImageDefault = "quay.io/kubevirt/bridge-marker@sha256:18d954d58b9830738df9bf5c9a575d22b33096d1af26fb6bc2da09fb31c9f73a" diff --git a/test/releases/99.0.0.go b/test/releases/99.0.0.go index 5922562fc..fda495b6e 100644 --- a/test/releases/99.0.0.go +++ b/test/releases/99.0.0.go @@ -12,7 +12,7 @@ func init() { ParentName: "multus", ParentKind: "DaemonSet", Name: "kube-multus", - Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:3fbcc32bd4e4d15bd93c96def784a229cd84cca27942bf4858b581f31c97ee02", + Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:5e8b897b268e5071ad955888abd5e529f14f7c219be1c6c69536439a1689622d", }, { ParentName: "dynamic-networks-controller-ds", @@ -24,7 +24,7 @@ func init() { ParentName: "multus", ParentKind: "DaemonSet", Name: "install-multus-binary", - Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:3fbcc32bd4e4d15bd93c96def784a229cd84cca27942bf4858b581f31c97ee02", + Image: "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:5e8b897b268e5071ad955888abd5e529f14f7c219be1c6c69536439a1689622d", }, { ParentName: "bridge-marker",