Merge pull request #1126 from CecileRobertMichon/k8s-1.19.7

Upgrade k8s version in docs and tests to 1.19.7

Author: k8s-ci-robot

Tiltfile

@@ -14,7 +14,7 @@ settings = {
     "kind_cluster_name": "capz",
     "capi_version": "v0.3.12",
     "cert_manager_version": "v0.16.1",
-    "kubernetes_version": "v1.19.4",
+    "kubernetes_version": "v1.19.7",
     "aks_kubernetes_version": "v1.18.8"
 }
 

docs/book/src/topics/failure-domains.md

@@ -115,7 +115,7 @@ metadata:
   name: controlplane-0
   namespace: default
 spec:
-  version: "v1.19.4"
+  version: "v1.19.7"
   clusterName: my-cluster
   failureDomain: "1"
   bootstrap:

docs/book/src/topics/gpu.md

@@ -27,7 +27,7 @@ AZURE_CONTROL_PLANE_MACHINE_TYPE=Standard_D2s_v3 \
 AZURE_NODE_MACHINE_TYPE=Standard_NC6s_v3 \
 AZURE_LOCATION=southcentralus \
 clusterctl config cluster azure-gpu \
-  --kubernetes-version=v1.19.4 \
+  --kubernetes-version=v1.19.7 \
   --worker-machine-count=1 \
   --flavor=nvidia-gpu > azure-gpu-cluster.yaml
 ```
@@ -57,8 +57,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.19.4
-azure-gpu-md-0-f6b88dd78-vmkph   azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-md-0-gcc8v            Running   v1.19.4
+azure-gpu-control-plane-t94nm    azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-control-plane-nnb57   Running   v1.19.7
+azure-gpu-md-0-f6b88dd78-vmkph   azure:////subscriptions/<subscription_id>/resourceGroups/azure-gpu/providers/Microsoft.Compute/virtualMachines/azure-gpu-md-0-gcc8v            Running   v1.19.7
 ```
 
 You can run these commands against the workload cluster to verify that the
@@ -72,8 +72,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.19.4
-azure-gpu-md-0-gcc8v            Ready    <none>   38m   v1.19.4
+azure-gpu-control-plane-nnb57   Ready    master   42m   v1.19.7
+azure-gpu-md-0-gcc8v            Ready    <none>   38m   v1.19.7
 $ kubectl get node azure-gpu-md-0-gcc8v -o jsonpath={.status.allocatable} | jq
 {
   "attachable-volumes-azure-disk": "12",

docs/book/src/topics/machinepools.md

@@ -45,7 +45,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 config cluster my-cluster --kubernetes-version v1.19.4 --flavor machinepool > my-cluster.yaml
+clusterctl config cluster my-cluster --kubernetes-version v1.19.7 --flavor machinepool > my-cluster.yaml
 ```
 
 The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors)
@@ -75,7 +75,7 @@ spec:
         apiVersion: exp.infrastructure.cluster.x-k8s.io/v1alpha3
         kind: AzureMachinePool
         name: capz-mp-0
-      version: v1.19.4
+      version: v1.19.7
 ---
 apiVersion: exp.infrastructure.cluster.x-k8s.io/v1alpha3
 kind: AzureMachinePool

docs/development.md

@@ -290,7 +290,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.19.4"
+export KUBERNETES_VERSION="v1.19.7"
 
 # 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.

hack/create-dev-cluster.sh

@@ -45,7 +45,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.19.4}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.19.7}"
 export TEMPLATE_PATH="${TEMPLATE_PATH:-cluster-template.yaml}"
 
 # Generate SSH key.

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.19.4 \
+clusterctl config cluster my-cluster --kubernetes-version v1.19.7 \
     --flavor external-cloud-provider > my-cluster.yaml
 ```
 See [`clusterctl` flavors docs](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors).
@@ -70,7 +70,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.19.4",
+            "KUBERNETES_VERSION": "v1.19.7",
             "AZURE_CONTROL_PLANE_MACHINE_TYPE": "Standard_D2s_v3",
             "WORKER_MACHINE_COUNT": "2",
             "AZURE_NODE_MACHINE_TYPE": "Standard_D2s_v3"
@@ -100,7 +100,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.19.4",
+            "KUBERNETES_VERSION": "v1.19.7",
             "WORKER_MACHINE_COUNT": "1"
         }
     }

test/e2e/config/azure-dev.yaml

@@ -68,19 +68,19 @@ providers:
         targetName: "cluster-template-machine-pool-windows.yaml"
 
 variables:
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.19.4}"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.19.7}"
   ETCD_VERSION_UPGRADE_TO: "3.4.3-0"
   COREDNS_VERSION_UPGRADE_TO: "1.6.7"
-  KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.19.4}"
-  KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.18.12}"
+  KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.19.7}"
+  KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.18.15}"
   CNI: "${PWD}/templates/addons/calico.yaml"
   CNI_IPV6: "${PWD}/templates/addons/calico-ipv6.yaml"
   CNI_WINDOWS: "${PWD}/templates/test/cluster-template-prow-windows-addons.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.19.4"
+  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.19.7"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
   VM_SSH_PORT: "22"