From e2a25f9b548bdab89746aa7b1dc226103dd5a78a Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Fri, 9 Mar 2018 12:19:02 -0800 Subject: [PATCH] Bump to etcd 3.1.12 to pick up critical fix --- build/build-image/cross/Dockerfile | 2 +- build/root/WORKSPACE | 4 +- .../etcd-empty-dir-cleanup.yaml | 2 +- cluster/gce/config-test.sh | 2 +- cluster/gce/manifests/etcd.manifest | 4 +- cluster/gce/upgrade-aliases.sh | 4 +- .../images/etcd-empty-dir-cleanup/Makefile | 15 ++++-- cluster/images/etcd/Makefile | 19 +++++--- cluster/images/etcd/migrate-if-needed.sh | 8 ++-- cluster/kubemark/gce/config-default.sh | 2 +- cmd/kubeadm/app/cmd/upgrade/plan_test.go | 16 +++---- cmd/kubeadm/app/constants/constants.go | 10 ++-- cmd/kubeadm/app/constants/constants_test.go | 8 ++-- .../app/phases/upgrade/compute_test.go | 46 +++++++++---------- hack/lib/etcd.sh | 2 +- .../artifacts/example/rc.yaml | 2 +- .../artifacts/example/rc.yaml | 2 +- test/e2e/apimachinery/aggregator.go | 2 +- test/e2e/framework/nodes_util.go | 4 +- test/kubemark/start-kubemark.sh | 2 +- 20 files changed, 83 insertions(+), 73 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 830dcbcdef..423e1d634d 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -71,7 +71,7 @@ RUN go get golang.org/x/tools/cmd/cover \ golang.org/x/tools/cmd/goimports # Download and symlink etcd. We need this for our integration tests. -RUN export ETCD_VERSION=v3.1.11; \ +RUN export ETCD_VERSION=v3.1.12; \ mkdir -p /usr/local/src/etcd \ && cd /usr/local/src/etcd \ && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \ diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 5cc170abf9..12b9fb8fe6 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -19,12 +19,12 @@ http_archive( urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], ) -ETCD_VERSION = "3.1.11" +ETCD_VERSION = "3.1.12" new_http_archive( name = "com_coreos_etcd", build_file = "third_party/etcd.BUILD", - sha256 = "b80c6c0719beee703821ece80f9e48b071ad5f59bb284bd3ea2104700738d9ec", + sha256 = "4b22184bef1bba8b4908b14bae6af4a6d33ec2b91e4f7a240780e07fa43f2111", strip_prefix = "etcd-v%s-linux-amd64" % ETCD_VERSION, urls = ["https://github.com/coreos/etcd/releases/download/v%s/etcd-v%s-linux-amd64.tar.gz" % (ETCD_VERSION, ETCD_VERSION)], ) diff --git a/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml b/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml index be17c21f4f..8928310c7a 100644 --- a/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml +++ b/cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml @@ -24,4 +24,4 @@ spec: dnsPolicy: Default containers: - name: etcd-empty-dir-cleanup - image: k8s.gcr.io/etcd-empty-dir-cleanup:3.1.11.0 + image: k8s.gcr.io/etcd-empty-dir-cleanup:3.1.12.0 diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index aadfcb26d6..a63a2bcecc 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -160,7 +160,7 @@ METADATA_AGENT_VERSION="${KUBE_METADATA_AGENT_VERSION:-0.2-0.0.16-1}" # Useful for scheduling heapster in large clusters with nodes of small size. HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}" -# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.11) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.12) 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.manifest b/cluster/gce/manifests/etcd.manifest index b442ffea62..18e9fc290c 100644 --- a/cluster/gce/manifests/etcd.manifest +++ b/cluster/gce/manifests/etcd.manifest @@ -13,7 +13,7 @@ "containers":[ { "name": "etcd-container", - "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.1.11') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.1.12') }}", "resources": { "requests": { "cpu": {{ cpulimit }} @@ -29,7 +29,7 @@ "value": "{{ pillar.get('storage_backend', 'etcd3') }}" }, { "name": "TARGET_VERSION", - "value": "{{ pillar.get('etcd_version', '3.1.11') }}" + "value": "{{ pillar.get('etcd_version', '3.1.12') }}" }, { "name": "DATA_DIRECTORY", "value": "/var/etcd/data{{ suffix }}" diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 0277cb3ba2..29dbf0232e 100755 --- a/cluster/gce/upgrade-aliases.sh +++ b/cluster/gce/upgrade-aliases.sh @@ -161,8 +161,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.1.11 -export ETCD_VERSION=3.1.11 +export ETCD_IMAGE=3.1.12 +export ETCD_VERSION=3.1.12 # 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 1876030ba9..651488d423 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Makefile +++ b/cluster/images/etcd-empty-dir-cleanup/Makefile @@ -14,9 +14,13 @@ .PHONY: build push -ETCD_VERSION = 3.1.11 -IMAGE = staging-k8s.gcr.io/etcd-empty-dir-cleanup -TAG = 3.1.11.0 +ETCD_VERSION = 3.1.12 +# 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.1.12.0 clean: rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz @@ -25,8 +29,9 @@ build: clean curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz tar xzvf etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz cp etcd-v$(ETCD_VERSION)-linux-amd64/etcdctl . - docker build --pull -t $(IMAGE):$(TAG) . + docker build --pull -t $(REGISTRY)/etcd-empty-dir-cleanup:$(TAG) . rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz push: build - docker push $(IMAGE):$(TAG) + docker tag $(REGISTRY)/etcd-empty-dir-cleanup:$(TAG) $(PUSH_REGISTRY)/etcd-empty-dir-cleanup:$(TAG) + docker push $(PUSH_REGISTRY)/etcd-empty-dir-cleanup:$(TAG) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 3ea331e9aa..123283ed77 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -15,7 +15,7 @@ # Build the etcd image # # Usage: -# [TAGS=2.2.1 2.3.7 3.0.17 3.1.11] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) +# [TAGS=2.2.1 2.3.7 3.0.17 3.1.12] [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 tag from here. @@ -26,12 +26,16 @@ # Except from etcd-$(tag) and etcdctl-$(tag) binaries, we also # need etcd and etcdctl binaries for backward compatibility reasons. # That binary will be set to the last tag from $(TAGS). -TAGS?=2.2.1 2.3.7 3.0.17 3.1.11 -REGISTRY_TAG?=3.1.11 +TAGS?=2.2.1 2.3.7 3.0.17 3.1.12 +REGISTRY_TAG?=3.1.12 # ROLLBACK_REGISTRY_TAG specified the tag that REGISTRY_TAG may be rolled back to. -ROLLBACK_REGISTRY_TAG?=3.1.11 +ROLLBACK_REGISTRY_TAG?=3.1.12 ARCH?=amd64 +# 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 # golang version should match the golang version from https://github.com/coreos/etcd/releases for REGISTRY_TAG version of etcd. GOLANG_VERSION?=1.8.5 GOARM=7 @@ -83,10 +87,10 @@ else # For each release create a tmp dir 'etcd_release_tmp_dir' and unpack the release tar there. for tag in $(TAGS); do \ etcd_release_tmp_dir=$(shell mktemp -d); \ - docker run --interactive -v $$etcd_release_tmp_dir:/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \ + docker run --interactive -v $${etcd_release_tmp_dir}:/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \ "git clone https://github.com/coreos/etcd /go/src/github.com/coreos/etcd \ && cd /go/src/github.com/coreos/etcd \ - && git checkout v$$tag \ + && git checkout v$${tag} \ && GOARM=$(GOARM) GOARCH=$(ARCH) ./build \ && cp -f bin/$(ARCH)/etcd* bin/etcd* /etcdbin; echo 'done'"; \ cp $$etcd_release_tmp_dir/etcd $$etcd_release_tmp_dir/etcdctl $(TEMP_DIR)/; \ @@ -108,7 +112,8 @@ endif docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR) push: build - docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) + docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(PUSH_REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) + docker push $(PUSH_REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) ifeq ($(ARCH),amd64) # Backward compatibility. TODO: deprecate this image tag diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh index d85613b32a..6b5b67226e 100755 --- a/cluster/images/etcd/migrate-if-needed.sh +++ b/cluster/images/etcd/migrate-if-needed.sh @@ -18,7 +18,7 @@ # This script performs etcd upgrade based on the following environmental # variables: # TARGET_STORAGE - API of etcd to be used (supported: 'etcd2', 'etcd3') -# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.11') +# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.12') # DATA_DIRECTORY - directory with etcd data # # The current etcd version and storage format is detected based on the @@ -28,7 +28,7 @@ # The update workflow support the following upgrade steps: # - 2.2.1/etcd2 -> 2.3.7/etcd2 # - 2.3.7/etcd2 -> 3.0.17/etcd2 -# - 3.0.17/etcd3 -> 3.1.11/etcd3 +# - 3.0.17/etcd3 -> 3.1.12/etcd3 # # NOTE: The releases supported in this script has to match release binaries # present in the etcd image (to make this script work correctly). @@ -64,7 +64,7 @@ rollback_etcd3_minor_version() { echo "Starting etcd version ${START_VERSION} to capture rollback snapshot." if ! start_etcd; then echo "Unable to automatically downgrade etcd: starting etcd version ${START_VERSION} to capture rollback snapshot failed." - echo "See https://coreos.com/etcd/docs/3.1.11/op-guide/recovery.html for manual downgrade options." + echo "See https://coreos.com/etcd/docs/latest/op-guide/recovery.html for manual downgrade options." exit 1 else ETCDCTL_API=3 ${ETCDCTL_CMD} snapshot --endpoints "http://127.0.0.1:${ETCD_PORT}" save "${SNAPSHOT_FILE}" @@ -138,7 +138,7 @@ fi # NOTE: SUPPORTED_VERSION has to match release binaries present in the # etcd image (to make this script work correctly). # We cannot use array since sh doesn't support it. -SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.17 3.1.11" +SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.17 3.1.12" SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n") VERSION_FILE="version.txt" diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 7adbaf58a9..1e668ea53b 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -62,7 +62,7 @@ TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} KUBE_APISERVER_REQUEST_TIMEOUT=300 ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}" -# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.11) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.12) if you need # non-default version. ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_VERSION="${TEST_ETCD_VERSION:-}" diff --git a/cmd/kubeadm/app/cmd/upgrade/plan_test.go b/cmd/kubeadm/app/cmd/upgrade/plan_test.go index c536d009da..4ad979e915 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan_test.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan_test.go @@ -133,7 +133,7 @@ _____________________________________________________________________ KubeVersion: "v1.9.0", KubeadmVersion: "v1.9.0", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -149,7 +149,7 @@ Controller Manager v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0 Kube DNS 1.14.5 1.14.8 -Etcd 3.0.17 3.1.11 +Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: @@ -194,7 +194,7 @@ _____________________________________________________________________ KubeVersion: "v1.9.0", KubeadmVersion: "v1.9.0", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -230,7 +230,7 @@ Controller Manager v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0 Kube DNS 1.14.5 1.14.8 -Etcd 3.0.17 3.1.11 +Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: @@ -259,7 +259,7 @@ _____________________________________________________________________ KubeVersion: "v1.9.0-beta.1", KubeadmVersion: "v1.9.0-beta.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -275,7 +275,7 @@ Controller Manager v1.8.5 v1.9.0-beta.1 Scheduler v1.8.5 v1.9.0-beta.1 Kube Proxy v1.8.5 v1.9.0-beta.1 Kube DNS 1.14.5 1.14.8 -Etcd 3.0.17 3.1.11 +Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: @@ -304,7 +304,7 @@ _____________________________________________________________________ KubeVersion: "v1.9.0-rc.1", KubeadmVersion: "v1.9.0-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -320,7 +320,7 @@ Controller Manager v1.8.5 v1.9.0-rc.1 Scheduler v1.8.5 v1.9.0-rc.1 Kube Proxy v1.8.5 v1.9.0-rc.1 Kube DNS 1.14.5 1.14.8 -Etcd 3.0.17 3.1.11 +Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 34c4d8d4d8..023cd91e79 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -208,10 +208,10 @@ const ( KubeletBaseConfigurationFile = "kubelet" // MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports - MinExternalEtcdVersion = "3.1.11" + MinExternalEtcdVersion = "3.1.12" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.1.11" + DefaultEtcdVersion = "3.1.12" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -296,9 +296,9 @@ var ( // SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases SupportedEtcdVersion = map[uint8]string{ - 9: "3.1.11", - 10: "3.1.11", - 11: "3.1.11", + 9: "3.1.12", + 10: "3.1.12", + 11: "3.1.12", } ) diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go index 1544a3e60d..1cbf874334 100644 --- a/cmd/kubeadm/app/constants/constants_test.go +++ b/cmd/kubeadm/app/constants/constants_test.go @@ -127,22 +127,22 @@ func TestEtcdSupportedVersion(t *testing.T) { }, { kubernetesVersion: "1.9.0", - expectedVersion: version.MustParseSemantic("3.1.11"), + expectedVersion: version.MustParseSemantic("3.1.12"), expectedError: nil, }, { kubernetesVersion: "1.9.2", - expectedVersion: version.MustParseSemantic("3.1.11"), + expectedVersion: version.MustParseSemantic("3.1.12"), expectedError: nil, }, { kubernetesVersion: "1.10.0", - expectedVersion: version.MustParseSemantic("3.1.11"), + expectedVersion: version.MustParseSemantic("3.1.12"), expectedError: nil, }, { kubernetesVersion: "1.10.1", - expectedVersion: version.MustParseSemantic("3.1.11"), + expectedVersion: version.MustParseSemantic("3.1.12"), expectedError: nil, }, } diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index 383d3abbbb..583f0375f2 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -64,7 +64,7 @@ type fakeEtcdCluster struct{} func (f fakeEtcdCluster) GetEtcdClusterStatus() (*clientv3.StatusResponse, error) { client := &clientv3.StatusResponse{} - client.Version = "3.1.11" + client.Version = "3.1.12" return client, nil } @@ -108,13 +108,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.2", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.9.3", KubeadmVersion: "v1.9.3", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -140,13 +140,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.10.0", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0", KubeadmVersion: "v1.10.0", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -172,13 +172,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.9.5", KubeadmVersion: "v1.9.5", // Note: The kubeadm version mustn't be "downgraded" here DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, { @@ -190,13 +190,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.1", KubeadmVersion: "v1.10.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -237,13 +237,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -270,13 +270,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -304,13 +304,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-beta.1", KubeadmVersion: "v1.10.0-beta.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -338,13 +338,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -372,13 +372,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.6-rc.1", KubeadmVersion: "v1.10.6-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, @@ -406,13 +406,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, { @@ -424,13 +424,13 @@ func TestGetAvailableUpgrades(t *testing.T) { }, KubeadmVersion: "v1.9.5", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2", DNSVersion: "1.14.8", - EtcdVersion: "3.1.11", + EtcdVersion: "3.1.12", }, }, }, diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 9cc3c6b1c0..c5d690cc9b 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.1.11} +ETCD_VERSION=${ETCD_VERSION:-3.1.12} ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_PORT=${ETCD_PORT:-2379} diff --git a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml index 7578556273..629abf8707 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml @@ -23,4 +23,4 @@ spec: - "--etcd-servers=http://localhost:2379" - "--audit-log-path=-" - name: etcd - image: quay.io/coreos/etcd:v3.1.11 + image: quay.io/coreos/etcd:v3.1.12 diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml index 660e780a54..53be32346d 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml @@ -21,4 +21,4 @@ spec: imagePullPolicy: Never command: [ "/kube-sample-apiserver", "--etcd-servers=http://localhost:2379" ] - name: etcd - image: quay.io/coreos/etcd:v3.1.11 + image: quay.io/coreos/etcd:v3.1.12 diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index fc72e7e927..1f9a587b87 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -133,7 +133,7 @@ func TestSampleAPIServer(f *framework.Framework, image string) { // kubectl create -f deploy.yaml deploymentName := "sample-apiserver-deployment" - etcdImage := "quay.io/coreos/etcd:v3.1.11" + etcdImage := "quay.io/coreos/etcd:v3.1.12" podLabels := map[string]string{"app": "sample-apiserver", "apiserver": "true"} replicas := int32(1) zero := int64(0) diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 457d0cfa61..e0421ed855 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -67,7 +67,7 @@ func etcdUpgradeGCE(target_storage, target_version string) error { os.Environ(), "TEST_ETCD_VERSION="+target_version, "STORAGE_BACKEND="+target_storage, - "TEST_ETCD_IMAGE=3.1.11") + "TEST_ETCD_IMAGE=3.1.12") _, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M") return err @@ -107,7 +107,7 @@ func masterUpgradeGCE(rawV string, enableKubeProxyDaemonSet bool) error { env = append(env, "TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion, "STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage, - "TEST_ETCD_IMAGE=3.1.11") + "TEST_ETCD_IMAGE=3.1.12") } else { // In e2e tests, we skip the confirmation prompt about // implicit etcd upgrades to simulate the user entering "y". diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 3ac9f5e06a..6566b8972c 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -59,7 +59,7 @@ SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}" EVENT_PD="${EVENT_PD:-}" # Etcd related variables. -ETCD_IMAGE="${ETCD_IMAGE:-3.1.11}" +ETCD_IMAGE="${ETCD_IMAGE:-3.1.12}" ETCD_VERSION="${ETCD_VERSION:-}" # Controller-manager related variables.