From 1232bd6689294bb3e2fdb332053f2cf8239678c5 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Thu, 11 Mar 2021 13:28:40 -0600 Subject: [PATCH 1/2] Bump zuul jobs to k8s 1.20 1.20 has been out for some time now, good to raise our tested version on OpenLab. Signed-off-by: Sean McGinnis --- .zuul.yaml | 24 ++++++++++++------------ docs/configuration.md | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6536da348b..27df6c9377 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,9 +2,9 @@ name: kubernetes-sigs/cluster-api-provider-openstack check: jobs: - - cluster-api-provider-openstack-current-acceptance-test-v1.19-1 - - cluster-api-provider-openstack-current-acceptance-test-v1.19-2 - - cluster-api-provider-openstack-current-acceptance-test-v1.19-3 + - cluster-api-provider-openstack-current-acceptance-test-v1.20-1 + - cluster-api-provider-openstack-current-acceptance-test-v1.20-2 + - cluster-api-provider-openstack-current-acceptance-test-v1.20-3 - job: name: cluster-api-provider-openstack-conformance-pr @@ -21,33 +21,33 @@ extra_args: '' - job: - name: cluster-api-provider-openstack-current-acceptance-test-v1.19-1 + name: cluster-api-provider-openstack-current-acceptance-test-v1.20-1 parent: cluster-api-provider-openstack-conformance-pr description: | - Test CAPO current against Kubernetes release-1.19-1 + Test CAPO current against Kubernetes release-1.20-1 We run 3 jobs, so that at least one of them hits a cluster with a good CPU. It's fine if just one of them is successful. vars: - k8s_version_series: '1.19' + k8s_version_series: '1.20' extra_args: '--use-ci-artifacts' - job: - name: cluster-api-provider-openstack-current-acceptance-test-v1.19-2 + name: cluster-api-provider-openstack-current-acceptance-test-v1.20-2 parent: cluster-api-provider-openstack-conformance-pr description: | - Test CAPO current against Kubernetes release-1.19-2 + Test CAPO current against Kubernetes release-1.20-2 We run 3 jobs, so that at least one of them hits a cluster with a good CPU. It's fine if just one of them is successful. vars: - k8s_version_series: '1.19' + k8s_version_series: '1.20' extra_args: '--use-ci-artifacts' - job: - name: cluster-api-provider-openstack-current-acceptance-test-v1.19-3 + name: cluster-api-provider-openstack-current-acceptance-test-v1.20-3 parent: cluster-api-provider-openstack-conformance-pr description: | - Test CAPO current against Kubernetes release-1.19-3 + Test CAPO current against Kubernetes release-1.20-3 We run 3 jobs, so that at least one of them hits a cluster with a good CPU. It's fine if just one of them is successful. vars: - k8s_version_series: '1.19' + k8s_version_series: '1.20' extra_args: '--use-ci-artifacts' diff --git a/docs/configuration.md b/docs/configuration.md index f8dced3dc7..b11766224c 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -40,7 +40,7 @@ Note: You can use [the template file](../templates/cluster-template.yaml) by man # Using 'external-cloud-provider' flavor clusterctl config cluster capi-quickstart \ --flavor external-cloud-provider \ - --kubernetes-version v1.19.7 \ + --kubernetes-version v1.20.4 \ --control-plane-machine-count=3 \ --worker-machine-count=1 \ > capi-quickstart.yaml From 88d50b56cb14a054f8bb694b1134cc988c44ed37 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Thu, 11 Mar 2021 14:51:30 -0600 Subject: [PATCH 2/2] Update default k8s version in e2e-conformance This raises the default kubernetes version to the current latest 1.20.4. Signed-off-by: Sean McGinnis --- hack/ci/e2e-conformance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/ci/e2e-conformance.sh b/hack/ci/e2e-conformance.sh index 59ac75b34f..903164402b 100755 --- a/hack/ci/e2e-conformance.sh +++ b/hack/ci/e2e-conformance.sh @@ -34,7 +34,7 @@ OPENSTACK_BASTION_MACHINE_FLAVOR=${OPENSTACK_BASTION_MACHINE_FLAVOR:-"m1.tiny"} OPENSTACK_CLUSTER_TEMPLATE=${OPENSTACK_CLUSTER_TEMPLATE:-"./templates/cluster-template-without-lb.yaml"} CLUSTER_NAME=${CLUSTER_NAME:-"capi-quickstart"} OPENSTACK_SSH_KEY_NAME=${OPENSTACK_SSH_KEY_NAME:-"${CLUSTER_NAME}-key"} -KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.19.7"} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.20.4"} USE_CI_ARTIFACTS=${USE_CI_ARTIFACTS:-"true"} IMAGE_REPOSITORY=${IMAGE_REPOSITORY:-"k8s.gcr.io"}