From 947ac2831307d4949b20cade0e11835ce29b8c5d Mon Sep 17 00:00:00 2001 From: Santhosh Prabhu Date: Wed, 15 Jan 2025 09:44:19 -0800 Subject: [PATCH 1/5] feat: nodesubnet cilium target in makefile --- hack/aks/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 2df03770b2..2ba59fe4f3 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -342,6 +342,20 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT --yes @$(MAKE) set-kubeconf +nodesubnet-cilium-up: rg-up overlay-net-up ## Brings up a Nodesubnet Cilium cluster + $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ + --auto-upgrade-channel $(AUTOUPGRADE) \ + --node-os-upgrade-channel $(NODEUPGRADE) \ + --kubernetes-version $(K8S_VER) \ + --node-count $(NODE_COUNT) \ + --node-vm-size $(VM_SIZE) \ + --network-plugin azure \ + --network-dataplane cilium \ + --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ + --no-ssh-key \ + --yes + @$(MAKE) set-kubeconf + windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ From 02ce1292fb41ed25e97801166b41291e8f7eeb28 Mon Sep 17 00:00:00 2001 From: Santhosh Prabhu Date: Wed, 21 May 2025 14:42:39 -0700 Subject: [PATCH 2/5] chore: cleanup --- hack/aks/Makefile | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 42d182e05d..66aee0a3e2 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -407,25 +407,9 @@ nodesubnet-cilium-up: rg-up ipv4 overlay-net-up ## Brings up a Nodesubnet Cilium --no-ssh-key \ $(LTS_ARGS) \ --yes - @$(MAKE) set-kubeconf - -windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster - $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ - --auto-upgrade-channel $(AUTOUPGRADE) \ - --node-os-upgrade-channel $(NODEUPGRADE) \ - --kubernetes-version $(K8S_VER) \ - --node-count $(NODE_COUNT) \ - --node-vm-size $(VM_SIZE) \ - --network-plugin azure \ - --windows-admin-password $(WINDOWS_PASSWORD) \ - --windows-admin-username $(WINDOWS_USERNAME) \ - --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ - --no-ssh-key \ - --yes - @$(MAKE) windows-nodepool-up @$(MAKE) set-kubeconf -cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a Linux CNIv1 cluster +cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a CNIv1 cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From c0d9b34491c02e9821dab67edac6b3d2f033ca45 Mon Sep 17 00:00:00 2001 From: Santhosh Prabhu <6684582+santhoshmprabhu@users.noreply.github.com> Date: Wed, 21 May 2025 15:13:55 -0700 Subject: [PATCH 3/5] Update hack/aks/Makefile Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Santhosh Prabhu <6684582+santhoshmprabhu@users.noreply.github.com> --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 66aee0a3e2..75895e9b30 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -393,7 +393,7 @@ vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale S --yes @$(MAKE) set-kubeconf -nodesubnet-cilium-up: rg-up ipv4 overlay-net-up ## Brings up a Nodesubnet Cilium cluster +nodesubnet-cilium-up: rg-up ipv4 overlay-net-up ## Bring up a Nodesubnet Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From ce221098d6a57fbaf683147719ef54517fa9c020 Mon Sep 17 00:00:00 2001 From: Santhosh Prabhu Date: Wed, 21 May 2025 15:24:17 -0700 Subject: [PATCH 4/5] chore: make dockerfiles --- cni/Dockerfile | 4 ++-- cns/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cni/Dockerfile b/cni/Dockerfile index 6c25a6062f..bb7e438eb8 100644 --- a/cni/Dockerfile +++ b/cni/Dockerfile @@ -6,10 +6,10 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:b06999cae63b9b6f43bcb16bd16bcbedae847684515317e15607a601ed108030 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc9d564dc7279c749a9bb1abfa03f872d24f60bf7e37e61f35dda98c2ccec0c4 AS go # mcr.microsoft.com/cbl-mariner/base/core:2.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:961bfedbbbdc0da51bc664f51d959da292eced1ad46c3bf674aba43b9be8c703 AS mariner-core +FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:12480ee9f027c304fabc17d70afc7d5da6c49ad46f0401947478e7218ea0ff6c AS mariner-core FROM go AS azure-vnet ARG OS diff --git a/cns/Dockerfile b/cns/Dockerfile index d4ad81699b..b0e6e13520 100644 --- a/cns/Dockerfile +++ b/cns/Dockerfile @@ -5,13 +5,13 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:b06999cae63b9b6f43bcb16bd16bcbedae847684515317e15607a601ed108030 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc9d564dc7279c749a9bb1abfa03f872d24f60bf7e37e61f35dda98c2ccec0c4 AS go # mcr.microsoft.com/cbl-mariner/base/core:2.0 -FROM mcr.microsoft.com/cbl-mariner/base/core@sha256:961bfedbbbdc0da51bc664f51d959da292eced1ad46c3bf674aba43b9be8c703 AS mariner-core +FROM mcr.microsoft.com/cbl-mariner/base/core@sha256:12480ee9f027c304fabc17d70afc7d5da6c49ad46f0401947478e7218ea0ff6c AS mariner-core # mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 -FROM mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:7778a86d86947d5f64c1280a7ee0cf36c6c6d76b5749dd782fbcc14f113961bf AS mariner-distroless +FROM mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:a2529d152e75b29502a8de264a4f3dfb8fd126d870c9bf4456d03b7a7dab7268 AS mariner-distroless FROM --platform=linux/${ARCH} go AS builder ARG OS From 83d8a65d026b4f332a971c66b553c004fc94c261 Mon Sep 17 00:00:00 2001 From: Santhosh Prabhu Date: Wed, 21 May 2025 15:49:47 -0700 Subject: [PATCH 5/5] fix: add description to readme --- hack/aks/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/aks/README.md b/hack/aks/README.md index abe8bb7876..7e3e89ffa8 100644 --- a/hack/aks/README.md +++ b/hack/aks/README.md @@ -37,6 +37,7 @@ AKS Clusters vnetscale-swift-byocni-nokubeproxy-up Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy vnetscale-swift-cilium-up Bring up a Vnet Scale SWIFT Cilium cluster vnetscale-swift-up Bring up a Vnet Scale SWIFT AzCNI cluster + nodesubnet-cilium-up Bring up a Nodesubnet Cilium cluster cniv1-up Bring up a AzCNIv1 cluster dualstack-overlay-byocni-up Bring up an dualstack overlay cluster without CNS and CNI installed cilium-dualstack-up Brings up a Cilium Dualstack Overlay cluster with Linux node only