Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build etcd image of v3.5.16 #127283

Merged
merged 1 commit into from
Sep 13, 2024
+7 −7
Merged

Build etcd image of v3.5.16 #127283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependencies:
match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"}

- name: "etcd-image"
version: 3.5.15
version: 3.5.16
refPaths:
- path: cluster/images/etcd/Makefile
match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
Expand Down Expand Up @@ -109,7 +109,7 @@ dependencies:

# From https://github.com/etcd-io/etcd/blob/main/Makefile
- name: "golang: etcd release version"
version: 1.21.12 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
version: 1.22.7 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
refPaths:
- path: cluster/images/etcd/Makefile
match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
Expand Down
8 changes: 4 additions & 4 deletions cluster/images/etcd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Build the etcd image
#
# Usage:
# [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.15] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.16] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
#
# The image contains different etcd versions to simplify
# upgrades. Thus be careful when removing any versions from here.
Expand All @@ -26,10 +26,10 @@
# Except from etcd-$(version) and etcdctl-$(version) binaries, we also
# need etcd and etcdctl binaries for backward compatibility reasons.
# That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.15
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.16

# LATEST_ETCD_VERSION identifies the most recent etcd version available.
LATEST_ETCD_VERSION?=3.5.15
LATEST_ETCD_VERSION?=3.5.16

# 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
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.21.12
GOLANG_VERSION := 1.22.7
GOARM?=7
TEMP_DIR:=$(shell mktemp -d)

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/etcd/migrate/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

var (
supportedEtcdVersions = []string{"3.4.18", "3.5.15"}
supportedEtcdVersions = []string{"3.4.18", "3.5.16"}
Copy link
Member

@pacoxu pacoxu Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be updated to v3.4.34?

https://github.com/kubernetes/kubernetes/pull/127283/files#diff-de315dbb88d6d341b1682ef2fb0798723139fb4202ac607a334fc301e9359ec7R18 should be update if we want to bump the 3.4.x here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @ahrtr @jpbetz

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be updated to v3.4.34?

Yes, I think so.

  • It seems that nobody care about etcd 3.4.x obviously it isn't updated for a long time?
  • It's accepted to address it in a separate PR since this one is solely intended to bump the 3.5.x?

Copy link
Member

@pacoxu pacoxu Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that nobody care about etcd 3.4.x obviously it isn't updated for a long time?

A quick check, we didn't build 3.4.18 even. The latest 3.4.x in kubernetes/k8s.io is 3.4.13-3.
https://github.com/kubernetes/k8s.io/blob/ca7a917e59f19fbdab73b07440bf7d843e61126d/registry.k8s.io/images/k8s-staging-etcd/images.yaml#L6

    "sha256:528ff5e3c80ca0d58d1ab15dc329dc300f9c3fefaffa4c822ca2c389ce254644": ["3.4.13-3"]

It's accepted to address it in a separate PR since this one is solely intended to bump the 3.5.x?

Agree.

)

const (
Expand Down