Skip to content

Commit

Permalink
chore: upgrade multus to v4.1.3-thick and migrate config (#104)
Browse files Browse the repository at this point in the history
  • Loading branch information
scoquelin authored Oct 23, 2024
1 parent 32f6cc1 commit a479045
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 23 deletions.
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.

0 comments on commit a479045

Please sign in to comment.