fix(multus): Actually install CNI plugins

bjw-s-labs · Jan 14, 2025 · 4baa2fa · 4baa2fa
1 parent d879295
commit 4baa2fa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 69 deletions.
diff --git a/kubernetes/apps/network/multus/app/helmrelease.yaml b/kubernetes/apps/network/multus/app/helmrelease.yaml
@@ -18,44 +18,18 @@ spec:
 
   values:
     controllers:
-      uninstall:
-        type: job
-
-        annotations:
-          # This is what defines this resource as a hook. Without this line, the
-          # job is considered part of the release.
-          helm.sh/hook: pre-delete, pre-upgrade
-          helm.sh/hook-weight: "-5"
-          helm.sh/hook-delete-policy: hook-succeeded
-
-        pod:
-          hostNetwork: true
-
-        containers:
-          uninstall:
-            image:
-              repository: docker.io/library/alpine
-              tag: "3.21"
-
-            command:
-              - /bin/sh
-              - -c
-
-            args:
-              - |
-                set -x
-                rm -rf /host/etc/cni/net.d/*multus*
-                rm -rf /host/opt/cni/bin/*multus*
-
       multus:
         type: daemonset
 
-        annotations:
-          reloader.stakater.com/auto: "true"
-
         pod:
           hostNetwork: true
 
+        initContainers:
+          cni-plugins:
+            image:
+              repository: ghcr.io/buroa/cni-plugins
+              tag: 1.6.2
+
         containers:
           multus:
             image:
@@ -65,8 +39,8 @@ spec:
               - /thin_entrypoint
             args:
               - --multus-conf-file=/config/00-multus.conf
-              - --cni-bin-dir=/opt/cni/bin
-              - --cni-conf-dir=/etc/cni/net.d
+              - --cni-bin-dir=/host/opt/cni/bin
+              - --cni-conf-dir=/host/etc/cni/net.d
             resources:
               requests:
                 cpu: "10m"
@@ -76,19 +50,16 @@ spec:
               privileged: 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
+        globalMounts:
+          - path: /host/etc/cni/net.d
       opt-cni-bin:
         type: hostPath
         hostPath: /opt/cni/bin
+        globalMounts:
+          - path: /host/opt/cni/bin
 
     serviceAccount:
       create: true

diff --git a/kubernetes/apps/network/multus/app/kustomization.yaml b/kubernetes/apps/network/multus/app/kustomization.yaml
@@ -7,9 +7,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/network/multus/app/resources/00-multus.conf b/kubernetes/apps/network/multus/app/resources/00-multus.conf
diff --git a/kubernetes/apps/network/multus/networks/iot.yaml b/kubernetes/apps/network/multus/networks/iot.yaml
@@ -13,19 +13,12 @@ spec:
           "type": "macvlan",
           "master": "bond0.303",
           "mode": "bridge",
-          "capabilities": {
-            "ips": true
-          },
           "ipam": {
             "type": "static",
             "routes": [
               { "dst": "10.1.2.0/24", "gw": "10.1.3.1" }
             ]
           }
-        },
-        {
-          "capabilities": { "mac": true },
-          "type": "tuning"
         }
       ]
     }