Skip to content

Commit

Permalink
neonvm/multus: Add AKS support (#1059)
Browse files Browse the repository at this point in the history
The new file is exactly equal to what we'd previously hacked together.
  • Loading branch information
sharnoff committed Sep 24, 2024
1 parent eaec74e commit 3e6b8ff
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
28 changes: 28 additions & 0 deletions neonvm/config/multus-aks/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 3e6b8ff

Please sign in to comment.