diff --git a/gitops/components/multus/daemon-config.json b/gitops/components/multus/daemon-config.json index 780769a..ffdfe77 100644 --- a/gitops/components/multus/daemon-config.json +++ b/gitops/components/multus/daemon-config.json @@ -10,3 +10,4 @@ "multusConfigFile": "auto", "socketDir": "/host/run/multus/" } + diff --git a/gitops/components/multus/kustomization.yaml b/gitops/components/multus/kustomization.yaml index d70bc8f..c9d0b48 100644 --- a/gitops/components/multus/kustomization.yaml +++ b/gitops/components/multus/kustomization.yaml @@ -8,13 +8,6 @@ images: - name: ghcr.io/k8snetworkplumbingwg/multus-cni newTag: v4.1.3-thick -configMapGenerator: - - name: multus-daemon-config - namespace: kube-system - behavior: replace - files: - - daemon-config.json - patches: - target: group: apps @@ -28,6 +21,26 @@ patches: kind: DaemonSet name: kube-multus-ds path: ./overlays/multus-daemonset-readiness.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