Upgrade etcd to 3.5.1

This commit is contained in:
Oleg Atamanenko 2021-10-15 13:58:08 -07:00
parent daa83e6263
commit 965f10f539
10 changed files with 18 additions and 18 deletions

View File

@ -62,7 +62,7 @@ dependencies:
# etcd # etcd
- name: "etcd" - name: "etcd"
version: 3.5.0 version: 3.5.1
refPaths: refPaths:
- path: cluster/gce/manifests/etcd.manifest - path: cluster/gce/manifests/etcd.manifest
match: etcd_docker_tag|etcd_version match: etcd_docker_tag|etcd_version
@ -77,7 +77,7 @@ dependencies:
match: const etcdImage match: const etcdImage
- name: "etcd-image" - name: "etcd-image"
version: 3.5.0 version: 3.5.1
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\?

View File

@ -212,7 +212,7 @@ HEAPSTER_MACHINE_TYPE=${HEAPSTER_MACHINE_TYPE:-}
NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-} NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-}
ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-} ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-}
# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. v3.5.0-0) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. v3.5.1-0) if you need
# non-default version. # non-default version.
export ETCD_IMAGE=${TEST_ETCD_IMAGE:-} export ETCD_IMAGE=${TEST_ETCD_IMAGE:-}
export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-} export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-}

View File

@ -18,7 +18,7 @@
{ {
"name": "etcd-container", "name": "etcd-container",
{{security_context}} {{security_context}}
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.0-rc.0-0') }}", "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.1-0') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
@ -34,7 +34,7 @@
"value": "{{ pillar.get('storage_backend', 'etcd3') }}" "value": "{{ pillar.get('storage_backend', 'etcd3') }}"
}, },
{ "name": "TARGET_VERSION", { "name": "TARGET_VERSION",
"value": "{{ pillar.get('etcd_version', '3.5.0-rc.0') }}" "value": "{{ pillar.get('etcd_version', '3.5.1') }}"
}, },
{ {
"name": "DO_NOT_MOVE_BINARIES", "name": "DO_NOT_MOVE_BINARIES",

View File

@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true
export SECONDARY_RANGE_NAME="pods-default" export SECONDARY_RANGE_NAME="pods-default"
export STORAGE_BACKEND="etcd3" export STORAGE_BACKEND="etcd3"
export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf"
export ETCD_IMAGE=3.5.0-0 export ETCD_IMAGE=3.5.1-0
export ETCD_VERSION=3.5.0 export ETCD_VERSION=3.5.1
# Upgrade master with updated kube envs # Upgrade master with updated kube envs
"${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l

View File

@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.12 3.2.24 3.3.17 3.4.13 3.5.0] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.12 3.2.24 3.3.17 3.4.13 3.5.1] [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,15 +26,15 @@
# 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.12 3.2.24 3.3.17 3.4.13 3.5.0 BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.12 3.2.24 3.3.17 3.4.13 3.5.1
# LATEST_ETCD_VERSION identifies the most recent etcd version available. # LATEST_ETCD_VERSION identifies the most recent etcd version available.
LATEST_ETCD_VERSION?=3.5.0 LATEST_ETCD_VERSION?=3.5.1
# 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
# for each revision of this image at that etcd version. # for each revision of this image at that etcd version.
REVISION?=4 REVISION?=0
# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>". # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)

View File

@ -28,7 +28,7 @@ import (
) )
var ( var (
supportedEtcdVersions = []string{"3.0.17", "3.1.12", "3.2.24", "3.3.17", "3.4.13", "3.5.0"} supportedEtcdVersions = []string{"3.0.17", "3.1.12", "3.2.24", "3.3.17", "3.4.13", "3.5.1"}
) )
const ( const (

View File

@ -291,7 +291,7 @@ const (
MinExternalEtcdVersion = "3.2.18" MinExternalEtcdVersion = "3.2.18"
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses // DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.5.0-0" DefaultEtcdVersion = "3.5.1-0"
// Etcd defines variable used internally when referring to etcd component // Etcd defines variable used internally when referring to etcd component
Etcd = "etcd" Etcd = "etcd"
@ -472,8 +472,8 @@ var (
19: "3.4.13-0", 19: "3.4.13-0",
20: "3.4.13-0", 20: "3.4.13-0",
21: "3.4.13-0", 21: "3.4.13-0",
22: "3.5.0-0", 22: "3.5.1-0",
23: "3.5.0-0", 23: "3.5.1-0",
} }
// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows

View File

@ -16,7 +16,7 @@
# A set of helpers for starting/running etcd for tests # A set of helpers for starting/running etcd for tests
ETCD_VERSION=${ETCD_VERSION:-3.5.0} ETCD_VERSION=${ETCD_VERSION:-3.5.1}
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}
export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}" export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}"

View File

@ -26,4 +26,4 @@ spec:
imagePullPolicy: Never imagePullPolicy: Never
args: [ "--etcd-servers=http://localhost:2379" ] args: [ "--etcd-servers=http://localhost:2379" ]
- name: etcd - name: etcd
image: quay.io/coreos/etcd:v3.5.0 image: quay.io/coreos/etcd:v3.5.1

View File

@ -34,7 +34,7 @@ import (
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
) )
const etcdImage = "3.5.0-0" const etcdImage = "3.5.1-0"
// EtcdUpgrade upgrades etcd on GCE. // EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error { func EtcdUpgrade(targetStorage, targetVersion string) error {