From a7d08be4cdc020b945b92903a92458c3b667441d Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 22 Mar 2022 15:27:00 -0700 Subject: [PATCH 1/9] Adding ws2022 tests --- .pipelines/pipeline.yaml | 10 +++ .../aks-engine/e2e-step-template.yaml | 6 +- test/apimodels/cniWindows2022.json | 72 +++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 test/apimodels/cniWindows2022.json diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index a4d12b884b..27a359cbbf 100644 --- a/.pipelines/pipeline.yaml +++ b/.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" diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index 18957db790..3eb4085864 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -29,10 +29,12 @@ steps: echo Using AKS-Engine version $aksEVersion #download source - wget https://github.com/Azure/aks-engine/archive/$aksEVersion.tar.gz + #wget https://github.com/Azure/aks-engine/archive/$aksEVersion.tar.gz + wget https://github.com/jaer-tsun/aks-engine/archive/v1.0.1.tar.gz #extract source - tar -zxf $aksEVersion.tar.gz + #tar -zxf $aksEVersion.tar.gz + tar -zxf v1.0.1.tar.gz # move source to current directory mv aks-engine-*/* . diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json new file mode 100644 index 0000000000..69c1083b10 --- /dev/null +++ b/test/apimodels/cniWindows2022.json @@ -0,0 +1,72 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.22", + "kubernetesConfig": { + "networkPlugin": "azure", + "networkPolicy": "azure", + "containerRuntime": "containerd", + "windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.5.6/containerd-1.5.6-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" + }, + "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": "8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8", + "resourceGroup": "akswinvhdbuilderrg", + "gallery": "AKSWindows", + "name": "windows-2022-containerd", + "version": "20348.524.220218" + } + }, + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [{ + "keyData": "" + }] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } +} \ No newline at end of file From 2af446a51fd31045117e6a61879dd2860e83a753 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 29 Mar 2022 09:43:14 -0700 Subject: [PATCH 2/9] add eof newline --- test/apimodels/cniWindows2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json index 69c1083b10..557958f410 100644 --- a/test/apimodels/cniWindows2022.json +++ b/test/apimodels/cniWindows2022.json @@ -69,4 +69,4 @@ "secret": "" } } -} \ No newline at end of file +} From 2f1b2314bf17cb802f020e0213562c43f9f9d189 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 29 Mar 2022 10:32:42 -0700 Subject: [PATCH 3/9] bumping orchestrator releas/version --- test/apimodels/cniLinux1804.json | 3 ++- test/apimodels/cniLinuxDualstack1804.json | 3 ++- test/apimodels/cniWindows1903.json | 5 +++-- test/apimodels/cniWindows2004.json | 3 ++- test/apimodels/cniWindows2022.json | 3 ++- test/apimodels/cniWindowsDualstack2004.json | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json index a522b79244..b6ed31b7b3 100644 --- a/test/apimodels/cniLinux1804.json +++ b/test/apimodels/cniLinux1804.json @@ -3,7 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", + "orchestratorRelease": "1.23", + "orchestratorVersion": "1.23.4", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniLinuxDualstack1804.json b/test/apimodels/cniLinuxDualstack1804.json index cdac0eeb7a..5edd41646f 100644 --- a/test/apimodels/cniLinuxDualstack1804.json +++ b/test/apimodels/cniLinuxDualstack1804.json @@ -6,7 +6,8 @@ }, "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.21", + "orchestratorRelease": "1.23", + "orchestratorVersion": "1.23.4", "kubernetesConfig": { "loadBalancerSku": "Standard", "excludeMasterFromStandardLB": true, diff --git a/test/apimodels/cniWindows1903.json b/test/apimodels/cniWindows1903.json index 68ac2c68e0..ce367c0611 100644 --- a/test/apimodels/cniWindows1903.json +++ b/test/apimodels/cniWindows1903.json @@ -3,7 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.17", + "orchestratorRelease": "1.23", + "orchestratorVersion": "1.23.4", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", @@ -58,4 +59,4 @@ "secret": "" } } -} \ No newline at end of file +} diff --git a/test/apimodels/cniWindows2004.json b/test/apimodels/cniWindows2004.json index 7bd61c857b..6fbea56faa 100644 --- a/test/apimodels/cniWindows2004.json +++ b/test/apimodels/cniWindows2004.json @@ -3,7 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.17", + "orchestratorRelease": "1.23", + "orchestratorVersion": "1.23.4", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json index 557958f410..3a27230e11 100644 --- a/test/apimodels/cniWindows2022.json +++ b/test/apimodels/cniWindows2022.json @@ -3,7 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", + "orchestratorRelease": "1.23", + "orchestratorVersion": "1.23.4", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniWindowsDualstack2004.json b/test/apimodels/cniWindowsDualstack2004.json index 0a4648a72f..de96d95d9c 100644 --- a/test/apimodels/cniWindowsDualstack2004.json +++ b/test/apimodels/cniWindowsDualstack2004.json @@ -6,7 +6,8 @@ }, "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.21", + "orchestratorRelease": "1.23", + "orchestratorVersion": "1.23.4", "kubernetesConfig": { "loadBalancerSku": "Standard", "excludeMasterFromStandardLB": true, From 624ebd3a32a3903f693b7ddbd5ce12e9bb310bef Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 29 Mar 2022 11:04:28 -0700 Subject: [PATCH 4/9] use containerd v1.6.2 --- test/apimodels/cniWindows2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json index 3a27230e11..45e329c13a 100644 --- a/test/apimodels/cniWindows2022.json +++ b/test/apimodels/cniWindows2022.json @@ -9,7 +9,7 @@ "networkPlugin": "azure", "networkPolicy": "azure", "containerRuntime": "containerd", - "windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.5.6/containerd-1.5.6-windows-amd64.tar.gz", + "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" From 5670726f56f0204baffc42c77a186c7d4a810171 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 29 Mar 2022 11:58:40 -0700 Subject: [PATCH 5/9] trying different orchestrator versions --- test/apimodels/cniLinux1804.json | 4 ++-- test/apimodels/cniLinuxDualstack1804.json | 4 ++-- test/apimodels/cniWindows1903.json | 4 ++-- test/apimodels/cniWindows2004.json | 4 ++-- test/apimodels/cniWindows2022.json | 4 ++-- test/apimodels/cniWindowsDualstack2004.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json index b6ed31b7b3..8b1db53183 100644 --- a/test/apimodels/cniLinux1804.json +++ b/test/apimodels/cniLinux1804.json @@ -3,8 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.23", - "orchestratorVersion": "1.23.4", + "orchestratorRelease": "1.22", + "orchestratorVersion": "1.22.7", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniLinuxDualstack1804.json b/test/apimodels/cniLinuxDualstack1804.json index 5edd41646f..3da81cc644 100644 --- a/test/apimodels/cniLinuxDualstack1804.json +++ b/test/apimodels/cniLinuxDualstack1804.json @@ -6,8 +6,8 @@ }, "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.23", - "orchestratorVersion": "1.23.4", + "orchestratorRelease": "1.22", + "orchestratorVersion": "1.22.2", "kubernetesConfig": { "loadBalancerSku": "Standard", "excludeMasterFromStandardLB": true, diff --git a/test/apimodels/cniWindows1903.json b/test/apimodels/cniWindows1903.json index ce367c0611..7450ad70ff 100644 --- a/test/apimodels/cniWindows1903.json +++ b/test/apimodels/cniWindows1903.json @@ -3,8 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.23", - "orchestratorVersion": "1.23.4", + "orchestratorRelease": "1.22", + "orchestratorVersion": "1.22.7", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniWindows2004.json b/test/apimodels/cniWindows2004.json index 6fbea56faa..64d8a312b7 100644 --- a/test/apimodels/cniWindows2004.json +++ b/test/apimodels/cniWindows2004.json @@ -3,8 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.23", - "orchestratorVersion": "1.23.4", + "orchestratorRelease": "1.22", + "orchestratorVersion": "1.22.7", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json index 45e329c13a..3379dc5d18 100644 --- a/test/apimodels/cniWindows2022.json +++ b/test/apimodels/cniWindows2022.json @@ -3,8 +3,8 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.23", - "orchestratorVersion": "1.23.4", + "orchestratorRelease": "1.22", + "orchestratorVersion": "1.22.7", "kubernetesConfig": { "networkPlugin": "azure", "networkPolicy": "azure", diff --git a/test/apimodels/cniWindowsDualstack2004.json b/test/apimodels/cniWindowsDualstack2004.json index de96d95d9c..2bbed7ec05 100644 --- a/test/apimodels/cniWindowsDualstack2004.json +++ b/test/apimodels/cniWindowsDualstack2004.json @@ -6,8 +6,8 @@ }, "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.23", - "orchestratorVersion": "1.23.4", + "orchestratorRelease": "1.22", + "orchestratorVersion": "1.22.2", "kubernetesConfig": { "loadBalancerSku": "Standard", "excludeMasterFromStandardLB": true, From aa9bfffa376069ff228edfd4df895d6e529380bb Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 29 Mar 2022 16:56:52 -0700 Subject: [PATCH 6/9] update pipeline template to pull aks-e from private release --- .../aks-engine/e2e-step-template.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index 3eb4085864..e2b53c8c00 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -29,23 +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.1.tar.gz + wget https://github.com/jaer-tsun/aks-engine/archive/v1.0.4.tar.gz - #extract source + # extract source #tar -zxf $aksEVersion.tar.gz - tar -zxf v1.0.1.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" From 8f7030ab7d6bf10d035d5d526cbe78540ea88bc7 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Tue, 19 Apr 2022 08:37:18 -0700 Subject: [PATCH 7/9] updating image reference --- test/apimodels/cniWindows2022.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json index 3379dc5d18..f9d1590231 100644 --- a/test/apimodels/cniWindows2022.json +++ b/test/apimodels/cniWindows2022.json @@ -50,11 +50,11 @@ "windowsPauseImageURL": "mcr.microsoft.com/oss/kubernetes/pause:3.6", "alwaysPullWindowsPauseImage": true, "imageReference": { - "subscriptionId": "8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8", + "subscriptionId": "a15c116e-99e3-4c59-aebc-8f864929b4a0", "resourceGroup": "akswinvhdbuilderrg", "gallery": "AKSWindows", "name": "windows-2022-containerd", - "version": "20348.524.220218" + "version": "20348.643.220413" } }, "linuxProfile": { From 33b33649ebd68ea2de6a1342be3944d67d8d2cf8 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Wed, 20 Apr 2022 10:17:51 -0700 Subject: [PATCH 8/9] Exposing ws2022 e2e gallery/image subscription and version as pipeline variables --- .../singletenancy/aks-engine/e2e-step-template.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index e2b53c8c00..a58e30f2d3 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -73,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 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 + else + echo WS2022 Gallery/Image Subscription and Version not set, using defaults in cniWindows2022.json + 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 From 121ad46a3c49b2ad527468e35609c8c4e46066b5 Mon Sep 17 00:00:00 2001 From: Jaeryn Date: Wed, 20 Apr 2022 11:05:06 -0700 Subject: [PATCH 9/9] Enabling host process containers in api server config --- .../singletenancy/aks-engine/e2e-step-template.yaml | 10 +++++----- test/apimodels/cniWindows2022.json | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index a58e30f2d3..cd2b2d2300 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -74,12 +74,12 @@ steps: 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 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 - else + 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 }}' diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json index f9d1590231..d1b6358959 100644 --- a/test/apimodels/cniWindows2022.json +++ b/test/apimodels/cniWindows2022.json @@ -12,7 +12,8 @@ "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" + "--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"