mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #109470 from serathius/image-v3.5.3
etcd: Build 3.5.3-0 image
This commit is contained in:
commit
d9213f95a0
@ -90,9 +90,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
|
|||||||
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
||||||
|
|
||||||
# These are the default versions (image tags) for their respective base images.
|
# These are the default versions (image tags) for their respective base images.
|
||||||
readonly __default_debian_iptables_version=bullseye-v1.1.0
|
readonly __default_debian_iptables_version=bullseye-v1.3.0
|
||||||
readonly __default_go_runner_version=v2.3.1-go1.18.1-bullseye.0
|
readonly __default_go_runner_version=v2.3.1-go1.18.1-bullseye.0
|
||||||
readonly __default_setcap_version=bullseye-v1.0.0
|
readonly __default_setcap_version=bullseye-v1.2.0
|
||||||
|
|
||||||
# These are the base images for the Docker-wrapped binaries.
|
# These are the base images for the Docker-wrapped binaries.
|
||||||
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
|
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
|
||||||
|
@ -72,12 +72,19 @@ 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-alpha.0
|
version: 3.5.3
|
||||||
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\?
|
||||||
- path: cluster/images/etcd/migrate/options.go
|
- path: cluster/images/etcd/migrate/options.go
|
||||||
|
|
||||||
|
# From https://github.com/etcd-io/etcd/blob/main/Makefile
|
||||||
|
- name: "golang: etcd release version"
|
||||||
|
version: 1.16.15 # for etcd v3.5.3: https://github.com/etcd-io/etcd/blob/0452feec719fa8ad88ae343e66e9bb222965d75d/Makefile#L58
|
||||||
|
refPaths:
|
||||||
|
- path: cluster/images/etcd/Makefile
|
||||||
|
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
|
||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
- name: "golang: upstream version"
|
- name: "golang: upstream version"
|
||||||
version: 1.18.1
|
version: 1.18.1
|
||||||
@ -101,12 +108,6 @@ dependencies:
|
|||||||
#- path: hack/lib/golang.sh
|
#- path: hack/lib/golang.sh
|
||||||
# match: minimum_go_version=go([0-9]+\.[0-9]+)
|
# match: minimum_go_version=go([0-9]+\.[0-9]+)
|
||||||
|
|
||||||
- name: "golang: etcd release version"
|
|
||||||
version: 1.16.12
|
|
||||||
refPaths:
|
|
||||||
- path: cluster/images/etcd/Makefile
|
|
||||||
match: 'GOLANG_VERSION\?=\d+.\d+(alpha|beta|rc)?\.?(\d+)?'
|
|
||||||
|
|
||||||
- name: "k8s.gcr.io/kube-cross: dependents"
|
- name: "k8s.gcr.io/kube-cross: dependents"
|
||||||
version: v1.24.0-go1.18.1-bullseye.0
|
version: v1.24.0-go1.18.1-bullseye.0
|
||||||
refPaths:
|
refPaths:
|
||||||
@ -114,7 +115,7 @@ dependencies:
|
|||||||
|
|
||||||
# Base images
|
# Base images
|
||||||
- name: "k8s.gcr.io/debian-base: dependents"
|
- name: "k8s.gcr.io/debian-base: dependents"
|
||||||
version: bullseye-v1.0.0
|
version: bullseye-v1.2.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cluster/images/etcd/Makefile
|
- path: cluster/images/etcd/Makefile
|
||||||
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
||||||
@ -130,7 +131,7 @@ dependencies:
|
|||||||
match: BASE_IMAGE_VERSION\?=
|
match: BASE_IMAGE_VERSION\?=
|
||||||
|
|
||||||
- name: "k8s.gcr.io/debian-iptables: dependents"
|
- name: "k8s.gcr.io/debian-iptables: dependents"
|
||||||
version: bullseye-v1.1.0
|
version: bullseye-v1.3.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_debian_iptables_version=
|
match: __default_debian_iptables_version=
|
||||||
@ -206,7 +207,7 @@ dependencies:
|
|||||||
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
|
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
|
||||||
|
|
||||||
- name: "k8s.gcr.io/setcap: dependents"
|
- name: "k8s.gcr.io/setcap: dependents"
|
||||||
version: bullseye-v1.0.0
|
version: bullseye-v1.2.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_setcap_version=
|
match: __default_setcap_version=
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
# Build the etcd image
|
# Build the etcd image
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.2 3.6.0-alpha.0] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
|
# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.3] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
|
||||||
#
|
#
|
||||||
# The image contains different etcd versions to simplify
|
# The image contains different etcd versions to simplify
|
||||||
# upgrades. Thus be careful when removing any versions from here.
|
# upgrades. Thus be careful when removing any versions from here.
|
||||||
@ -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.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.2 3.6.0-alpha.0
|
BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.3
|
||||||
|
|
||||||
# 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-alpha.0
|
LATEST_ETCD_VERSION?=3.5.3
|
||||||
|
|
||||||
# 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
|
||||||
@ -83,7 +83,7 @@ endif
|
|||||||
# This option is for running docker manifest command
|
# This option is for running docker manifest command
|
||||||
export DOCKER_CLI_EXPERIMENTAL := enabled
|
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 should match the golang version of the official build from https://github.com/etcd-io/etcd/releases.
|
||||||
GOLANG_VERSION?=1.16.12
|
GOLANG_VERSION?=1.16.15
|
||||||
GOARM?=7
|
GOARM?=7
|
||||||
TEMP_DIR:=$(shell mktemp -d)
|
TEMP_DIR:=$(shell mktemp -d)
|
||||||
|
|
||||||
@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
|
|||||||
DOCKERFILE := ${DOCKERFILE.${OS}}
|
DOCKERFILE := ${DOCKERFILE.${OS}}
|
||||||
|
|
||||||
ifeq ($(ARCH),amd64)
|
ifeq ($(ARCH),amd64)
|
||||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
|
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.2.0
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),arm)
|
ifeq ($(ARCH),arm)
|
||||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.0.0
|
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.2.0
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),arm64)
|
ifeq ($(ARCH),arm64)
|
||||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.0.0
|
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.2.0
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),ppc64le)
|
ifeq ($(ARCH),ppc64le)
|
||||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.0.0
|
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.2.0
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),s390x)
|
ifeq ($(ARCH),s390x)
|
||||||
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.0.0
|
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.2.0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
BASE.windows = mcr.microsoft.com/windows/nanoserver
|
||||||
|
@ -28,7 +28,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.2", "3.6.0-alpha.0"}
|
supportedEtcdVersions = []string{"3.0.17", "3.1.20", "3.2.32", "3.3.17", "3.4.18", "3.5.3"}
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
|
|||||||
|
|
||||||
# This is defined in root Makefile, but some build contexts do not refer to them
|
# This is defined in root Makefile, but some build contexts do not refer to them
|
||||||
KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io
|
KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io
|
||||||
BASE_IMAGE_VERSION?=bullseye-v1.0.0
|
BASE_IMAGE_VERSION?=bullseye-v1.2.0
|
||||||
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
|
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
|
||||||
|
|
||||||
# Keep debian releases (e.g. debian 11 == bullseye) consistent
|
# Keep debian releases (e.g. debian 11 == bullseye) consistent
|
||||||
|
@ -240,7 +240,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) {
|
|||||||
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-2"}
|
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-2"}
|
||||||
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
||||||
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
|
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
|
||||||
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.1.0"}
|
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.3.0"}
|
||||||
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"}
|
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"}
|
||||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.1-0"}
|
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.1-0"}
|
||||||
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}
|
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}
|
||||||
|
Loading…
Reference in New Issue
Block a user