From 394df132bd41b3deb0dbeccfdd4a9df9e0c6729c Mon Sep 17 00:00:00 2001 From: jingyih Date: Mon, 6 Apr 2020 08:05:52 -0700 Subject: [PATCH] Update default etcd server to 3.4.7 --- build/dependencies.yaml | 2 +- build/workspace.bzl | 8 ++++---- cluster/gce/config-test.sh | 2 +- cluster/gce/manifests/etcd-empty-dir-cleanup.yaml | 2 +- cluster/gce/manifests/etcd.manifest | 4 ++-- cluster/gce/upgrade-aliases.sh | 4 ++-- cluster/images/etcd-empty-dir-cleanup/Makefile | 4 ++-- cluster/images/etcd/Makefile | 8 ++++---- cluster/images/etcd/README.md | 2 +- cluster/images/etcd/migrate-if-needed.sh | 6 +++--- cmd/kubeadm/app/constants/constants.go | 4 ++-- hack/lib/etcd.sh | 2 +- .../sample-apiserver/artifacts/example/deployment.yaml | 2 +- test/e2e/framework/nodes_util.go | 2 +- test/utils/image/manifest.go | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 483736d8803..dc0396b3cf1 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -1,6 +1,6 @@ dependencies: - name: "etcd" - version: 3.4.4 + version: 3.4.7 refPaths: - path: cluster/gce/manifests/etcd.manifest match: etcd_docker_tag|etcd_version diff --git a/build/workspace.bzl b/build/workspace.bzl index 50477625ea2..2a8081fc355 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -38,11 +38,11 @@ _CRI_TARBALL_ARCH_SHA256 = { "windows-amd64": "e18150d5546d3ddf6b165bd9aec0f65c18aacf75b94fb28bb26bfc0238f07b28", } -ETCD_VERSION = "3.4.4" +ETCD_VERSION = "3.4.7" _ETCD_TARBALL_ARCH_SHA256 = { - "amd64": "35abe668022073dfe6239aa42fd15ded9810f7ccee281af0b9d0646dd270de47", - "arm64": "52444314c01f7dad7d319a7b87ea7a5a7e48af96584c48639922a4b2f32329a4", - "ppc64le": "b7e43e08e123d0b30c7fddc8b903c0d7c8de49e28db8c87cf5cc4a24b68a715d", + "amd64": "4ad86e663b63feb4855e1f3a647e719d6d79cf6306410c52b7f280fa56f8eb6b", + "arm64": "b5bf03629277e2231651ecb3f247bf843a974172208f29b7fc38e3f63f6676fc", + "ppc64le": "931631368ee962a37b22754c9a64baba2535207afcbd42efbdacc44fb48398bf", } # Dependencies needed for a Kubernetes "release", e.g. building docker images, diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 81cdc152f26..c202f6fa1a1 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -192,7 +192,7 @@ HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}" NUM_ADDITIONAL_NODES="${NUM_ADDITIONAL_NODES:-}" ADDITIONAL_MACHINE_TYPE="${ADDITIONAL_MACHINE_TYPE:-}" -# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.4.4-0) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.4.7-0) if you need # non-default version. ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_DOCKER_REPOSITORY="${TEST_ETCD_DOCKER_REPOSITORY:-}" diff --git a/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml b/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml index dd5db0dc5b8..fb1225c4cf3 100644 --- a/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml +++ b/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml @@ -13,4 +13,4 @@ spec: dnsPolicy: Default containers: - name: etcd-empty-dir-cleanup - image: k8s.gcr.io/etcd-empty-dir-cleanup:3.4.4.0 + image: k8s.gcr.io/etcd-empty-dir-cleanup:3.4.7.0 diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index 50ca5d58ad1..e0470be0e90 100644 --- a/cluster/gce/manifests/etcd.manifest +++ b/cluster/gce/manifests/etcd.manifest @@ -14,7 +14,7 @@ "containers":[ { "name": "etcd-container", - "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.4-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.7-0') }}", "resources": { "requests": { "cpu": {{ cpulimit }} @@ -30,7 +30,7 @@ "value": "{{ pillar.get('storage_backend', 'etcd3') }}" }, { "name": "TARGET_VERSION", - "value": "{{ pillar.get('etcd_version', '3.4.4') }}" + "value": "{{ pillar.get('etcd_version', '3.4.7') }}" }, { "name": "DATA_DIRECTORY", "value": "/var/etcd/data{{ suffix }}" diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index b85ca2434ab..68e2d3ee4cc 100755 --- a/cluster/gce/upgrade-aliases.sh +++ b/cluster/gce/upgrade-aliases.sh @@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true export SECONDARY_RANGE_NAME="pods-default" export STORAGE_BACKEND="etcd3" export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" -export ETCD_IMAGE=3.4.4-0 -export ETCD_VERSION=3.4.4 +export ETCD_IMAGE=3.4.7-0 +export ETCD_VERSION=3.4.7 # Upgrade master with updated kube envs "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l diff --git a/cluster/images/etcd-empty-dir-cleanup/Makefile b/cluster/images/etcd-empty-dir-cleanup/Makefile index 1537bb5ddd7..4e3836c1232 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Makefile +++ b/cluster/images/etcd-empty-dir-cleanup/Makefile @@ -14,13 +14,13 @@ .PHONY: build push -ETCD_VERSION = 3.4.4 +ETCD_VERSION = 3.4.7 # Image should be pulled from k8s.gcr.io, which will auto-detect # region (us, eu, asia, ...) and pull from the closest. REGISTRY = k8s.gcr.io # Images should be pushed to staging-k8s.gcr.io. PUSH_REGISTRY = staging-k8s.gcr.io -TAG = 3.4.4.0 +TAG = 3.4.7.0 clean: rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index eb265e54d89..4d722209400 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -15,7 +15,7 @@ # Build the etcd image # # Usage: -# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.12 3.2.24 3.3.17 3.4.4] [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.7] [REGISTRY=k8s.gcr.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.0.17 3.1.12 3.2.24 3.3.17 3.4.4 +BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.12 3.2.24 3.3.17 3.4.7 # LATEST_ETCD_VERSION identifies the most recent etcd version available. -LATEST_ETCD_VERSION?=3.4.4 +LATEST_ETCD_VERSION?=3.4.7 # REVISION provides a version number fo this image and all it's bundled # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment @@ -62,7 +62,7 @@ endif # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled # golang version should match the golang version from https://github.com/coreos/etcd/releases for the current ETCD_VERSION. -GOLANG_VERSION?=1.12.12 +GOLANG_VERSION?=1.12.17 GOARM?=7 TEMP_DIR:=$(shell mktemp -d) diff --git a/cluster/images/etcd/README.md b/cluster/images/etcd/README.md index 9dbda8be37f..cbe0f8ac69b 100644 --- a/cluster/images/etcd/README.md +++ b/cluster/images/etcd/README.md @@ -26,7 +26,7 @@ server. `migrate` writes a `version.txt` file to track the "current" version of etcd that was used to persist data to disk. A "target" version may also be provided -by the `TARGET_STORAGE` (e.g. "etcd3") and `TARGET_VERSION` (e.g. "3.4.4" ) +by the `TARGET_STORAGE` (e.g. "etcd3") and `TARGET_VERSION` (e.g. "3.4.7" ) environment variables. If the persisted version differs from the target version, `migrate-if-needed.sh` will migrate the data from the current to the target version. diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh index 790fd49ed6b..501c68c8ee9 100755 --- a/cluster/images/etcd/migrate-if-needed.sh +++ b/cluster/images/etcd/migrate-if-needed.sh @@ -19,7 +19,7 @@ # variables: # TARGET_STORAGE - API of etcd to be used (supported: 'etcd3') # TARGET_VERSION - etcd release to be used (supported: '3.0.17', '3.1.12', -# '3.2.24', "3.3.17", "3.4.4") +# '3.2.24', "3.3.17", "3.4.7") # DATA_DIRECTORY - directory with etcd data # # The current etcd version and storage format is detected based on the @@ -30,7 +30,7 @@ # - 3.0.17/etcd3 -> 3.1.12/etcd3 # - 3.1.12/etcd3 -> 3.2.24/etcd3 # - 3.2.24/etcd3 -> 3.3.17/etcd3 -# - 3.3.17/etcd3 -> 3.4.4/etcd3 +# - 3.3.17/etcd3 -> 3.4.7/etcd3 # # NOTE: The releases supported in this script has to match release binaries # present in the etcd image (to make this script work correctly). @@ -43,7 +43,7 @@ set -o nounset # NOTE: BUNDLED_VERSION has to match release binaries present in the # etcd image (to make this script work correctly). -BUNDLED_VERSIONS="3.0.17, 3.1.12, 3.2.24, 3.3.17, 3.4.4" +BUNDLED_VERSIONS="3.0.17, 3.1.12, 3.2.24, 3.3.17, 3.4.7" ETCD_NAME="${ETCD_NAME:-etcd-$(hostname)}" if [ -z "${DATA_DIRECTORY:-}" ]; then diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 859ae18bc6e..c3a016ad450 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -265,7 +265,7 @@ const ( MinExternalEtcdVersion = "3.2.18" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.4.4-0" + DefaultEtcdVersion = "3.4.7-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -442,7 +442,7 @@ var ( 16: "3.3.17-0", 17: "3.4.3-0", 18: "3.4.3-0", - 19: "3.4.4-0", + 19: "3.4.7-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index baeb4b036bf..0fcca4b2f9f 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -16,7 +16,7 @@ # A set of helpers for starting/running etcd for tests -ETCD_VERSION=${ETCD_VERSION:-3.4.4} +ETCD_VERSION=${ETCD_VERSION:-3.4.7} ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_PORT=${ETCD_PORT:-2379} export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}" diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml index 5119a3e19b9..66b1dc077b5 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml @@ -26,4 +26,4 @@ spec: imagePullPolicy: Never args: [ "--etcd-servers=http://localhost:2379" ] - name: etcd - image: quay.io/coreos/etcd:v3.4.4 + image: quay.io/coreos/etcd:v3.4.7 diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index a7d351105ed..09a631cdd04 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -34,7 +34,7 @@ import ( e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) -const etcdImage = "3.4.4-0" +const etcdImage = "3.4.7-0" // EtcdUpgrade upgrades etcd on GCE. func EtcdUpgrade(targetStorage, targetVersion string) error { diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 1cc55ff812d..ff3c196e41b 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -216,7 +216,7 @@ func initImageConfigs() map[int]Config { configs[CudaVectorAdd] = Config{e2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} - configs[Etcd] = Config{gcRegistry, "etcd", "3.4.4"} + configs[Etcd] = Config{gcRegistry, "etcd", "3.4.7"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}