mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Build etcd image of v3.5.15
Signed-off-by: bzsuni <bingzhe.sun@daocloud.io>
This commit is contained in:
		@@ -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.14
 | 
			
		||||
    version: 3.5.15
 | 
			
		||||
    refPaths:
 | 
			
		||||
    - path: cluster/images/etcd/Makefile
 | 
			
		||||
      match: BUNDLED_ETCD_VERSIONS\?|LATEST_ETCD_VERSION\?
 | 
			
		||||
@@ -109,7 +109,7 @@ dependencies:
 | 
			
		||||
 | 
			
		||||
  # From https://github.com/etcd-io/etcd/blob/main/Makefile
 | 
			
		||||
  - name: "golang: etcd release version"
 | 
			
		||||
    version: 1.21.10 # https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md
 | 
			
		||||
    version: 1.21.12 # 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+)?'
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@
 | 
			
		||||
# Build the etcd image
 | 
			
		||||
#
 | 
			
		||||
# Usage:
 | 
			
		||||
# 	[BUNDLED_ETCD_VERSIONS=3.4.18 3.5.14] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
 | 
			
		||||
# 	[BUNDLED_ETCD_VERSIONS=3.4.18 3.5.15] [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.
 | 
			
		||||
@@ -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.14
 | 
			
		||||
BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.15
 | 
			
		||||
 | 
			
		||||
# LATEST_ETCD_VERSION identifies the most recent etcd version available.
 | 
			
		||||
LATEST_ETCD_VERSION?=3.5.14
 | 
			
		||||
LATEST_ETCD_VERSION?=3.5.15
 | 
			
		||||
 | 
			
		||||
# 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
 | 
			
		||||
@@ -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.10
 | 
			
		||||
GOLANG_VERSION := 1.21.12
 | 
			
		||||
GOARM?=7
 | 
			
		||||
TEMP_DIR:=$(shell mktemp -d)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -28,7 +28,7 @@ import (
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var (
 | 
			
		||||
	supportedEtcdVersions = []string{"3.4.18", "3.5.14"}
 | 
			
		||||
	supportedEtcdVersions = []string{"3.4.18", "3.5.15"}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user