Merge pull request #1588 from nader-ziada/k8s-1220

Update e2e tests to use k8s v1.22.1
kubernetes-sigs · Aug 24, 2021 · e9a2f2a · e9a2f2a
2 parents bf05fb9 + af62975
commit e9a2f2a
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md
@@ -323,7 +323,7 @@ export CONTROL_PLANE_MACHINE_COUNT=3
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_D2s_v3"
 export AZURE_NODE_MACHINE_TYPE="Standard_D2s_v3"
 export WORKER_MACHINE_COUNT=2
-export KUBERNETES_VERSION="v1.21.2"
+export KUBERNETES_VERSION="v1.22.1"
 
 # Generate SSH key.
 # If you want to provide your own key, skip this step and set AZURE_SSH_PUBLIC_KEY_B64 to your existing file.

diff --git a/docs/book/src/topics/failure-domains.md b/docs/book/src/topics/failure-domains.md
@@ -115,7 +115,7 @@ metadata:
   name: controlplane-0
   namespace: default
 spec:
-  version: "v1.21.2"
+  version: "v1.22.1"
   clusterName: my-cluster
   failureDomain: "1"
   bootstrap:

diff --git a/docs/book/src/topics/gpu.md b/docs/book/src/topics/gpu.md
@@ -28,7 +28,7 @@ AZURE_CONTROL_PLANE_MACHINE_TYPE=Standard_D2s_v3 \
 AZURE_NODE_MACHINE_TYPE=Standard_NC6s_v3 \
 AZURE_LOCATION=southcentralus \
 clusterctl generate cluster azure-gpu \
-  --kubernetes-version=v1.21.2 \
+  --kubernetes-version=v1.22.1 \
   --worker-machine-count=1 \
   --flavor=nvidia-gpu > azure-gpu-cluster.yaml
 ```
@@ -71,8 +71,8 @@ NAME        PHASE
 azure-gpu   Provisioned
 $ kubectl get machines
 NAME                             PROVIDERID                                                                                                                                     PHASE     VERSION
-azure-gpu-control-plane-t94nm    azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-control-plane-nnb57   Running   v1.21.2
-azure-gpu-md-0-f6b88dd78-vmkph   azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-md-0-gcc8v            Running   v1.21.2
+azure-gpu-control-plane-t94nm    azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-control-plane-nnb57   Running   v1.22.1
+azure-gpu-md-0-f6b88dd78-vmkph   azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-md-0-gcc8v            Running   v1.22.1
 ```
 
 Install a [CNI](https://cluster-api.sigs.k8s.io/user/quick-start.html#deploy-a-cni-solution) of your choice.
@@ -104,8 +104,8 @@ $ kubectl -n kube-system get po | grep nvidia
 kube-system   nvidia-device-plugin-daemonset-d5dn6                    1/1     Running   0          16m
 $ kubectl get nodes
 NAME                            STATUS   ROLES    AGE   VERSION
-azure-gpu-control-plane-nnb57   Ready    master   42m   v1.21.2
-azure-gpu-md-0-gcc8v            Ready    <none>   38m   v1.21.2
+azure-gpu-control-plane-nnb57   Ready    master   42m   v1.22.1
+azure-gpu-md-0-gcc8v            Ready    <none>   38m   v1.22.1
 $ kubectl get node azure-gpu-md-0-gcc8v -o jsonpath={.status.allocatable} | jq
 {
   "attachable-volumes-azure-disk": "12",

diff --git a/docs/book/src/topics/machinepools.md b/docs/book/src/topics/machinepools.md
@@ -89,7 +89,7 @@ for that.
 Make sure to set up your Azure environment as described [here](https://cluster-api.sigs.k8s.io/user/quick-start.html).
 
 ```shell
-clusterctl generate cluster my-cluster --kubernetes-version v1.21.2 --flavor machinepool > my-cluster.yaml
+clusterctl generate cluster my-cluster --kubernetes-version v1.22.0 --flavor machinepool > my-cluster.yaml
 ```
 
 The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors)
@@ -119,7 +119,7 @@ spec:
         apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
         kind: AzureMachinePool
         name: capz-mp-0
-      version: v1.21.2
+      version: v1.22.0
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
 kind: AzureMachinePool

diff --git a/hack/create-dev-cluster.sh b/hack/create-dev-cluster.sh
@@ -47,7 +47,7 @@ export CONTROL_PLANE_MACHINE_COUNT=${CONTROL_PLANE_MACHINE_COUNT:-3}
 export AZURE_CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_D2s_v3}"
 export AZURE_NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_D2s_v3}"
 export WORKER_MACHINE_COUNT=${WORKER_MACHINE_COUNT:-2}
-export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.21.2}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.22.1}"
 export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE:-cluster-template.yaml}"
 
 # identity secret settings.

diff --git a/templates/flavors/README.md b/templates/flavors/README.md
@@ -3,7 +3,7 @@
 In `clusterctl` the infrastructure provider authors can provide different type of cluster templates,
 or flavors; use the --flavor flag to specify which flavor to use; e.g
 ```shell
-clusterctl config cluster my-cluster --kubernetes-version v1.21.2 \
+clusterctl config cluster my-cluster --kubernetes-version v1.22.1 \
     --flavor external-cloud-provider > my-cluster.yaml
 ```
 See [`clusterctl` flavors docs](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors).
@@ -72,7 +72,7 @@ If you wish to override the default variables for flavor workers, you can specif
             "AZURE_LOCATION": "eastus",
             "AZURE_RESOURCE_GROUP": "test-resource-group-name",
             "CONTROL_PLANE_MACHINE_COUNT": "1",
-            "KUBERNETES_VERSION": "v1.21.2",
+            "KUBERNETES_VERSION": "v1.22.1",
             "AZURE_CONTROL_PLANE_MACHINE_TYPE": "Standard_D2s_v3",
             "WORKER_MACHINE_COUNT": "2",
             "AZURE_NODE_MACHINE_TYPE": "Standard_D2s_v3"
@@ -101,7 +101,7 @@ N-series node type just for the `nvidia-gpu` flavor in `tilt-settings.json` to o
         "metadata": {
             "AZURE_CONTROL_PLANE_MACHINE_TYPE": "Standard_D2s_v3",
             "AZURE_LOCATION": "southcentralus",
-            "KUBERNETES_VERSION": "v1.21.2",
+            "KUBERNETES_VERSION": "v1.22.1",
             "WORKER_MACHINE_COUNT": "1"
         }
     }

diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -47,7 +47,7 @@ spec:
       securityGroup:
         name: node-nsg
     vnet:
-      name: ${AZURE_VNET_NAME}
+      name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}
   resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}
 ---

diff --git a/templates/test/ci/prow-custom-vnet/patches/custom-vnet.yaml b/templates/test/ci/prow-custom-vnet/patches/custom-vnet.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   networkSpec:
     vnet:
-      name: ${AZURE_VNET_NAME}
+      name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}
     subnets:
       - name: ${CLUSTER_NAME}-controlplane-subnet
         role: control-plane

diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
@@ -96,22 +96,22 @@ providers:
       targetName: "cluster-template-custom-vnet.yaml"  
 
 variables:
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.21.2}"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.22.1}"
   # using a different version for windows because of an issue on azure cloud provider
   # that only affects windows and external load balancer  
   # https://github.com/kubernetes-sigs/cloud-provider-azure/issues/706
-  WINDOWS_KUBERNETES_VERSION: "${WINDOWS_KUBERNETES_VERSION:-v1.19.11}"
+  WINDOWS_KUBERNETES_VERSION: "${WINDOWS_KUBERNETES_VERSION:-v1.22.1}"
   AKS_KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.19.9}"
   ETCD_VERSION_UPGRADE_TO: "3.4.3-0"
   COREDNS_VERSION_UPGRADE_TO: "1.6.7"
-  KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.21.2}"
-  KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.19.11}"
+  KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.22.1}"
+  KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.21.4}"
   CNI: "${PWD}/templates/addons/calico.yaml"
   REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
   EXP_AKS: "true"
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
-  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.21.2"
+  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.22.1"
   CONFORMANCE_WORKER_MACHINE_COUNT: "2"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "${CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT:-1}"
   CONFORMANCE_IMAGE: "${CONFORMANCE_IMAGE:-}"