Merge branch 'master' into krouthu/service-tag

Signed-off-by: Keerthana Routhu <[email protected]>

Author: k-routhu

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

@@ -29,11 +29,12 @@ jobs:
           go-version: "^1.23"
 
       - name: Setup Kind
-        uses: engineerd/setup-kind@v0.6.2
+        uses: helm/kind-action@v1
         with:
-          version: "v0.11.1"
+          version: "v0.22.0"
+          kubectl_version: "v1.27.7"
           config: ./test/kind/kind.yaml
-          name: npm-kind
+          cluster_name: npm-kind
 
       - name: Check Kind
         run: |

.golangci.yml

@@ -18,7 +18,6 @@ linters:
   - gocritic
   - gocyclo
   - gofmt
-  - gomnd
   - goprintffuncname
   - gosimple
   - lll
@@ -35,6 +34,7 @@ linters-settings:
     disabled-checks:
     - "hugeParam"
   govet:
-    check-shadowing: true
+    enable:
+    - shadow
   lll:
     line-length: 200

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

@@ -120,6 +120,7 @@ stages:
                   echo "Deploy Azure-CNS"
                   sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
                   kubectl get po -owide -A
+                  kubectl get crd -A
       - ${{if eq(parameters.hubbleEnabled, true)}}:
         - job: deploy_cilium_components
           displayName: Deploy Cilium with Hubble
@@ -154,6 +155,7 @@ stages:
                   echo "Deploy Azure-CNS"
                   sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
                   kubectl get po -owide -A
+                  kubectl get crd -A
 
       - job: deploy_pods
         condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )
@@ -218,7 +220,7 @@ stages:
             displayName: "Get AKS Cluster"
           - script: |
               kubectl delete ns load-test
-              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption'
+              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!no-unexpected-packet-drops'
             retryCountOnTaskFailure: 6
             name: "CiliumConnectivityTests"
             displayName: "Run Cilium Connectivity Tests"

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

@@ -174,6 +174,10 @@ stages:
               name: cilium_overlay_nightly
               clusterName: ciliumnightly
         steps:
+          - template: ../../templates/k8s-yaml-test.yaml
+            parameters:
+              clusterName: $(clusterName)-$(commitID)
+
           - template: ../../templates/delete-cluster.yaml
             parameters:
               name: $(name)

.pipelines/cni/load-test-templates/create-cluster-template.yaml

@@ -23,7 +23,6 @@ steps:
         AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \
         CLUSTER=${{ parameters.clusterName }} NODE_COUNT=${{ parameters.nodeCount }} NODE_COUNT_WIN=${{ parameters.nodeCountWin }} \
         VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
-        WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} \
         OS_SKU=${{ parameters.osSKU }} OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{ parameters.os }}
         echo "Cluster successfully created"
 

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

@@ -218,7 +218,7 @@ stages:
             displayName: "Get AKS Cluster"
           - script: |
               kubectl delete ns load-test
-              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption'
+              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
             retryCountOnTaskFailure: 6
             name: "CiliumConnectivityTests"
             displayName: "Run Cilium Connectivity Tests"

.pipelines/cni/pipeline.yaml

@@ -164,7 +164,7 @@ stages:
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: win22_cniv1
-      clusterType: windows-cniv1-up
+      clusterType: cniv1-up
       clusterName: "win22-cniv1"
       nodeCount: ${NODE_COUNT_WINCLUSTER_SYSTEMPOOL}
       nodeCountWin: ${NODE_COUNT_WIN}
@@ -229,7 +229,7 @@ stages:
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: linux_cniv1
-      clusterType: linux-cniv1-up
+      clusterType: cniv1-up
       clusterName: "linux-cniv1"
       nodeCount: ${NODE_COUNT_LINUX}
       vmSize: ${VM_SIZE}

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

@@ -57,6 +57,7 @@ stages:
                 vmSizeWin: ${{ parameters.vmSizeWin }}
                 region: $(location)
                 osSKU: ${{ parameters.osSKU }}
+                os: ${{ parameters.os }}
 
 # If ensures that only windows template calls are compared against the below condition
 # Condition confirms that:

.pipelines/networkobservability/pipeline.yaml

@@ -116,7 +116,7 @@ stages:
         - script: |
               echo "Run Cilium Connectivity Tests"
               cilium status
-              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption'
+              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
           retryCountOnTaskFailure: 3
           name: "ciliumConnectivityTests"
           displayName: "Run Cilium Connectivity Tests"

.pipelines/npm/npm-conformance-tests.yaml

@@ -110,6 +110,10 @@ stages:
             AZURE_CLUSTER: "conformance-v2-linux-stress"
             PROFILE: "v2-background"
             IS_STRESS_TEST: "true"
+          v2-place-first:
+            AZURE_CLUSTER: "conformance-v2-place-first"
+            PROFILE: "v2-place-first"
+            IS_STRESS_TEST: "false"
       pool:
         name: $(BUILD_POOL_NAME_DEFAULT)
         demands:
@@ -251,15 +255,23 @@ stages:
               set -e
               make -C ./hack/aks set-kubeconf AZCLI=az GROUP=$(RESOURCE_GROUP) CLUSTER=$(AZURE_CLUSTER)
 
-              # sig-release provides test suite tarball(s) per k8s release. Just need to provide k8s version "v1.xx.xx"
-              # pulling k8s version from AKS.
-              eval k8sVersion="v"$( az aks show -g $(RESOURCE_GROUP) -n $(AZURE_CLUSTER) --query "currentKubernetesVersion")
-              echo $k8sVersion
-              curl -L https://dl.k8s.io/$k8sVersion/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
-
-              # https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list
-              # explictly unzip and strip directories from ginkgo and e2e.test
-              tar -xvzf kubernetes-test-linux-amd64.tar.gz --strip-components=3 kubernetes/test/bin/ginkgo kubernetes/test/bin/e2e.test
+              if [ $(PROFILE) == "v2-place-first" ]; then
+                git clone --depth=1 --branch=huntergregory/service-types https://github.com/huntergregory/network-policy-api.git
+                cd network-policy-api/cmd/policy-assistant
+                make policy-assistant
+                cd ../../..
+                mv network-policy-api/cmd/policy-assistant/cmd/policy-assistant/policy-assistant .
+              else
+                # sig-release provides test suite tarball(s) per k8s release. Just need to provide k8s version "v1.xx.xx"
+                # pulling k8s version from AKS.
+                eval k8sVersion="v"$( az aks show -g $(RESOURCE_GROUP) -n $(AZURE_CLUSTER) --query "currentKubernetesVersion")
+                echo $k8sVersion
+                curl -L https://dl.k8s.io/$k8sVersion/kubernetes-test-linux-amd64.tar.gz -o ./kubernetes-test-linux-amd64.tar.gz
+
+                # https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list
+                # explictly unzip and strip directories from ginkgo and e2e.test
+                tar -xvzf kubernetes-test-linux-amd64.tar.gz --strip-components=3 kubernetes/test/bin/ginkgo kubernetes/test/bin/e2e.test
+              fi
 
           displayName: "Setup Environment"
 
@@ -280,8 +292,13 @@ stages:
             echo $FQDN
 
             runConformance () {
-                KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 ./e2e.test --provider=local --ginkgo.focus="NetworkPolicy" --ginkgo.skip="SCTP" --kubeconfig=./kubeconfig
-                # there can't be a command after e2e.test because the exit code is important
+                if [ $(PROFILE) == "v2-place-first" ]; then
+                  # 15 minute timeout for creating LoadBalancer with Azure-internal "external IPs"
+                  ./policy-assistant generate --noisy=true --job-timeout-seconds=2 --pod-creation-timeout-seconds 900 --server-protocol TCP,UDP --ignore-loopback --include special-services --exclude cni-brings-source-pod-info-to-other-node
+                else
+                  KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 ./e2e.test --provider=local --ginkgo.focus="NetworkPolicy" --ginkgo.skip="SCTP" --kubeconfig=./kubeconfig
+                fi
+                # there can't be a command after e2e.test/policy-assistant because the exit code is important
             }
 
             runConformanceWindows () {