Swiftv1 dual stack prototype

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			"VARIANT": "1.24",
+			"VARIANT": "1.24-bullseye",
 			"NODE_VERSION": "none"
 		}
 	},
@@ -58,7 +58,7 @@
 	"remoteUser": "vscode",
 	"features": {
 		"ghcr.io/devcontainers/features/go:1": {
-			"version": "1.23.2"
+			"version": "1.24.1"
 		},
 		"docker-in-docker": "latest",
 		"kubectl-helm-minikube": "latest",

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

@@ -71,7 +71,7 @@ jobs:
           mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
 
       - name: "Upload Logs"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: always()
         with:
           name: logs-${{ matrix.profile }}

.github/workflows/cyclonus-netpol-test.yaml

@@ -78,7 +78,7 @@ jobs:
           mv ./test/cyclonus/cyclonus-test.txt ./cyclonus-test_${{ matrix.profile }}.txt
 
       - name: 'Upload Logs'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: always()
         with:
           name: logs-${{ matrix.profile }}

.github/workflows/golangci.yaml

@@ -26,7 +26,7 @@ jobs:
         run: make bpf-lib && go generate ./...
 
       - name: Upload generated code
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: generated-bpf-program-code
           path: ./bpf-prog/azure-block-iptables/pkg/blockservice
@@ -46,7 +46,7 @@ jobs:
       with:
         go-version-file: go.mod
     - name: Download generated code
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: generated-bpf-program-code
         path: ./bpf-prog/azure-block-iptables/pkg/blockservice

.pipelines/build/dockerfiles/cns.Dockerfile

@@ -11,11 +11,11 @@ ENTRYPOINT ["azure-cns.exe"]
 EXPOSE 10090
 
 # mcr.microsoft.com/azurelinux/base/core:3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:833693619d523c23b1fe4d9c1f64a6c697e2a82f7a6ee26e1564897c3fe3fa02 AS build-helper
+FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:3d53b96f4e336a197023bda703a056eaefecc6728e9a2b0c1ef42f7dce183338 AS build-helper
 RUN tdnf install -y iptables
 
 # mcr.microsoft.com/azurelinux/distroless/minimal:3.0
-FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:d784c8233e87e8bce2e902ff59a91262635e4cabc25ec55ac0a718344514db3c AS linux
+FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/distroless/minimal@sha256:6b78aa535a2a5107ee308b767c0f1f5055a58d0e751f9d87543bc504da6d0ed3 AS linux
 ARG ARTIFACT_DIR .
 
 COPY --from=build-helper /usr/sbin/*tables* /usr/sbin/

.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

@@ -93,34 +93,19 @@ stages:
                   if [ ! -z ${{ parameters.dualstackVersion }} ]; then
                     echo "Use dualstack version of Cilium"
                     export CILIUM_VERSION_TAG=${{ parameters.dualstackVersion }}
-                  fi
-
-                  echo "install Cilium ${CILIUM_VERSION_TAG}"
-                  export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
-                  echo "installing files from ${DIR}"
-
-                  echo "deploy Cilium ConfigMap"
-                  if [ ! -z ${{ parameters.dualstackVersion }} ]; then
-                    echo "Use dualstack configmap for Cilium"
-                    kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml
-                  else
-                    kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
-                  fi
-
-                  # Passes Cilium image to daemonset and deployment
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
-
-                  if [ ! -z ${{ parameters.dualstackVersion }} ]; then
-                    echo "Use dualstack daemonset for Cilium"
+                    export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
                     export IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
                     export IPV6_HP_BPF_VERSION=$(make ipv6-hp-bpf-version)
-                    envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
+                    echo "IPV6_HP_BPF_VERSION: $IPV6_HP_BPF_VERSION"
+                    echo "IPV6_IMAGE_REGISTRY: $IPV6_IMAGE_REGISTRY"
+                    echo "installing cilium dualstack version ${CILIUM_VERSION_TAG} from directory ${DIR}"
+                    make -C ./hack/aks deploy-cilium-dualstack
                   else
-                    envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
+                    export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
+                    echo "installing cilium version ${CILIUM_VERSION_TAG} from directory ${DIR}"
+                    make -C ./hack/aks deploy-cilium
                   fi
 
-                  envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
                   kubectl get po -owide -A
 
       - ${{if eq(parameters.hubbleEnabled, true)}}:
@@ -146,12 +131,8 @@ stages:
                   echo "install Cilium onto Overlay Cluster with hubble enabled"
                   export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
                   export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
-                  echo "installing files from ${DIR}"
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
-                  envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
-                  envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
+                  echo "installing cilium hubble version ${CILIUM_VERSION_TAG} from directory ${DIR}"
+                  make -C ./hack/aks deploy-cilium-hubble
                   kubectl get po -owide -A
 
       - job: deploy_cns_and_ipam

.pipelines/cni/cilium/cilium-scale-test.yaml

@@ -46,33 +46,19 @@ stages:
                 echo "Redeploy all cilium components and update cilium version. Redeploy all to catch all changes between versions"
                 pwd
 
-                echo "install Cilium ${CILIUM_VERSION_TAG}"
                 export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
-                echo "installing files from ${DIR}"
-
-                echo "deploy Cilium ConfigMap"
                 if ${IS_DUALSTACK}; then
-                  echo "Use dualstack configmap for Cilium"
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml
-                else
-                  kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
-                fi
-
-                # Passes Cilium image to daemonset and deployment
-                kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
-                kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
-
-                export CILIUM_VERSION_TAG=${CILIUM_VERSION_TAG}
-                export CILIUM_IMAGE_REGISTRY=${CILIUM_IMAGE_REGISTRY}
-                if ${IS_DUALSTACK}; then
-                  echo "Use dualstack daemonset for Cilium"
+                  echo "Use dualstack version of Cilium"
                   export IPV6_IMAGE_REGISTRY=acnpublic.azurecr.io
-                  envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
+                  export IPV6_HP_BPF_VERSION=${IPV6_HP_BPF_VERSION}
+                  echo "IPV6_HP_BPF_VERSION: $IPV6_HP_BPF_VERSION"
+                  echo "IPV6_IMAGE_REGISTRY: $IPV6_IMAGE_REGISTRY"
+                  echo "installing cilium dualstack version ${CILIUM_VERSION_TAG} from directory ${DIR}"
+                  make -C ./hack/aks deploy-cilium-dualstack
                 else
-                  envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
+                  echo "installing cilium version ${CILIUM_VERSION_TAG} from directory ${DIR}"
+                  make -C ./hack/aks deploy-cilium
                 fi
-
-                envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
                 kubectl get po -owide -A
 
                 echo "Deploy Azure-CNS"

.pipelines/cni/cilium/nightly-release-test.yml

@@ -35,7 +35,7 @@ stages:
         steps:
           - bash: |
               set -ex
-              
+
               cd .pipelines/
               git clone https://github.com/cilium/cilium.git
               cd cilium
@@ -65,18 +65,18 @@ stages:
               fi
 
               if [ "$(type)" = "docker-operator-generic-image" ]; then
-                # Apply patch to Dockerfile  
+                # Apply patch to Dockerfile
                 DOCKERFILE_PATH="./images/$(directory)/Dockerfile"
                 echo "Patching Dockerfile: $DOCKERFILE_PATH"
-                  
+
                 # Add ARG and ENV statements to disable systemcrypto for Microsoft Go
                 sed -i '/^FROM.*builder/a ARG GOEXPERIMENT=boringcrypto \nENV GOEXPERIMENT=${GOEXPERIMENT}' "$DOCKERFILE_PATH"
               fi
 
               BUILD_ARGS=${GO_ARGS}${ALPINE_ARGS}
               DOCKER_FLAGS="$BUILD_ARGS" \
               make $(type)
-              
+
             name: BuildCiliumImage
             displayName: "Build Cilium Image"
           - task: AzureCLI@2
@@ -117,6 +117,8 @@ stages:
       GOBIN: "$(GOPATH)/bin" # Go binaries path
       modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
       commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
+    pool:
+      name: $(BUILD_POOL_NAME_DEFAULT)
     jobs:
       - template: ../../templates/create-cluster.yaml
         parameters:
@@ -134,13 +136,15 @@ stages:
           - cilium_overlay_nightly
         pool:
           name: $(BUILD_POOL_NAME_DEFAULT)
+        timeoutInMinutes: 120
         steps:
           - template: ../../singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
             parameters:
               name: "cilium_nightly"
               clusterName: ciliumnightly-$(commitID)
               testHubble: true
               testLRP: true
+              nightly: true
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
         parameters:

.pipelines/containers/container-template.yaml

@@ -15,11 +15,38 @@ steps:
 
 - script: |
     set -e
+    echo "Disk space before cleanup..."
+    df -h /
+    echo "Removing unnecessary files to free up disk space..."
+    sudo rm -rf \
+      /opt/hostedtoolcache \
+      /opt/google/chrome \
+      /opt/microsoft/msedge \
+      /opt/microsoft/powershell \
+      /opt/pipx \
+      /usr/lib/mono \
+      /usr/local/julia* \
+      /usr/local/lib/android \
+      /usr/local/lib/node_modules \
+      /usr/local/share/chromium \
+      /usr/local/share/powershell \
+      /usr/share/dotnet \
+      /usr/share/swift
+    echo "Disk space after cleanup..."
+    df -h /
+  displayName: "Clean up disk space"
+
+- script: |
+    set -e
+    echo "=== Disk space BEFORE make image ==="
+    df -h
     if [ ${{ parameters.os }} = 'windows' ]; then export BUILDX_ACTION='--push'; fi
     make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }}
+    echo "=== Disk space AFTER make image ==="
+    df -h
   name: image_build
   displayName: Image Build
-  retryCountOnTaskFailure: 3
+  retryCountOnTaskFailure: 2
 
 - task: AzureCLI@2
   displayName: "Logout"

.pipelines/multitenancy/swiftv2-manifold-e2e.stages.yaml

@@ -0,0 +1,35 @@
+parameters:
+  name: ""
+  dependsOn: ""
+
+stages:
+  - stage: manifold_e2e
+    displayName: E2E - AKS Swiftv2 Manifold
+    variables:
+      TAG: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+      IMAGE_REPO_PATH: $[ format('{0}/', stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath']) ]
+      ${{ if eq(parameters.dependsOn, 'publish') }}:
+        IMAGE_REPO_PATH_REF: 'azure-'
+      ${{ else }}:
+        IMAGE_REPO_PATH_REF: $(IMAGE_REPO_PATH)
+    dependsOn: 
+      - ${{ parameters.dependsOn }}
+      - setup
+    jobs:
+      - job: ${{ parameters.name }}
+        displayName: AKS Swiftv2 Multitenancy Manifold E2E Test Suite - (${{ parameters.name }})
+        timeoutInMinutes: 210
+        pool:
+          name: $(BUILD_POOL_NAME_DEFAULT)
+          isCustom: true
+          type: linux
+        steps:
+          - task: TriggerBuild@3
+            inputs:
+              buildDefinition: '391699'
+              templateParameters: 'regions: ["westus2"], useAcnPublic: true, cnscniversion: $(TAG), cnscniversionwindows: $(TAG), cnscniImagePrefix: $(IMAGE_REPO_PATH_REF)'
+              useSameBranch: false
+              queueBuildForUserThatTriggeredBuild: true
+              branchToUse: 'refs/heads/master'
+              waitForQueuedBuildsToFinish: true
+              authenticationMethod: 'OAuth Token'