From e9bf1c3c901ccd708ad6b3ded48b64a35619c830 Mon Sep 17 00:00:00 2001 From: jingyih Date: Sat, 20 Jun 2020 12:56:47 -0700 Subject: [PATCH] Update default etcd server to 3.4.9 --- build/dependencies.yaml | 2 +- build/workspace.bzl | 8 ++++---- cluster/gce/config-test.sh | 2 +- cluster/gce/manifests/etcd.manifest | 4 ++-- cluster/gce/upgrade-aliases.sh | 4 ++-- cmd/kubeadm/app/constants/constants.go | 6 +++--- 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 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c8446d6f778..f0b44f0775c 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -44,7 +44,7 @@ dependencies: match: latestValidatedDockerVersion - name: "etcd" - version: 3.4.7 + version: 3.4.9 refPaths: - path: cluster/gce/manifests/etcd.manifest match: etcd_docker_tag|etcd_version diff --git a/build/workspace.bzl b/build/workspace.bzl index 9e0b94d2005..85d9bcb3e27 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -38,11 +38,11 @@ _CRI_TARBALL_ARCH_SHA256 = { "windows-amd64": "5045bcc6d8b0e6004be123ab99ea06e5b1b2ae1e586c968fcdf85fccd4d67ae1", } -ETCD_VERSION = "3.4.7" +ETCD_VERSION = "3.4.9" _ETCD_TARBALL_ARCH_SHA256 = { - "amd64": "4ad86e663b63feb4855e1f3a647e719d6d79cf6306410c52b7f280fa56f8eb6b", - "arm64": "b5bf03629277e2231651ecb3f247bf843a974172208f29b7fc38e3f63f6676fc", - "ppc64le": "931631368ee962a37b22754c9a64baba2535207afcbd42efbdacc44fb48398bf", + "amd64": "bcab421f6bf4111accfceb004e0a0ac2bcfb92ac93081d9429e313248dd78c41", + "arm64": "fd9bf37662a851905d75160fea0f5d10055c1bee0a734e78c5112cc56c9faa18", + "ppc64le": "bfdcea0fc83c6d6edb70667a2272f8fc597c61976ecc6f8ecbfeb380ff02618b", } # 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 3d79067f48a..c92fb4545ca 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -202,7 +202,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.7-0) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.4.9-1) if you need # non-default version. export ETCD_IMAGE=${TEST_ETCD_IMAGE:-} export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-} diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index e55ceae68aa..e6ef6457975 100644 --- a/cluster/gce/manifests/etcd.manifest +++ b/cluster/gce/manifests/etcd.manifest @@ -15,7 +15,7 @@ "containers":[ { "name": "etcd-container", - "image": "{{ pillar.get('etcd_docker_repository', 'us.gcr.io/k8s-artifacts-prod/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.7-2') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'us.gcr.io/k8s-artifacts-prod/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.9-1') }}", "resources": { "requests": { "cpu": {{ cpulimit }} @@ -31,7 +31,7 @@ "value": "{{ pillar.get('storage_backend', 'etcd3') }}" }, { "name": "TARGET_VERSION", - "value": "{{ pillar.get('etcd_version', '3.4.7') }}" + "value": "{{ pillar.get('etcd_version', '3.4.9') }}" }, { "name": "DATA_DIRECTORY", "value": "/var/etcd/data{{ suffix }}" diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 68e2d3ee4cc..2d7eb47b304 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.7-0 -export ETCD_VERSION=3.4.7 +export ETCD_IMAGE=3.4.9-1 +export ETCD_VERSION=3.4.9 # Upgrade master with updated kube envs "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 8051feed06b..8e7f01c7858 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.7-0" + DefaultEtcdVersion = "3.4.9-1" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -433,8 +433,8 @@ var ( 16: "3.3.17-0", 17: "3.4.3-0", 18: "3.4.3-0", - 19: "3.4.7-0", - 20: "3.4.7-0", + 19: "3.4.9-1", + 20: "3.4.9-1", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 0fcca4b2f9f..00b73451074 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.7} +ETCD_VERSION=${ETCD_VERSION:-3.4.9} 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 66b1dc077b5..8b0d2b24898 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.7 + image: quay.io/coreos/etcd:v3.4.9 diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 5d2cf244b68..2dc622cd100 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.7-0" +const etcdImage = "3.4.9-1" // 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 e659c2cfe7a..9f4f7792f42 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -214,7 +214,7 @@ func initImageConfigs() map[int]Config { configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"} configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.0"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} - configs[Etcd] = Config{gcRegistry, "etcd", "3.4.7"} + configs[Etcd] = Config{gcRegistry, "etcd", "3.4.9"} 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"}