addresing john's comments

Azure · Sep 23, 2024 · 65aee3a · 65aee3a
1 parent c6520ed
commit 65aee3a
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 71 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -329,6 +329,7 @@ stages:
         vmSize: Standard_B2ms
         k8sVersion: ""
         dependsOn: "containerize"
+
     # Azure Overlay E2E Stateless CNI tests
     - template: singletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-job-template.yaml
       parameters:

diff --git a/...gletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-step-template.yaml b/...gletenancy/azure-cni-overlay-stateless/azure-cni-overlay-stateless-e2e-step-template.yaml
@@ -31,79 +31,63 @@ steps:
     name: "kubeconfig"
     displayName: "Set Kubeconfig"
 
-  - ${{ if eq(parameters.os, 'windows') }}:
-    - script: |
-        nodeList=`kubectl get node -owide | grep Windows | awk '{print $1}'`
-        for node in $nodeList; do
-          taint=`kubectl describe node $node | grep Taints | awk '{print $2}'`
-          if [ $taint == "node.cloudprovider.kubernetes.io/uninitialized=true:NoSchedule" ]; then
-              kubectl taint nodes $node node.cloudprovider.kubernetes.io/uninitialized=true:NoSchedule-
-          fi
-        done
-        sudo -E env "PATH=$PATH" make test-load SCALE_UP=32 OS_TYPE=windows CNI_TYPE=stateless VALIDATE_STATEFILE=true INSTALL_CNS=true INSTALL_AZURE_VNET_STATELESS=true VALIDATE_V4OVERLAY=true CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) CLEANUP=true
-      name: "WindowsOverlayControlPlaneScaleTests"
-      displayName: "Windows v4Overlay ControlPlane Scale Tests"
-      retryCountOnTaskFailure: 2
-
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-        scriptLocation: "inlineScript"
-        scriptType: "bash"
-        addSpnToEnvironment: true
-        inlineScript: |
-          set -e
-          kubectl get po -owide -A
-          clusterName=${{ parameters.clusterName }}
-          echo "Restarting nodes"
-          for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
-            make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
-          done
-      displayName: "Restart Nodes"
+  - script: |
+      nodeList=`kubectl get node -owide | grep Windows | awk '{print $1}'`
+      for node in $nodeList; do
+        taint=`kubectl describe node $node | grep Taints | awk '{print $2}'`
+        if [ $taint == "node.cloudprovider.kubernetes.io/uninitialized=true:NoSchedule" ]; then
+            kubectl taint nodes $node node.cloudprovider.kubernetes.io/uninitialized=true:NoSchedule-
+        fi
+      done
+      sudo -E env "PATH=$PATH" make test-load SCALE_UP=32 OS_TYPE=windows CNI_TYPE=stateless VALIDATE_STATEFILE=true INSTALL_CNS=true INSTALL_AZURE_VNET_STATELESS=true VALIDATE_V4OVERLAY=true CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) CLEANUP=true
+    name: "WindowsOverlayControlPlaneScaleTests"
+    displayName: "Windows v4Overlay ControlPlane Scale Tests"
+    retryCountOnTaskFailure: 2
 
-    - task: AzureCLI@2
-      inputs:
-        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-        scriptLocation: "inlineScript"
-        scriptType: "bash"
-        addSpnToEnvironment: true
-        inlineScript: |
-          cd test/integration/load
-          clusterName=${{ parameters.clusterName }}
-          make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
-          make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
-          kubectl get pods -owide -A
-          echo "Validating Node Restart"
-          CNI_TYPE=stateless RESTART_CASE=true go test -timeout 30m -tags load -run ^TestValidateState$
-      displayName: "Validate Node Restart"
-      retryCountOnTaskFailure: 3
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
+        set -e
+        kubectl get po -owide -A
+        clusterName=${{ parameters.clusterName }}
+        echo "Restarting nodes"
+        for val in $(az vmss list -g MC_${clusterName}_${clusterName}_$(REGION_AKS_CLUSTER_TEST) --query "[].name" -o tsv); do
+          make -C ./hack/aks restart-vmss AZCLI=az CLUSTER=${clusterName} REGION=$(REGION_AKS_CLUSTER_TEST) VMSS_NAME=${val}
+        done
+    displayName: "Restart Nodes"
 
-    - script: |
-        echo "validate pod IP assignment before CNS restart"
-        kubectl get pod -owide -A
-        echo "validate pod state before CNS restarts"
+  - task: AzureCLI@2
+    inputs:
+      azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+      scriptLocation: "inlineScript"
+      scriptType: "bash"
+      addSpnToEnvironment: true
+      inlineScript: |
         cd test/integration/load
-        CNI_TYPE=stateless go test -timeout 30m -tags load -run ^TestValidateState$
-        kubectl rollout restart ds azure-cns -n kube-system
-        kubectl rollout status ds azure-cns -n kube-system
-        kubectl get pod -owide -A
-        echo "validate pods after CNS restart"
-        CNI_TYPE=stateless go test -timeout 30m -tags load -run ^TestValidateState$
-      name: "restartCNS_ValidatePodState"
-      displayName: "Restart CNS and validate pod state"
-      retryCountOnTaskFailure: 3
+        clusterName=${{ parameters.clusterName }}
+        make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${clusterName}
+        make -C ./hack/aks azcfg AZCLI=az REGION=$(REGION_AKS_CLUSTER_TEST)
+        kubectl get pods -owide -A
+        echo "Validating Node Restart"
+        CNI_TYPE=stateless RESTART_CASE=true go test -timeout 30m -tags load -run ^TestValidateState$
+    displayName: "Validate Node Restart"
+    retryCountOnTaskFailure: 3
 
-    - script: |
-        echo "Run wireserver and metadata connectivity Tests"
-        bash test/network/wireserver_metadata_test.sh
-      retryCountOnTaskFailure: 3
-      name: "WireserverMetadataConnectivityTests"
-      displayName: "Run Wireserver and Metadata Connectivity Tests"
+  - script: |
+      echo "Run wireserver and metadata connectivity Tests"
+      bash test/network/wireserver_metadata_test.sh
+    retryCountOnTaskFailure: 3
+    name: "WireserverMetadataConnectivityTests"
+    displayName: "Run Wireserver and Metadata Connectivity Tests"
 
-    - script: |
-        echo "IPv4 Overlay DataPath Test"
-        cd test/integration/datapath
-        sudo -E env "PATH=$PATH" go test -count=1 datapath_windows_test.go -timeout 3m -tags connection -restartKubeproxy true -run ^TestDatapathWin$
-      name: "WindowsV4OverlayDatapathTests"
-      displayName: "Windows v4Overlay Datapath Tests"
-      retryCountOnTaskFailure: 3
+  - script: |
+      echo "IPv4 Overlay DataPath Test"
+      cd test/integration/datapath
+      sudo -E env "PATH=$PATH" go test -count=1 datapath_windows_test.go -timeout 3m -tags connection -restartKubeproxy true -run ^TestDatapathWin$
+    name: "WindowsV4OverlayDatapathTests"
+    displayName: "Windows v4Overlay Datapath Tests"
+    retryCountOnTaskFailure: 3
diff --git a/cni/network/network.go b/cni/network/network.go
@@ -1163,6 +1163,7 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 			logger.Error("Failed to query endpoint",
 				zap.String("endpoint", endpointID),
 				zap.Error(err))
+
 			logger.Error("Release ip by ContainerID (endpoint not found)",
 				zap.String("containerID", args.ContainerID))
 			sendEvent(plugin, fmt.Sprintf("Release ip by ContainerID (endpoint not found):%v", args.ContainerID))