From 97d44bbe2d9b5d396a84602f42abb18340629550 Mon Sep 17 00:00:00 2001 From: vakr Date: Tue, 18 Oct 2022 09:43:27 -0700 Subject: [PATCH 1/4] [NPM][Windows] remove preview flag --- .pipelines/npm/npm-conformance-tests-latest-release.yaml | 8 -------- .pipelines/npm/npm-conformance-tests.yaml | 8 -------- .pipelines/npm/npm-cyc-win-tests-latest-release.yaml | 4 ---- 3 files changed, 20 deletions(-) diff --git a/.pipelines/npm/npm-conformance-tests-latest-release.yaml b/.pipelines/npm/npm-conformance-tests-latest-release.yaml index 3ff85460aa..d9ec5fd2d1 100644 --- a/.pipelines/npm/npm-conformance-tests-latest-release.yaml +++ b/.pipelines/npm/npm-conformance-tests-latest-release.yaml @@ -124,10 +124,6 @@ jobs: az extension add --name aks-preview az extension update --name aks-preview - # Enable Microsoft.ContainerService/AKSWindows2022Preview - az feature register --namespace Microsoft.ContainerService --name AKSWindows2022Preview - az provider register -n Microsoft.ContainerService - echo "creating WS22 Cluster"; az aks create \ --resource-group $(RESOURCE_GROUP) \ @@ -351,10 +347,6 @@ jobs: az extension add --name aks-preview az extension update --name aks-preview - # Enable Microsoft.ContainerService/AKSWindows2022Preview - az feature register --namespace Microsoft.ContainerService --name AKSWindows2022Preview - az provider register -n Microsoft.ContainerService - export CLUSTER_NAME=$(RESOURCE_GROUP)-$(PROFILE) echo "Creating resource group named $CLUSTER_NAME" diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml index ef412321cc..63fa9166e4 100644 --- a/.pipelines/npm/npm-conformance-tests.yaml +++ b/.pipelines/npm/npm-conformance-tests.yaml @@ -169,10 +169,6 @@ jobs: az extension add --name aks-preview az extension update --name aks-preview - # Enable Microsoft.ContainerService/AKSWindows2022Preview - az feature register --namespace Microsoft.ContainerService --name AKSWindows2022Preview - az provider register -n Microsoft.ContainerService - echo "creating WS22 Cluster"; az aks create \ --resource-group $(RESOURCE_GROUP) \ @@ -396,10 +392,6 @@ jobs: az extension add --name aks-preview az extension update --name aks-preview - # Enable Microsoft.ContainerService/AKSWindows2022Preview - az feature register --namespace Microsoft.ContainerService --name AKSWindows2022Preview - az provider register -n Microsoft.ContainerService - export CLUSTER_NAME=$(RESOURCE_GROUP)-$(PROFILE) echo "Creating resource group named $CLUSTER_NAME" diff --git a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml index 2d4e438f97..6f51924638 100644 --- a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml +++ b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml @@ -69,10 +69,6 @@ jobs: az extension add --name aks-preview az extension update --name aks-preview - # Enable Microsoft.ContainerService/AKSWindows2022Preview - az feature register --namespace Microsoft.ContainerService --name AKSWindows2022Preview - az provider register -n Microsoft.ContainerService - export CLUSTER_NAME=$(RESOURCE_GROUP) echo "Creating resource group named $CLUSTER_NAME" From 26345cf28ecc5d9a77764698de42ea7caa8fe94d Mon Sep 17 00:00:00 2001 From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com> Date: Tue, 18 Oct 2022 09:59:23 -0700 Subject: [PATCH 2/4] remove k8s version in one file --- .pipelines/npm/npm-conformance-tests-latest-release.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pipelines/npm/npm-conformance-tests-latest-release.yaml b/.pipelines/npm/npm-conformance-tests-latest-release.yaml index d9ec5fd2d1..4f15ecd4fb 100644 --- a/.pipelines/npm/npm-conformance-tests-latest-release.yaml +++ b/.pipelines/npm/npm-conformance-tests-latest-release.yaml @@ -133,7 +133,6 @@ jobs: --windows-admin-password alpha@numeric!password2 \ --network-plugin azure \ --vm-set-type VirtualMachineScaleSets \ - --kubernetes-version v1.23.5 \ --node-vm-size Standard_D4s_v3 \ --node-count 1 @@ -362,7 +361,6 @@ jobs: --network-plugin azure \ --vm-set-type VirtualMachineScaleSets \ --node-vm-size Standard_D4s_v3 \ - --kubernetes-version v1.23.5 \ --node-count 1 # don't schedule anything on the linux system pool From 4e623f0863c5ca125769850b386dc1f70f126bb7 Mon Sep 17 00:00:00 2001 From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:00:10 -0700 Subject: [PATCH 3/4] remove k8s version in another file --- .pipelines/npm/npm-conformance-tests.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.pipelines/npm/npm-conformance-tests.yaml index 63fa9166e4..44a1520478 100644 --- a/.pipelines/npm/npm-conformance-tests.yaml +++ b/.pipelines/npm/npm-conformance-tests.yaml @@ -178,7 +178,6 @@ jobs: --windows-admin-password alpha@numeric!password2 \ --network-plugin azure \ --vm-set-type VirtualMachineScaleSets \ - --kubernetes-version v1.23.5 \ --node-vm-size Standard_D4s_v3 \ --node-count 1 @@ -407,7 +406,6 @@ jobs: --network-plugin azure \ --vm-set-type VirtualMachineScaleSets \ --node-vm-size Standard_D4s_v3 \ - --kubernetes-version v1.23.5 \ --node-count 1 # don't schedule anything on the linux system pool From 28ab92f48143bb048bb5e5511bfbf69e289b3a73 Mon Sep 17 00:00:00 2001 From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:00:37 -0700 Subject: [PATCH 4/4] remove k8s version in third file --- .pipelines/npm/npm-cyc-win-tests-latest-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml index 6f51924638..2cf620f6be 100644 --- a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml +++ b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml @@ -90,7 +90,6 @@ jobs: --network-plugin azure \ --vm-set-type VirtualMachineScaleSets \ --node-vm-size Standard_D4s_v3 \ - --kubernetes-version v1.23.5 \ --node-count 1 if [ $? != 0 ]