Skip to content

Commit dfb9e66

Browse files
author
Cecile Robert-Michon
committed
Upgrade k8s version in docs and tests to 1.19.7
1 parent e7ebdf3 commit dfb9e66

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ settings = {
1414
"kind_cluster_name": "capz",
1515
"capi_version": "v0.3.12",
1616
"cert_manager_version": "v0.16.1",
17-
"kubernetes_version": "v1.19.4",
17+
"kubernetes_version": "v1.19.7",
1818
"aks_kubernetes_version": "v1.18.8"
1919
}
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ metadata:
115115
name: controlplane-0
116116
namespace: default
117117
spec:
118-
version: "v1.19.4"
118+
version: "v1.19.7"
119119
clusterName: my-cluster
120120
failureDomain: "1"
121121
bootstrap:

docs/book/src/topics/gpu.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ AZURE_CONTROL_PLANE_MACHINE_TYPE=Standard_D2s_v3 \
2727
AZURE_NODE_MACHINE_TYPE=Standard_NC6s_v3 \
2828
AZURE_LOCATION=southcentralus \
2929
clusterctl config cluster azure-gpu \
30-
--kubernetes-version=v1.19.4 \
30+
--kubernetes-version=v1.19.7 \
3131
--worker-machine-count=1 \
3232
--flavor=nvidia-gpu > azure-gpu-cluster.yaml
3333
```
@@ -57,8 +57,8 @@ NAME PHASE
5757
azure-gpu Provisioned
5858
$ kubectl get machines
5959
NAME PROVIDERID PHASE VERSION
60-
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
61-
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
60+
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
61+
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
6262
```
6363

6464
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
7272
kube-system nvidia-device-plugin-daemonset-d5dn6 1/1 Running 0 16m
7373
$ kubectl get nodes
7474
NAME STATUS ROLES AGE VERSION
75-
azure-gpu-control-plane-nnb57 Ready master 42m v1.19.4
76-
azure-gpu-md-0-gcc8v Ready <none> 38m v1.19.4
75+
azure-gpu-control-plane-nnb57 Ready master 42m v1.19.7
76+
azure-gpu-md-0-gcc8v Ready <none> 38m v1.19.7
7777
$ kubectl get node azure-gpu-md-0-gcc8v -o jsonpath={.status.allocatable} | jq
7878
{
7979
"attachable-volumes-azure-disk": "12",

docs/book/src/topics/machinepools.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ for that.
4545
Make sure to set up your Azure environment as described [here](https://cluster-api.sigs.k8s.io/user/quick-start.html).
4646

4747
```shell
48-
clusterctl config cluster my-cluster --kubernetes-version v1.19.4 --flavor machinepool > my-cluster.yaml
48+
clusterctl config cluster my-cluster --kubernetes-version v1.19.7 --flavor machinepool > my-cluster.yaml
4949
```
5050

5151
The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors)
@@ -75,7 +75,7 @@ spec:
7575
apiVersion: exp.infrastructure.cluster.x-k8s.io/v1alpha3
7676
kind: AzureMachinePool
7777
name: capz-mp-0
78-
version: v1.19.4
78+
version: v1.19.7
7979
---
8080
apiVersion: exp.infrastructure.cluster.x-k8s.io/v1alpha3
8181
kind: AzureMachinePool

docs/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ export CONTROL_PLANE_MACHINE_COUNT=3
290290
export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_D2s_v3"
291291
export AZURE_NODE_MACHINE_TYPE="Standard_D2s_v3"
292292
export WORKER_MACHINE_COUNT=2
293-
export KUBERNETES_VERSION="v1.19.4"
293+
export KUBERNETES_VERSION="v1.19.7"
294294

295295
# Generate SSH key.
296296
# 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export CONTROL_PLANE_MACHINE_COUNT=${CONTROL_PLANE_MACHINE_COUNT:-3}
4545
export AZURE_CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_D2s_v3}"
4646
export AZURE_NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_D2s_v3}"
4747
export WORKER_MACHINE_COUNT=${WORKER_MACHINE_COUNT:-2}
48-
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.19.4}"
48+
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.19.7}"
4949
export TEMPLATE_PATH="${TEMPLATE_PATH:-cluster-template.yaml}"
5050

5151
# Generate SSH key.

templates/flavors/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
In `clusterctl` the infrastructure provider authors can provide different type of cluster templates,
44
or flavors; use the --flavor flag to specify which flavor to use; e.g
55
```shell
6-
clusterctl config cluster my-cluster --kubernetes-version v1.19.4 \
6+
clusterctl config cluster my-cluster --kubernetes-version v1.19.7 \
77
--flavor external-cloud-provider > my-cluster.yaml
88
```
99
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
7070
"AZURE_LOCATION": "eastus",
7171
"AZURE_RESOURCE_GROUP": "test-resource-group-name",
7272
"CONTROL_PLANE_MACHINE_COUNT": "1",
73-
"KUBERNETES_VERSION": "v1.19.4",
73+
"KUBERNETES_VERSION": "v1.19.7",
7474
"AZURE_CONTROL_PLANE_MACHINE_TYPE": "Standard_D2s_v3",
7575
"WORKER_MACHINE_COUNT": "2",
7676
"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
100100
"metadata": {
101101
"AZURE_CONTROL_PLANE_MACHINE_TYPE": "Standard_D2s_v3",
102102
"AZURE_LOCATION": "southcentralus",
103-
"KUBERNETES_VERSION": "v1.19.4",
103+
"KUBERNETES_VERSION": "v1.19.7",
104104
"WORKER_MACHINE_COUNT": "1"
105105
}
106106
}

test/e2e/config/azure-dev.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ providers:
6868
targetName: "cluster-template-machine-pool-windows.yaml"
6969

7070
variables:
71-
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.19.4}"
71+
KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.19.7}"
7272
ETCD_VERSION_UPGRADE_TO: "3.4.3-0"
7373
COREDNS_VERSION_UPGRADE_TO: "1.6.7"
74-
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.19.4}"
75-
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.18.12}"
74+
KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-v1.19.7}"
75+
KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-v1.18.15}"
7676
CNI: "${PWD}/templates/addons/calico.yaml"
7777
CNI_IPV6: "${PWD}/templates/addons/calico-ipv6.yaml"
7878
CNI_WINDOWS: "${PWD}/templates/test/cluster-template-prow-windows-addons.yaml"
7979
REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"
8080
EXP_AKS: "true"
8181
EXP_MACHINE_POOL: "true"
8282
EXP_CLUSTER_RESOURCE_SET: "true"
83-
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.19.4"
83+
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "v1.19.7"
8484
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
8585
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
8686
VM_SSH_PORT: "22"

0 commit comments

Comments
 (0)