Merge branch 'master' into update_for_new_homeaz_contract

Author: ZetaoZhuang

.github/dependabot.yaml

@@ -29,6 +29,7 @@ updates:
     - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/azure-ipam"
@@ -38,6 +39,7 @@ updates:
     - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies", "azure-ipam" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/build/tools"
@@ -47,18 +49,65 @@ updates:
     - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/dropgz"
   schedule:
     interval: "daily"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies", "dropgz" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/zapai"
   schedule:
     interval: "daily"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies" ]
   open-pull-requests-limit: 10
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "release/1.5" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.5"
+- package-ecosystem: "gomod"
+  directory: "/azure-ipam"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "azure-ipam", "release/1.5" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.5"
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "release/1.4" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.4"
+- package-ecosystem: "gomod"
+  directory: "/azure-ipam"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "azure-ipam", "release/1.4" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.4"

.github/workflows/codeql.yaml

@@ -43,7 +43,7 @@ jobs:
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
-          queries: ./codeql/
+          # queries: ./codeql/
       - name: Autobuild
         uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis

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

@@ -142,7 +142,7 @@ stages:
 
                   echo "install Cilium onto Overlay Cluster with hubble enabled"
                   export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
-                  export DIR=${CILIUM_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

.pipelines/cni/lsg/lsg-cni-intergration-template.yaml

@@ -176,7 +176,7 @@ stages:
                 echo "Delete load-test Namespace"
                 make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
                 kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
-                delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
+                delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
                 kubectl delete ns $delete
                 kubectl cluster-info
                 kubectl get po -owide -A

.pipelines/cni/singletenancy/cniv1-template.yaml

@@ -203,7 +203,7 @@ stages:
                 echo "Delete load-test Namespace"
                 make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
                 kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
-                delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
+                delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
                 kubectl delete ns $delete
                 kubectl cluster-info
                 kubectl get po -owide -A
@@ -315,7 +315,7 @@ stages:
                   echo "Delete load-test Namespace"
                   make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
                   kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
-                  delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
+                  delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
                   kubectl delete ns $delete
                   kubectl cluster-info
                   kubectl get po -owide -A

.pipelines/cni/singletenancy/cniv2-template.yaml

@@ -258,7 +258,7 @@ stages:
                 echo "Delete load-test Namespace"
                 make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
                 kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
-                delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
+                delete=`kubectl get ns --no-headers | grep -v 'kube\|default\|gatekeeper' | awk '{print $1}'`
                 kubectl delete ns $delete
                 kubectl cluster-info
                 kubectl get po -owide -A

.pipelines/pipeline.yaml

@@ -19,6 +19,13 @@ trigger:
     include:
       - "*"
 
+schedules:
+- cron: "0 2 * * *" # Every day at 2am
+  displayName: "Official Nightly Pipeline"
+  branches:
+    include: ["master"]
+  always: true
+
 stages:
   - stage: setup
     displayName: ACN
@@ -358,21 +365,6 @@ stages:
         vmSize: Standard_B2ms
         dependsOn: "containerize"
 
-    # Swiftv2 E2E tests with multitenancy cluster start up
-    - template: multitenancy/swiftv2-e2e-job-template.yaml
-      parameters:
-        name: "swiftv2_e2e"
-        displayName: Swiftv2 Multitenancy
-        os: linux
-        clusterType: swiftv2-multitenancy-cluster-up
-        clusterName: "mtacluster"
-        nodePoolName: "mtapool"
-        vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
-        dependsOn: "containerize"
-        dummyClusterName: "swiftv2dummy"
-        dummyClusterType: "swiftv2-dummy-cluster-up"
-        dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster
-
     - stage: delete
       displayName: Delete Clusters
       condition: always()
@@ -390,7 +382,6 @@ stages:
         - aks_windows_22_e2e
         - dualstackoverlay_e2e
         - cilium_dualstackoverlay_e2e
-        - swiftv2_e2e
       variables:
         commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
       jobs:
@@ -403,7 +394,7 @@ stages:
               cilium_e2e:
                 name: cilium_e2e
                 clusterName: "ciliume2e"
-                region: $(REGION_AKS_CLUSTER_TEST)                
+                region: $(REGION_AKS_CLUSTER_TEST)
               cilium_nodesubnet_e2e:
                 name: cilium_nodesubnet_e2e
                 clusterName: "cilndsubnete2e"
@@ -456,26 +447,3 @@ stages:
                 region: $(region)
                 sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
                 svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-
-        - job: delete_test
-          displayName: Delete Cluster
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-          strategy:
-            matrix:
-              swiftv2_e2e:
-                name: swiftv2_e2e
-                clusterName: "mtacluster"
-                region: $(REGION_SWIFTV2_CLUSTER_TEST)
-              swiftv2_dummy_e2e:
-                name: swiftv2_dummy_e2e
-                clusterName: "swiftv2dummy"
-                region: $(REGION_SWIFTV2_CLUSTER_TEST)
-          steps:
-            - template: templates/delete-cluster.yaml
-              parameters:
-                name: $(name)
-                clusterName: $(clusterName)-$(commitID)
-                region: $(region)
-                sub: $(SUB_AZURE_NETWORK_AGENT_TEST)
-                svcConn: $(ACN_TEST_SERVICE_CONNECTION)

.pipelines/run-pipeline.yaml

@@ -7,7 +7,7 @@ parameters:
 - name: triggerBuildReason
   type: string
   default: ''
-  
+
 - name: triggerBuildGitRef
   type: string
   default: ''
@@ -400,21 +400,6 @@ stages:
         vmSize: Standard_B2ms
         dependsOn: "containerize"
 
-    # Swiftv2 E2E tests with multitenancy cluster start up
-    - template: multitenancy/swiftv2-e2e.jobs.yaml@ACNTools
-      parameters:
-        name: "swiftv2_e2e"
-        displayName: Swiftv2 Multitenancy
-        os: linux
-        clusterType: swiftv2-multitenancy-cluster-up
-        clusterName: "mtacluster"
-        nodePoolName: "mtapool"
-        vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
-        dependsOn: "containerize"
-        dummyClusterName: "swiftv2dummy"
-        dummyClusterType: "swiftv2-dummy-cluster-up"
-        dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster
-
     - stage: delete
       displayName: Delete Clusters
       condition: always()
@@ -430,7 +415,6 @@ stages:
         - aks_windows_22_e2e
         - dualstackoverlay_e2e
         - cilium_dualstackoverlay_e2e
-        - swiftv2_e2e
       variables:
         ACN_DIR: $(Build.SourcesDirectory)
         commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
@@ -483,14 +467,6 @@ stages:
                 name: cilium_dualstackoverlay_e2e
                 clusterName: "cildsovere2e"
                 Suffix: cilium_dualstackoverlay_e2e
-              swiftv2_e2e:
-                name: swiftv2_e2e
-                clusterName: "mtcluster"
-                Suffix: swiftv2_e2e
-              swiftv2_dummy_e2e:
-                name: swiftv2_dummy_e2e
-                clusterName: "swiftv2dummy"
-                Suffix: swiftv2_dummy_e2e
           variables:
             STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
             ob_outputDirectory: $(Build.ArtifactStagingDirectory)

azure-ipam/go.mod

@@ -7,9 +7,9 @@ toolchain go1.23.2
 require (
 	github.com/Azure/azure-container-networking v1.5.21
 	github.com/containernetworking/cni v1.2.3
-	github.com/containernetworking/plugins v1.6.0
+	github.com/containernetworking/plugins v1.6.1
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
@@ -24,13 +24,15 @@ require (
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/Microsoft/hcsshim v0.12.7 // indirect
+	github.com/Microsoft/hcsshim v0.12.9 // indirect
 	github.com/avast/retry-go/v3 v3.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/billgraziano/dpapi v0.5.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/containerd/cgroups/v3 v3.0.3 // indirect
-	github.com/containerd/errdefs v0.1.0 // indirect
+	github.com/containerd/errdefs v0.3.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/containerd/typeurl/v2 v2.2.0 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -68,18 +70,18 @@ require (
 	github.com/vishvananda/netns v0.0.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/oauth2 v0.22.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/grpc v1.66.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/grpc v1.67.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect