mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 21:47:07 +00:00
Merge pull request #130651 from ahrtr/rc2_20250307
Build etcd v3.6.0-rc.2 image
This commit is contained in:
commit
cd060979bf
@ -80,7 +80,7 @@ dependencies:
|
|||||||
match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"}
|
match: configs\[Etcd\] = Config{list\.GcEtcdRegistry, "etcd", "\d+\.\d+.\d+(-(alpha|beta|rc).\d+)?(-\d+)?"}
|
||||||
|
|
||||||
- name: "etcd-image"
|
- name: "etcd-image"
|
||||||
version: 3.6.0-rc.1
|
version: 3.6.0-rc.2
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cluster/images/etcd/Makefile
|
- path: cluster/images/etcd/Makefile
|
||||||
match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
|
match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
|
||||||
|
@ -26,10 +26,10 @@
|
|||||||
# Except from etcd-$(version) and etcdctl-$(version) binaries, we also
|
# Except from etcd-$(version) and etcdctl-$(version) binaries, we also
|
||||||
# need etcd and etcdctl binaries for backward compatibility reasons.
|
# need etcd and etcdctl binaries for backward compatibility reasons.
|
||||||
# That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
|
# That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
|
||||||
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17 3.6.0-rc.1
|
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.17 3.6.0-rc.2
|
||||||
|
|
||||||
# LATEST_ETCD_VERSION identifies the most recent etcd version available.
|
# LATEST_ETCD_VERSION identifies the most recent etcd version available.
|
||||||
LATEST_ETCD_VERSION?=3.6.0-rc.1
|
LATEST_ETCD_VERSION?=3.6.0-rc.2
|
||||||
|
|
||||||
# REVISION provides a version number for this image and all it's bundled
|
# 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
|
# artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment
|
||||||
|
@ -28,7 +28,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
supportedEtcdVersions = []string{"3.4.18", "3.5.17", "3.6.0-rc.1"}
|
supportedEtcdVersions = []string{"3.4.18", "3.5.17", "3.6.0-rc.2"}
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
Loading…
Reference in New Issue
Block a user