test: Add WS2022 Test to Pipeline

.pipelines/pipeline.yaml

@@ -240,6 +240,16 @@ stages:
       clusterDefinitionCniBuildOS: "windows"
       clusterDefinitionCniBuildExt: ".zip"
 
+  - template: singletenancy/aks-engine/e2e-job-template.yaml
+    parameters:
+      name: "windows_20_22_e2e"
+      displayName: "Windows 2022"
+      pipelineBuildImage: "$(BUILD_IMAGE)"
+      clusterDefinition: "cniWindows2022.json"
+      clusterDefinitionCniTypeKey: "azureCNIURLWindows"
+      clusterDefinitionCniBuildOS: "windows"
+      clusterDefinitionCniBuildExt: ".zip"
+
   - template: singletenancy/aks-engine/e2e-dualstack-job-template.yaml
     parameters:
       name: "ubuntu_18_04_linux_dualstack_e2e"

.pipelines/singletenancy/aks-engine/e2e-step-template.yaml

@@ -29,21 +29,25 @@ steps:
       echo Using AKS-Engine version $aksEVersion
 
       #download source
-      wget https://github.com/Azure/aks-engine/archive/$aksEVersion.tar.gz
+      wget https://github.com/jaer-tsun/aks-engine/archive/v1.0.4.tar.gz
 
-      #extract source
-      tar -zxf $aksEVersion.tar.gz
+      # extract source
+      #tar -zxf $aksEVersion.tar.gz
+      tar -zxf v1.0.4.tar.gz
 
       # move source to current directory
       mv aks-engine-*/* .
 
       # download binary
-      wget https://github.com/Azure/aks-engine/releases/download/$aksEVersion/aks-engine-$aksEVersion-linux-amd64.tar.gz
+      wget https://github.com/jaer-tsun/aks-engine/releases/download/v1.0.4/aks-engine-v1.0.4-linux-amd64.tar.gz
+      rm -rf ./bin
       mkdir ./bin
 
-      #extract binary
-      tar -zxvf aks-engine-$aksEVersion-linux-amd64.tar.gz -C bin
+      # extract binary
+      tar -zxvf aks-engine-v1.0.4-linux-amd64.tar.gz -C bin
       mv ./bin/aks-engine-*/* ./bin/
+      ls -l ./bin
+      ./bin/aks-engine version
       echo '##vso[task.prependpath]$(GOBIN)'
       echo '##vso[task.prependpath]$(GOROOT)/bin'
     name: "GoEnv"
@@ -69,6 +73,15 @@ steps:
       cat '${{ parameters.clusterDefinition }}' | jq --arg cnikey $CNI_TYPE --arg cniurl $CNI_URL '.properties.orchestratorProfile.kubernetesConfig[$cnikey]= $cniurl' > '${{ parameters.clusterDefinition }}'.tmp	
       cat '${{ parameters.clusterDefinition }}'.tmp | jq --arg tag $(Tag) '.properties.orchestratorProfile.kubernetesConfig.azureCNIVersion = $tag' > '${{ parameters.clusterDefinition }}'
       cat '${{ parameters.clusterDefinition }}' | jq --arg npmimage $IMAGE_REGISTRY/azure-npm:$(Tag) '.properties.orchestratorProfile.kubernetesConfig.addons[0].containers[0].image = $npmimage' > '${{ parameters.clusterDefinition }}'.tmp
+      if [ "${{ parameters.Name }}" == "windows_20_22_e2e" ]; then
+        if [[ -z $(WS2022_IMG_SUBSCRIPTION) || -z $(WS2022_IMG_VERSION) ]]; then
+          echo WS2022 Gallery/Image Subscription and Version not set, using defaults in cniWindows2022.json
+        else
+          echo Using WS2022 Gallery/Image Subscription: $(WS2022_IMG_SUBSCRIPTION) and Version: $(WS2022_IMG_VERSION)
+          cat '${{ parameters.clusterDefinition }}'.tmp | jq --arg subscription $(WS2022_IMG_SUBSCRIPTION) '.properties.windowsProfile.imageReference.subscriptionId = $subscription' > '${{ parameters.clusterDefinition }}'
+          cat '${{ parameters.clusterDefinition }}' | jq --arg version $(WS2022_IMG_VERSION) '.properties.windowsProfile.imageReference.version = $version' > '${{ parameters.clusterDefinition }}'.tmp
+        fi
+      fi
       mv '${{ parameters.clusterDefinition }}'.tmp '${{ parameters.clusterDefinition }}'
       echo "Running E2E tests against a cluster built with the following API model:" 
       cp ${{ parameters.clusterDefinition }} clusterDefinition.json

test/apimodels/cniLinux1804.json

@@ -4,6 +4,7 @@
       "orchestratorProfile": {
          "orchestratorType": "Kubernetes",
          "orchestratorRelease": "1.22",
+         "orchestratorVersion": "1.22.7",
          "kubernetesConfig": {
             "networkPlugin": "azure",
             "networkPolicy": "azure",

test/apimodels/cniLinuxDualstack1804.json

@@ -6,7 +6,8 @@
     },
     "orchestratorProfile": {
       "orchestratorType": "Kubernetes",
-      "orchestratorRelease": "1.21",
+      "orchestratorRelease": "1.22",
+      "orchestratorVersion": "1.22.2",
       "kubernetesConfig": {
         "loadBalancerSku": "Standard",
         "excludeMasterFromStandardLB": true,

test/apimodels/cniWindows1903.json

@@ -3,7 +3,8 @@
    "properties": {
       "orchestratorProfile": {
          "orchestratorType": "Kubernetes",
-         "orchestratorRelease": "1.17",
+         "orchestratorRelease": "1.22",
+         "orchestratorVersion": "1.22.7",
          "kubernetesConfig": {
             "networkPlugin": "azure",
             "networkPolicy": "azure",
@@ -58,4 +59,4 @@
          "secret": ""
       }
    }
-}
+}

test/apimodels/cniWindows2004.json

@@ -3,7 +3,8 @@
    "properties": {
       "orchestratorProfile": {
          "orchestratorType": "Kubernetes",
-         "orchestratorRelease": "1.17",
+         "orchestratorRelease": "1.22",
+         "orchestratorVersion": "1.22.7",
          "kubernetesConfig": {
             "networkPlugin": "azure",
             "networkPolicy": "azure",

test/apimodels/cniWindows2022.json

@@ -0,0 +1,74 @@
+{
+    "apiVersion": "vlabs",
+    "properties": {
+        "orchestratorProfile": {
+            "orchestratorType": "Kubernetes",
+            "orchestratorRelease": "1.22",
+            "orchestratorVersion": "1.22.7",
+            "kubernetesConfig": {
+                "networkPlugin": "azure",
+                "networkPolicy": "azure",
+                "containerRuntime": "containerd",
+                "windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.6.2/containerd-1.6.2-windows-amd64.tar.gz",
+                "apiServerConfig": {
+                    "--tls-min-version": "VersionTLS12",
+                    "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
+                    "--feature-gates": "WindowsHostProcessContainers=true"
+                },
+                "kubeletConfig": {
+                    "--feature-gates": "WindowsHostProcessContainers=true"
+                },
+                "addons": [
+                    {
+                        "name": "azure-npm-daemonset",
+                        "enabled": true,
+                        "containers": [
+                            {
+                                "name": "azure-npm-daemonset",
+                                "image": ""
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
+        "masterProfile": {
+            "count": 1,
+            "vmSize": "Standard_D2_v2"
+        },
+        "agentPoolProfiles": [{
+                "name": "windowspool2",
+                "count": 2,
+                "vmSize": "Standard_D2_v2",
+                "availabilityProfile": "VirtualMachineScaleSets",
+                "osType": "Windows"
+        }],
+        "windowsProfile": {
+            "adminUsername": "azureuser",
+            "adminPassword": "azureTest@!",
+            "enableAutomaticUpdates": false,
+            "sshEnabled": false,
+            "windowsPauseImageURL": "mcr.microsoft.com/oss/kubernetes/pause:3.6",
+            "alwaysPullWindowsPauseImage": true,
+            "imageReference": {
+                "subscriptionId": "a15c116e-99e3-4c59-aebc-8f864929b4a0",
+                "resourceGroup": "akswinvhdbuilderrg",
+                "gallery": "AKSWindows",
+                "name": "windows-2022-containerd",
+                "version": "20348.643.220413"
+            }
+        },
+        "linuxProfile": {
+            "adminUsername": "azureuser",
+            "ssh": {
+                "publicKeys": [{
+                        "keyData": ""
+                    }]
+            }
+        },
+        "servicePrincipalProfile": {
+           "clientId": "",
+           "secret": ""
+        }
+    }
+}

test/apimodels/cniWindowsDualstack2004.json

@@ -6,7 +6,8 @@
     },
     "orchestratorProfile": {
       "orchestratorType": "Kubernetes",
-      "orchestratorRelease": "1.21",
+      "orchestratorRelease": "1.22",
+      "orchestratorVersion": "1.22.2",
       "kubernetesConfig": {
         "loadBalancerSku": "Standard",
         "excludeMasterFromStandardLB": true,