From 69db75a6173c1143e7c58917c5750dd1c620899e Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Mon, 13 May 2024 19:32:02 +0200 Subject: [PATCH] Document Kubernetes bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- .github/ISSUE_TEMPLATE/release_tracking.md | 19 +++++++++++++++++-- docs/release/release-tasks.md | 5 ----- .../flavorgen/cloudprovider/cpi/cpi.yaml | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release_tracking.md b/.github/ISSUE_TEMPLATE/release_tracking.md index f2d03edb27..37d50fb95c 100644 --- a/.github/ISSUE_TEMPLATE/release_tracking.md +++ b/.github/ISSUE_TEMPLATE/release_tracking.md @@ -15,8 +15,23 @@ Early in the cycle: * [ ] [Prepare main branch for development of the new release](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/release/release-tasks.md#prepare-main-branch-for-development-of-the-new-release) * [ ] [Remove previously deprecated code](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/release/release-tasks.md#remove-previously-deprecated-code) -If and when necessary: -* [ ] [Bump the Kubernetes version](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/release/release-tasks.md#optional-bump-the-kubernetes-version) +After the Kubernetes minor release: +* [ ] Bump the Kubernetes version + * [ ] Publish new OVA images + * Build new OVA images via image-builder + * Make them available in the CI environment + * Publish them via a GitHub release (e.g. [templates/v1.30.0](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/tag/templates/v1.30.0)) + * Update `README.md` accordingly + * [ ] Bump e2e tests + * Add the new image to `internal/test/helpers/vcsim/model.go` + * Bump template env variables in `test/e2e/config/vsphere.yaml` and `test/e2e/config/config-overrides-example.yaml` + * This includes `KUBERNETES_VERSION_*` env variables + * Also bump `KUBERNETES_VERSION_LATEST_CI` to the next minor version + * Bump in: + * `test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml` + * `test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml` + * Bump `CPI_IMAGE_K8S_VERSION` in `test/e2e/config/vsphere.yaml` + * [ ] Update ProwJob configuration accordingly Late in the cycle: * [ ] [Bump dependencies](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/release/release-tasks.md#bump-dependencies) diff --git a/docs/release/release-tasks.md b/docs/release/release-tasks.md index 6673da3385..d69190addf 100644 --- a/docs/release/release-tasks.md +++ b/docs/release/release-tasks.md @@ -9,7 +9,6 @@ - [Prepare main branch for development of the new release](#prepare-main-branch-for-development-of-the-new-release) - [Remove previously deprecated code](#remove-previously-deprecated-code) -- [[Optional] Bump the Kubernetes version](#optional-bump-the-kubernetes-version) - [Bump dependencies](#bump-dependencies) - [Create a release branch](#create-a-release-branch) - [Cut a release](#cut-a-release) @@ -63,10 +62,6 @@ The goal of this task is to remove all previously deprecated code that can be no Prior art: TODO(sbueringer): link example PR -## [Optional] Bump the Kubernetes version - -TODO(sbueringer): Write this when we do it the next time - ## Bump dependencies The goal of this task is to ensure that we have relatively up-to-date dependencies at the time of the release. diff --git a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml index d37cff00ac..93a800ef3e 100644 --- a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml +++ b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml @@ -155,7 +155,7 @@ spec: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0-rc.0 + image: gcr.io/cloud-provider-vsphere/cpi/release/manager:vx.y.z imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere