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.

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

chore: upgrade multus to v4.1.3-thick and migrate config #104

Merged
merged 2 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 22 additions & 8 deletions gitops/components/multus/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

resources:
- https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v3.9.3/deployments/multus-daemonset.yml
- https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v4.1.3/deployments/multus-daemonset-thick.yml

images:
- name: ghcr.io/k8snetworkplumbingwg/multus-cni
newTag: v3.9.3
newTag: v4.1.3-thick

patches:
- target:
Expand All @@ -21,12 +21,26 @@ patches:
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-readiness.yaml
- target:
group: apps
version: v1
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-container-args.yaml
- patch: |-
apiVersion: v1
kind: ConfigMap
metadata:
name: multus-daemon-config
namespace: kube-system
data:
daemon-config.json: |
{
"chrootDir": "/hostroot",
"cniVersion": "0.4.0",
"logFile": "/var/log/aws-routed-eni/multus.log",
"logLevel": "error",
"logToStderr": true,
"cniConfigDir": "/host/etc/cni/net.d",
"multusAutoconfigDir": "/host/etc/cni/net.d",
"multusMasterCNI": "10-aws.conflist",
"multusConfigFile": "auto",
"socketDir": "/host/run/multus/"
}
- target:
group: argoproj.io
version: v1alpha1
Expand Down

This file was deleted.