Skip to content

Commit 08c09be

Browse files
committed
docs: add example to change golang version
Signed-off-by: joshjms <[email protected]>
1 parent d4db438 commit 08c09be

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

Documentation/contributor-guide/bump_etcd_version_k8s.md

+11-7
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,22 @@ You can refer to the guide [here](https://github.com/kubernetes/community/blob/m
5555

5656
> Reference: [link 1](https://github.com/kubernetes/kubernetes/pull/131105) [link 2](https://github.com/kubernetes/kubernetes/pull/131126)
5757

58-
1. In `build/dependencies.yaml`, update the `version` of `etcd-image` and `golang: etcd release version` to the new version.
58+
1. In `build/dependencies.yaml`, update the `version` of `etcd-image` to the new version. Update `golang: etcd release version` if necessary.
5959

6060
```yaml
6161
- name: "etcd-image"
62-
# version: 3.5.17
63-
version: 3.5.21
64-
refPaths:
65-
- path: cluster/images/etcd/Makefile
66-
match: BUNDLED_ETCD_VERSIONS\?|
62+
# version: 3.5.17
63+
version: 3.5.21
64+
refPaths:
65+
- path: cluster/images/etcd/Makefile
66+
match: BUNDLED_ETCD_VERSIONS\?|
67+
---
68+
- name: "golang: etcd release version"
69+
# version: 1.22.9
70+
version: 1.23.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md
6771
```
6872

69-
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.
73+
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).
7074

7175
```Makefile
7276
# BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17

0 commit comments

Comments
 (0)