Merge branch 'master' into huntergregory/npm-legacy

Signed-off-by: Hunter Gregory <[email protected]>

Author: huntergregory

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

@@ -91,7 +91,7 @@ stages:
                   fi
 
                   echo "install Cilium ${CILIUM_VERSION_TAG}"
-                  export DIR=${CILIUM_VERSION_TAG%.*}
+                  export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
                   echo "installing files from ${DIR}"
 
                   echo "deploy Cilium ConfigMap"

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

@@ -47,7 +47,7 @@ stages:
                 pwd
 
                 echo "install Cilium ${CILIUM_VERSION_TAG}"
-                export DIR=${CILIUM_VERSION_TAG%.*}
+                export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
                 echo "installing files from ${DIR}"
 
                 echo "deploy Cilium ConfigMap"
@@ -117,7 +117,7 @@ stages:
                       new_count=${NODE_COUNT_UP} # Do not exceed NODE_COUNT_UP
                     fi
                     echo "Scaling up nodes to $new_count"
-                    az aks nodepool scale --name nodepool1 --cluster-name ${CLUSTER} --resource-group ${RESOURCE_GROUP} --node-count $new_count
+                    make -C ./hack/aks scale-nodes AZCLI=az GROUP=${RESOURCE_GROUP} CLUSTER=${CLUSTER} NODEPOOL=nodepool1 NODE_COUNT=$new_count
                     if [ $new_count -eq ${NODE_COUNT_UP} ]; then
                       echo "Node count reached ${NODE_COUNT_UP}"
                       break
@@ -442,6 +442,7 @@ stages:
       - job: scale_down
         pool:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
+        timeoutInMinutes: 120
         steps:
           - task: AzureCLI@2
             inputs:
@@ -453,8 +454,7 @@ stages:
                 set -ex
                 az aks get-credentials --resource-group ${RESOURCE_GROUP} --name ${CLUSTER}
                 echo "Scaling to 5 nodes"
-                vmss_name=$(az vmss list -g MC_${RESOURCE_GROUP}_${CLUSTER}_$(LOCATION) --query "[].name" -o tsv)
-                make -C ./hack/aks scale-vmss AZCLI=az GROUP=${RESOURCE_GROUP} CLUSTER=${CLUSTER} REGION=$(LOCATION) VMSS_NAME=$vmss_name NODE_COUNT=5
+                make -C ./hack/aks scale-nodes AZCLI=az GROUP=${RESOURCE_GROUP} CLUSTER=${CLUSTER} NODEPOOL=nodepool1 NODE_COUNT=5
                 kubectl get node
             name: "ScaleDown"
             displayName: "Scale down to 5 Nodes"

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

@@ -95,7 +95,7 @@ stages:
                   kubectl get po -owide -A
 
                   echo "install Cilium ${CILIUM_VERSION_TAG}"
-                  export DIR=${CILIUM_VERSION_TAG%.*}
+                  export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
                   echo "installing files from ${DIR}"
 
                   echo "deploy Cilium ConfigMap"

.pipelines/networkobservability/pipeline.yaml

@@ -77,7 +77,7 @@ stages:
             scriptType: "bash"
             addSpnToEnvironment: true
             inlineScript: |
-              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/pipeline.yaml

@@ -261,6 +261,17 @@ stages:
         k8sVersion: ""
         dependsOn: "containerize"
 
+    # Cilium Nodesubnet E2E tests
+    - template: singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml
+      parameters:
+        name: "cilium_nodesubnet_e2e"
+        displayName: Cilium NodeSubnet
+        clusterType: nodesubnet-byocni-nokubeproxy-up
+        clusterName: "cilndsubnete2e"
+        vmSize: Standard_B2s
+        k8sVersion: ""
+        dependsOn: "containerize"
+
     # Cilium Overlay E2E tests
     - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
       parameters:
@@ -405,6 +416,7 @@ stages:
         - azure_overlay_stateless_e2e
         - aks_swift_e2e
         - cilium_e2e
+        - cilium_nodesubnet_e2e
         - cilium_overlay_e2e
         - cilium_h_overlay_e2e
         - aks_ubuntu_22_linux_e2e
@@ -425,6 +437,10 @@ stages:
               cilium_e2e:
                 name: cilium_e2e
                 clusterName: "ciliume2e"
+                region: $(REGION_AKS_CLUSTER_TEST)                
+              cilium_nodesubnet_e2e:
+                name: cilium_nodesubnet_e2e
+                clusterName: "cilndsubnete2e"
                 region: $(REGION_AKS_CLUSTER_TEST)
               cilium_overlay_e2e:
                 name: cilium_overlay_e2e

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml

@@ -34,7 +34,7 @@ steps:
         kubectl cluster-info
         kubectl get po -owide -A
         echo "install Cilium ${CILIUM_DUALSTACK_VERSION}"
-        export DIR=${CILIUM_DUALSTACK_VERSION%.*}
+        export DIR=$(echo ${CILIUM_DUALSTACK_VERSION#v} | cut -d. -f1,2)
         echo "installing files from ${DIR}"
         echo "deploy Cilium ConfigMap"
         kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml

.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml

@@ -35,7 +35,7 @@ steps:
         kubectl cluster-info
         kubectl get po -owide -A
         echo "install Cilium ${CILIUM_DUALSTACK_VERSION}"
-        export DIR=${CILIUM_DUALSTACK_VERSION%.*}
+        export DIR=$(echo ${CILIUM_DUALSTACK_VERSION#v} | cut -d. -f1,2)
         echo "installing files from ${DIR}"
         echo "deploy Cilium ConfigMap"
         kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml

.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-job-template.yaml

@@ -71,9 +71,9 @@ stages:
           os: ${{ parameters.os }}
           datapath: true
           dns: true
+          cni: cilium
           portforward: true
           service: true
-          hostport: true
           dependsOn: ${{ parameters.name }}
 
       - job: failedE2ELogs

.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml

@@ -58,7 +58,7 @@ steps:
         kubectl cluster-info
         kubectl get po -owide -A
         echo "install Cilium ${CILIUM_VERSION_TAG}"
-        export DIR=${CILIUM_VERSION_TAG%.*}
+        export DIR=$(echo ${CILIUM_VERSION_TAG#v} | cut -d. -f1,2)
         echo "installing files from ${DIR}"
         echo "deploy Cilium ConfigMap"
         kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml

.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml

@@ -38,7 +38,7 @@ steps:
         make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
         ls -lah
         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