Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump multus to v4.1.1 #1907

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −9
Open

bump multus to v4.1.1 #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ components:
metadata: v0.11.1
multus:
url: https://github.com/k8snetworkplumbingwg/multus-cni
commit: f03765681fe81ee1e0633ee1734bf48ab3bccf2b
commit: f1e887e2396c98e9aee6417723f2c5cd433a1cd2
branch: master
update-policy: tagged
metadata: v4.0.2
metadata: v4.1.1
multus-dynamic-networks:
url: https://github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller
commit: 489cb557d9a7b706a42a3fd233fb1977767bf2be
Expand Down
23 changes: 19 additions & 4 deletions data/multus/001-multus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ rules:
- pods/status
verbs:
- get
- list
- update
- watch
- apiGroups:
- ""
- events.k8s.io
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -186,6 +200,7 @@ spec:
memory: "15Mi"
securityContext:
privileged: true
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: cnibin
mountPath: /host/opt/cni/bin
Expand Down
2 changes: 1 addition & 1 deletion pkg/components/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var (
)

const (
MultusImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:3fbcc32bd4e4d15bd93c96def784a229cd84cca27942bf4858b581f31c97ee02"
MultusImageDefault = "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:fbe669471066f99f37f33bfc362f30f6c473c3850cb21f44813b84a5c3837e8f"
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"
Expand Down
4 changes: 2 additions & 2 deletions test/releases/99.0.0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:fbe669471066f99f37f33bfc362f30f6c473c3850cb21f44813b84a5c3837e8f",
},
{
ParentName: "dynamic-networks-controller-ds",
Expand All @@ -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:fbe669471066f99f37f33bfc362f30f6c473c3850cb21f44813b84a5c3837e8f",
},
{
ParentName: "bridge-marker",
Expand Down
Loading