From 3f33b963a8af164b3bc2424e85067630db472459 Mon Sep 17 00:00:00 2001
From: Damien Chomat <chomatdam@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:05:25 +0000
Subject: [PATCH] fix: multus v4 multus binary install (#107)

---
 gitops/components/multus/kustomization.yaml       |  7 +++++++
 .../temporary-fix-install-multus-binary.yaml      | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 gitops/components/multus/overlays/temporary-fix-install-multus-binary.yaml

diff --git a/gitops/components/multus/kustomization.yaml b/gitops/components/multus/kustomization.yaml
index c9d0b48..bae2245 100644
--- a/gitops/components/multus/kustomization.yaml
+++ b/gitops/components/multus/kustomization.yaml
@@ -21,6 +21,13 @@ patches:
       kind: DaemonSet
       name: kube-multus-ds
     path: ./overlays/multus-daemonset-readiness.yaml
+  # https://github.com/k8snetworkplumbingwg/multus-cni/issues/1221
+  - path: ./overlays/temporary-fix-install-multus-binary.yaml
+    target:
+      group: apps
+      version: v1
+      kind: DaemonSet
+      name: kube-multus-ds
   - patch: |-
       apiVersion: v1
       kind: ConfigMap
diff --git a/gitops/components/multus/overlays/temporary-fix-install-multus-binary.yaml b/gitops/components/multus/overlays/temporary-fix-install-multus-binary.yaml
new file mode 100644
index 0000000..839df2f
--- /dev/null
+++ b/gitops/components/multus/overlays/temporary-fix-install-multus-binary.yaml
@@ -0,0 +1,15 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: kube-multus-ds
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: install-multus-binary
+          image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
+          command:
+            - "cp"
+            - "-f"
+            - "/usr/src/multus-cni/bin/multus-shim"
+            - "/host/opt/cni/bin/multus-shim"