diff --git a/kubernetes/apps/networking/multus/app/helmrelease.yaml b/kubernetes/apps/networking/multus/app/helmrelease.yaml index 0d9fae20b..49b080478 100644 --- a/kubernetes/apps/networking/multus/app/helmrelease.yaml +++ b/kubernetes/apps/networking/multus/app/helmrelease.yaml @@ -25,15 +25,11 @@ spec: controllers: multus: type: daemonset - annotations: - reloader.stakater.com/auto: "true" initContainers: cni-plugins: image: repository: ghcr.io/buroa/cni-plugins - tag: 1.6.1@sha256:b6e77bcf43e6d49a1e73271331380501fda10715df9a266d07cf1ad28805d717 - env: - CNI_BIN_DIR: &dir /opt/cni/bin + tag: 1.6.1@sha256:a74f18b40c5c6679cd35cc420c902a1d83ba0e4a4e3e46428fa35e74015b8a6c containers: multus: image: @@ -45,30 +41,22 @@ spec: - --cni-bin-dir=/opt/cni/bin - --cni-conf-dir=/etc/cni/net.d - --cleanup-config-on-exit=true - - --multus-conf-file=/config/00-multus.conf resources: requests: cpu: 10m limits: - memory: 512Mi + memory: 128Mi securityContext: privileged: true defaultPodOptions: hostNetwork: true persistence: - config: - type: configMap - name: multus-configmap - globalMounts: - - path: /config/00-multus.conf - subPath: 00-multus.conf - readOnly: true etc-cni-net-d: type: hostPath hostPath: /etc/cni/net.d opt-cni-bin: type: hostPath - hostPath: *dir + hostPath: /opt/cni/bin serviceAccount: create: true name: *app diff --git a/kubernetes/apps/networking/multus/app/kustomization.yaml b/kubernetes/apps/networking/multus/app/kustomization.yaml index 3b07f8a5f..b4e898a63 100644 --- a/kubernetes/apps/networking/multus/app/kustomization.yaml +++ b/kubernetes/apps/networking/multus/app/kustomization.yaml @@ -6,9 +6,3 @@ resources: - https://raw.githubusercontent.com/k8snetworkplumbingwg/network-attachment-definition-client/refs/tags/v1.7.5/artifacts/networks-crd.yaml - ./helmrelease.yaml - ./rbac.yaml -configMapGenerator: - - name: multus-configmap - files: - - ./resources/00-multus.conf -generatorOptions: - disableNameSuffixHash: true diff --git a/kubernetes/apps/networking/multus/app/resources/00-multus.conf b/kubernetes/apps/networking/multus/app/resources/00-multus.conf deleted file mode 100644 index 365e5bc44..000000000 --- a/kubernetes/apps/networking/multus/app/resources/00-multus.conf +++ /dev/null @@ -1,15 +0,0 @@ -{ - "cniVersion": "0.3.1", - "name": "multus-cni-network", - "type": "multus", - "delegates": [ - { - "type": "cilium-cni", - "name": "cilium", - "delegate": { - "isDefaultGateway": true - } - } - ], - "kubeconfig": "/etc/cni/net.d/multus.d/multus.kubeconfig" -}