From 3e6b8ffa1bad43beccdb561caca3d970da2b797d Mon Sep 17 00:00:00 2001 From: Em Sharnoff Date: Mon, 2 Sep 2024 11:19:13 -0700 Subject: [PATCH] neonvm/multus: Add AKS support (#1059) The new file is exactly equal to what we'd previously hacked together. --- .github/workflows/release.yaml | 1 + Makefile | 2 ++ neonvm/config/multus-aks/kustomization.yaml | 28 +++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 neonvm/config/multus-aks/kustomization.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 97bf07d18..f30a7bac0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -90,6 +90,7 @@ jobs: rendered_manifests/neonvm.yaml rendered_manifests/neonvm-runner-image-loader.yaml rendered_manifests/multus.yaml + rendered_manifests/multus-aks.yaml rendered_manifests/multus-eks.yaml rendered_manifests/whereabouts.yaml deploy/vmscrape.yaml diff --git a/Makefile b/Makefile index e59a6c51d..8adb85c1f 100644 --- a/Makefile +++ b/Makefile @@ -289,6 +289,7 @@ render-manifests: $(RENDERED) kustomize cd deploy/agent && $(KUSTOMIZE) edit set image autoscaler-agent=$(IMG_AUTOSCALER_AGENT) && $(KUSTOMIZE) edit add annotation buildtime:$(BUILDTS) --force # Build: $(KUSTOMIZE) build neonvm/config/whereabouts > $(RENDERED)/whereabouts.yaml + $(KUSTOMIZE) build neonvm/config/multus-aks > $(RENDERED)/multus-aks.yaml $(KUSTOMIZE) build neonvm/config/multus-eks > $(RENDERED)/multus-eks.yaml $(KUSTOMIZE) build neonvm/config/multus > $(RENDERED)/multus.yaml $(KUSTOMIZE) build neonvm/config > $(RENDERED)/neonvm.yaml @@ -311,6 +312,7 @@ render-release: $(RENDERED) kustomize cd deploy/agent && $(KUSTOMIZE) edit set image autoscaler-agent=$(IMG_AUTOSCALER_AGENT) # Build: $(KUSTOMIZE) build neonvm/config/whereabouts > $(RENDERED)/whereabouts.yaml + $(KUSTOMIZE) build neonvm/config/multus-aks > $(RENDERED)/multus-aks.yaml $(KUSTOMIZE) build neonvm/config/multus-eks > $(RENDERED)/multus-eks.yaml $(KUSTOMIZE) build neonvm/config/multus > $(RENDERED)/multus.yaml $(KUSTOMIZE) build neonvm/config > $(RENDERED)/neonvm.yaml diff --git a/neonvm/config/multus-aks/kustomization.yaml b/neonvm/config/multus-aks/kustomization.yaml new file mode 100644 index 000000000..50d823340 --- /dev/null +++ b/neonvm/config/multus-aks/kustomization.yaml @@ -0,0 +1,28 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../multus-common + +images: +- name: multus-cni + newName: ghcr.io/k8snetworkplumbingwg/multus-cni + newTag: v3.9.2 + +patches: +- target: + kind: DaemonSet + name: kube-multus-ds + patch: |- + - op: replace + path: /spec/template/spec/containers/0/command + value: ["/entrypoint.sh"] + - op: replace + path: /spec/template/spec/containers/0/args + value: + - "--multus-conf-file=auto" + - "--cni-version=0.3.1" + - "--multus-master-cni-file-name=10-azure.conflist" + - "--multus-log-level=error" + - "--multus-log-file=/var/log/neon-multus.log" +