Skip to content

Commit

Permalink
Bump GOLANG_VERSION to build etcd (from 1.16.x to 1.17.x)
Browse files Browse the repository at this point in the history
Also fix REVISION back to `0` this was missed in the previous PR

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
  • Loading branch information
dims committed Nov 23, 2022
1 parent deba561 commit efd8723
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ dependencies:

# From https://github.com/etcd-io/etcd/blob/main/Makefile
- name: "golang: etcd release version"
version: 1.16.15 # for etcd v3.5.5: https://github.com/etcd-io/etcd/blob/19002cfc689fba2b8f56605e5797bf79f8b61fdd/Makefile#L58
version: 1.17.13 # for etcd v3.5.6: https://github.com/etcd-io/etcd/blob/v3.5.6/Makefile#L58 golang version should be 1.16.15, BUT because of newer dependencies in our repository we use newer golang which has `unsafe.Slice`
refPaths:
- path: cluster/images/etcd/Makefile
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?'

# Golang
- name: "golang: upstream version"
Expand Down
4 changes: 2 additions & 2 deletions cluster/images/etcd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.5.6
# REVISION provides a version number for this image and all it's bundled
# artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment
# for each revision of this image at that etcd version.
REVISION?=1
REVISION?=0

# IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
Expand Down Expand Up @@ -83,7 +83,7 @@ endif
# This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled
# golang version should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
GOLANG_VERSION?=1.16.15
GOLANG_VERSION := 1.17.13
GOARM?=7
TEMP_DIR:=$(shell mktemp -d)

Expand Down

0 comments on commit efd8723

Please sign in to comment.