feat: rip out dropgz (#2324) (#2339)

Signed-off-by: Evan Baker <[email protected]>
Azure · Sep 27, 2024 · 09aa3b3 · 09aa3b3
1 parent 73a0919
commit 09aa3b3
Show file tree

Hide file tree

Showing 25 changed files with 475 additions and 519 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -39,7 +39,6 @@ stages:
               echo "##vso[task.setvariable variable=Tag;isOutput=true]$(make version)"
               echo "##vso[task.setvariable variable=cniVersion;isOutput=true]$(make cni-version)"
               echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$(make npm-version)"
-              echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(make cni-dropgz-version)"
               cat /etc/os-release
               uname -a
               sudo chown -R $(whoami):$(whoami) .
@@ -148,17 +147,32 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
         strategy:
           matrix:
-            cni_dropgz_linux_amd64:
+            azure_ipam_linux_amd64:
               arch: amd64
-              name: cni-dropgz
+              name: azure-ipam
               os: linux
-            cni_dropgz_test_linux_amd64:
+            azure_ipam_windows2019_amd64:
               arch: amd64
-              name: cni-dropgz-test
+              name: azure-ipam
+              os: windows
+              os_version: ltsc2019
+            azure_ipam_windows2022_amd64:
+              arch: amd64
+              name: azure-ipam
+              os: windows
+              os_version: ltsc2022
+            cni_linux_amd64:
+              arch: amd64
+              name: cni
               os: linux
-            cni_dropgz_test_windows2022_amd64:
+            cni_windows2019_amd64:
               arch: amd64
-              name: cni-dropgz-test
+              name: cni
+              os: windows
+              os_version: ltsc2019
+            cni_windows2022_amd64:
+              arch: amd64
+              name: cni
               os: windows
               os_version: ltsc2022
             cns_linux_amd64:
@@ -199,13 +213,13 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
         strategy:
           matrix:
-            cni_dropgz_linux_arm64:
+            azure_ipam_linux_arm64:
               arch: arm64
-              name: cni-dropgz
+              name: azure-ipam
               os: linux
-            cni_dropgz_test_linux_arm64:
+            cni_linux_arm64:
               arch: arm64
-              name: cni-dropgz-test
+              name: cni
               os: linux
             cns_linux_arm64:
               arch: arm64
@@ -268,11 +282,13 @@ stages:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
         strategy:
           matrix:
-            cni_dropgz:
-              name: cni-dropgz
-              platforms: linux/amd64 linux/arm64
-            cni_dropgz_test:
-              name: cni-dropgz-test
+            azure_ipam:
+              name: azure-ipam
+              os_versions: ltsc2019 ltsc2022
+              platforms: linux/amd64 linux/arm64 windows/amd64
+            cni:
+              name: cni
+              os_versions: ltsc2019 ltsc2022
               platforms: linux/amd64 linux/arm64 windows/amd64
             cns:
               name: cns
@@ -304,7 +320,6 @@ stages:
     parameters:
       name: "cilium_e2e"
       displayName: Cilium
-      testDropgz: ""
       clusterType: cilium-podsubnet-up
       clusterName: "ciliume2e"
       vmSize: Standard_B2ms
@@ -315,7 +330,6 @@ stages:
     parameters:
       name: "cilium_overlay_cilium_e2e"
       displayName: Cilium on AKS Overlay
-      testDropgz: ""
       clusterType: cilium-overlay-up
       clusterName: "overlaye2e"
       vmSize: Standard_B2ms
@@ -327,7 +341,6 @@ stages:
       name: "azure_overlay_e2e"
       displayName: Azure Overlay
       os: linux
-      testDropgz: ""
       clusterType: overlay-byocni-up
       clusterName: "azurecnioverlaye2e"
       vmSize: Standard_B2ms
@@ -339,7 +352,6 @@ stages:
       name: "aks_swift_e2e"
       displayName: AKS Swift Ubuntu
       os: linux
-      testDropgz: ""
       clusterType: swift-byocni-up
       clusterName: "swifte2e"
       vmSize: Standard_B2s

diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml
@@ -1,7 +1,6 @@
 parameters:
   name: ""
   displayName: ""
-  testDropgz: ""
   clusterType: ""
   clusterName: ""
   vmSize: ""
@@ -58,7 +57,6 @@ stages:
           - template: e2e-step-template.yaml
             parameters:
               name: ${{ parameters.name }}
-              testDropgz: ${{ parameters.testDropgz }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml
@@ -1,6 +1,5 @@
 parameters:
   name: ""
-  testDropgz: ""
   clusterName: ""
 
 steps:
@@ -43,7 +42,7 @@ steps:
       pwd
       kubectl cluster-info
       kubectl get po -owide -A
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(make cni-dropgz-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true
     retryCountOnTaskFailure: 3
     name: "aksswifte2e"
     displayName: "Run AKS Swift E2E"

diff --git a/.pipelines/singletenancy/aks/e2e-job-template.yaml b/.pipelines/singletenancy/aks/e2e-job-template.yaml
@@ -40,7 +40,6 @@ stages:
       GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
       GOBIN: "$(GOPATH)/bin" # Go binaries path
       modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
-      dropgzVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.dropgzVersion'] ]
       cniVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
       commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
     dependsOn:
@@ -63,7 +62,6 @@ stages:
               arch: ${{ parameters.arch }}
               os: ${{ parameters.os }}
               os_version: ${{ parameters.os_version }}
-              version: $(dropgzVersion)
               cniVersion: $(cniVersion)
               scaleup: ${{ parameters.scaleup }}
 

diff --git a/.pipelines/singletenancy/aks/e2e-step-template.yaml b/.pipelines/singletenancy/aks/e2e-step-template.yaml
@@ -30,18 +30,12 @@ steps:
         set -e
         make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
         echo "Upload CNI"
-        if [ "${{parameters.os}}" == "windows" ]; then
-          export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=${{ parameters.version }})
+          export CNI_VERSION=$(make cni-version)
           envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
           kubectl rollout status daemonset/azure-cni -n kube-system
           echo "Deploying on windows nodes"
-          export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }}  OS_VERSION=${{ parameters.os_version }} CNI_DROPGZ_VERSION=${{ parameters.version }})
           envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
           kubectl rollout status daemonset/azure-cni-windows -n kube-system
-        else
-          export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=${{ parameters.version }})
-          envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
-          kubectl rollout status daemonset/azure-cni -n kube-system
         fi
     name: "UploadCni"
     displayName: "Upload CNI"

diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -1,7 +1,6 @@
 parameters:
   name: ""
   displayName: ""
-  testDropgz: ""
   clusterType: ""
   clusterName: ""
   vmSize: ""
@@ -55,7 +54,6 @@ stages:
           - template: azure-cni-overlay-e2e-step-template.yaml
             parameters:
               name: ${{ parameters.name }}
-              testDropgz: ${{ parameters.testDropgz }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml
@@ -1,6 +1,5 @@
 parameters:
   name: ""
-  testDropgz: ""
   clusterName: ""
 
 steps:
@@ -47,8 +46,7 @@ steps:
       kubectl apply -f config-reconcile.yaml
       cd ../../../..
       kubectl get po -owide -A
-      CNS=$(make cns-version) DROPGZ=$(make cni-dropgz-version)
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true
     retryCountOnTaskFailure: 3
     name: "integrationTest"
     displayName: "Run CNS Integration Tests on AKS Overlay"

diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -1,7 +1,6 @@
 parameters:
   name: ""
   displayName: ""
-  testDropgz: ""
   clusterType: ""
   clusterName: ""
   vmSize: ""
@@ -57,7 +56,6 @@ stages:
           - template: cilium-overlay-e2e-step-template.yaml
             parameters:
               name: ${{ parameters.name }}
-              testDropgz: ${{ parameters.testDropgz }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -1,6 +1,5 @@
 parameters:
   name: ""
-  testDropgz: ""
   clusterName: ""
 
 steps:
@@ -86,11 +85,11 @@ steps:
       # Nightly does not build images per commit. Will use existing image.
       if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
       then
-          CNS=$(CNS_VERSION) DROPGZ=$(DROP_GZ_VERSION) && echo "Running nightly"
+          CNS=$(CNS_VERSION) CNI=$(CNI_VERSION) && echo "Running nightly"
       else
-          CNS=$(make cns-version) DROPGZ=$(make cni-dropgz-version)
+          CNS=$(make cns-version) CNI=$(make cni-version)
       fi
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_VERSION=${CNI} INSTALL_CNS=true INSTALL_OVERLAY=true 
     retryCountOnTaskFailure: 3
     name: "aziliumTest"
     displayName: "Run Azilium E2E on AKS Overlay"

diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -1,7 +1,6 @@
 parameters:
   name: ""
   displayName: ""
-  testDropgz: ""
   clusterType: ""
   clusterName: ""
   vmSize: ""
@@ -59,7 +58,6 @@ stages:
           - template: cilium-e2e-step-template.yaml
             parameters:
               name: ${{ parameters.name }}
-              testDropgz: ${{ parameters.testDropgz }}
               clusterName: ${{ parameters.clusterName }}-$(commitID)
 
       - template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml
@@ -1,6 +1,5 @@
 parameters:
   name: ""
-  testDropgz: ""
   clusterName: ""
 
 steps:
@@ -74,7 +73,7 @@ steps:
   - script: |
       echo "Start Azilium E2E Tests"
       kubectl get po -owide -A
-      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(make cni-dropgz-version) INSTALL_CNS=true INSTALL_AZILIUM=true TEST_DROPGZ=${{ parameters.testDropgz }}
+      sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZILIUM=true
     retryCountOnTaskFailure: 3
     name: "aziliumTest"
     displayName: "Run Azilium E2E"

diff --git a/.pipelines/submodules-pipeline.yaml b/.pipelines/submodules-pipeline.yaml
@@ -156,14 +156,6 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
         strategy:
           matrix:
-            cni_dropgz_linux_amd64:
-              arch: amd64
-              name: cni-dropgz
-              os: linux
-            cni_dropgz_test_linux_amd64:
-              arch: amd64
-              name: cni-dropgz-test
-              os: linux
             cns_linux_amd64:
               arch: amd64
               name: cns
@@ -207,14 +199,6 @@ stages:
           name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
         strategy:
           matrix:
-            cni_dropgz_linux_arm64:
-              arch: arm64
-              name: cni-dropgz
-              os: linux
-            cni_dropgz_test_linux_arm64:
-              arch: arm64
-              name: cni-dropgz-test
-              os: linux
             cns_linux_arm64:
               arch: arm64
               name: cns
@@ -241,12 +225,6 @@ stages:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
         strategy:
           matrix:
-            cni_dropgz:
-              name: cni-dropgz
-              platforms: linux/amd64 linux/arm64
-            cni_dropgz_test:
-              name: cni-dropgz-test
-              platforms: linux/amd64 linux/arm64
             cns:
               name: cns
               os_versions: ltsc2019 ltsc2022
@@ -267,7 +245,6 @@ stages:
     parameters:
       name: "cilium_e2e"
       displayName: Cilium
-      testDropgz: true
       clusterType: cilium-podsubnet-up
       clusterName: "submodciliume2e"
       vmSize: Standard_B2ms
@@ -279,7 +256,6 @@ stages:
     parameters:
       name: "cilium_overlay_e2e"
       displayName: Cilium on AKS Overlay
-      testDropgz: true
       clusterType: cilium-overlay-up
       clusterName: "submodoverlaye2e"
       vmSize: Standard_B2ms
@@ -291,7 +267,6 @@ stages:
     parameters:
       name: "aks_swift_e2e"
       displayName: AKS Swift
-      testDropgz: true
       clusterType: swift-byocni-up
       clusterName: "submodswift"
       vmSize: Standard_B2ms