diff --git a/Documentation/contributor-guide/bump_etcd_version_k8s.md b/Documentation/contributor-guide/bump_etcd_version_k8s.md index f055ea981212..7b157ef6ed4a 100644 --- a/Documentation/contributor-guide/bump_etcd_version_k8s.md +++ b/Documentation/contributor-guide/bump_etcd_version_k8s.md @@ -55,18 +55,22 @@ You can refer to the guide [here](https://github.com/kubernetes/community/blob/m > Reference: [link 1](https://github.com/kubernetes/kubernetes/pull/131105) [link 2](https://github.com/kubernetes/kubernetes/pull/131126) -1. In `build/dependencies.yaml`, update the `version` of `etcd-image` and `golang: etcd release version` to the new version. +1. In `build/dependencies.yaml`, update the `version` of `etcd-image` to the new version. Update `golang: etcd release version` if necessary. ```yaml - name: "etcd-image" - # version: 3.5.17 - version: 3.5.21 - refPaths: - - path: cluster/images/etcd/Makefile - match: BUNDLED_ETCD_VERSIONS\?| + # version: 3.5.17 + version: 3.5.21 + refPaths: + - path: cluster/images/etcd/Makefile + match: BUNDLED_ETCD_VERSIONS\?| + --- + - name: "golang: etcd release version" + # version: 1.22.9 + version: 1.23.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md ``` -2. In `cluster/images/etcd/Makefile`, include the new version in `BUNDLED_ETCD_VERSIONS` and update the `LATEST_ETCD_VERSION` as well (the image tag will be generated from the `LATEST_ETCD_VERSION`). Update `GOLANG_VERSION` if necessary. +2. In `cluster/images/etcd/Makefile`, include the new version in `BUNDLED_ETCD_VERSIONS` and update the `LATEST_ETCD_VERSION` as well (the image tag will be generated from the `LATEST_ETCD_VERSION`). Update `GOLANG_VERSION` according to the version used to compile that release version (`"golang: etcd release version"` in step 1). ```Makefile # BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17