diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 737ecc40bd..f5adb3b7a3 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.2.14; \ +RUN export ETCD_VERSION=v3.2.16; \ 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 613c36ad96..c1b63979e8 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.2.14" +ETCD_VERSION = "3.2.16" new_http_archive( name = "com_coreos_etcd", build_file = "third_party/etcd.BUILD", - sha256 = "f77398f558ff19b65a0bf978b47868e03683f27090c56c054415666b1d78bf42", + sha256 = "b664649bdc5e67bc79cda7f0d77156fdd31c8742a9e5335c3f16cb7119da4ec5", 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/gce/config-test.sh b/cluster/gce/config-test.sh index 6a69ce37b7..12aaf1fca4 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.2.14) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.2.16) 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 69d0134be1..e167d2f4e9 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.2.14') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.2.16') }}", "resources": { "requests": { "cpu": {{ cpulimit }} @@ -29,7 +29,7 @@ "value": "{{ pillar.get('storage_backend', 'etcd3') }}" }, { "name": "TARGET_VERSION", - "value": "{{ pillar.get('etcd_version', '3.2.14') }}" + "value": "{{ pillar.get('etcd_version', '3.2.16') }}" }, { "name": "DATA_DIRECTORY", "value": "/var/etcd/data{{ suffix }}" diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index d28a217d91..01e8bf4bc2 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.2.14 -export ETCD_VERSION=3.2.14 +export ETCD_IMAGE=3.2.16 +export ETCD_VERSION=3.2.16 # Upgrade master with updated kube envs ${KUBE_ROOT}/cluster/gce/upgrade.sh -M -l diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index e5795b7977..9ce1cabd3a 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 3.2.14] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) +# [TAGS=2.2.1 2.3.7 3.0.17 3.1.11 3.2.16] [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,8 +26,8 @@ # 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 3.2.14 -REGISTRY_TAG?=3.2.14 +TAGS?=2.2.1 2.3.7 3.0.17 3.1.11 3.2.16 +REGISTRY_TAG?=3.2.16 # ROLLBACK_REGISTRY_TAG specified the tag that REGISTRY_TAG may be rolled back to. ROLLBACK_REGISTRY_TAG?=3.1.11 ARCH?=amd64 @@ -129,7 +129,7 @@ test-rollback-etcd2: -e "TARGET_STORAGE=etcd3" \ -e "TARGET_VERSION=$(ETCD2_ROLLBACK_NEW_TAG)" \ -e "DATA_DIRECTORY=/var/etcd/data" \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ 'INITIAL_CLUSTER=etcd-$$(hostname)=http://localhost:2380 \ /usr/local/bin/migrate-if-needed.sh && \ source /usr/local/bin/start-stop-etcd.sh && \ @@ -143,7 +143,7 @@ test-rollback-etcd2: -e "TARGET_STORAGE=etcd2" \ -e "TARGET_VERSION=$(ETCD2_ROLLBACK_OLD_TAG)" \ -e "DATA_DIRECTORY=/var/etcd/data" \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ 'INITIAL_CLUSTER=etcd-$$(hostname)=http://localhost:2380 \ /usr/local/bin/migrate-if-needed.sh && \ source /usr/local/bin/start-stop-etcd.sh && \ @@ -153,7 +153,7 @@ test-rollback-etcd2: @echo "Checking if rollback successfully downgraded etcd to $(ETCD2_ROLLBACK_OLD_TAG)" docker run --tty --interactive -v $(TEMP_DIR)/rollback-etcd2:/var/etcd \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ '[ $$(cat /var/etcd/data/version.txt) = $(ETCD2_ROLLBACK_OLD_TAG)/etcd2 ] && \ grep -q value1 /var/etcd/keyspace.txt' @@ -167,7 +167,7 @@ test-rollback: -e "TARGET_STORAGE=etcd3" \ -e "TARGET_VERSION=$(REGISTRY_TAG)" \ -e "DATA_DIRECTORY=/var/etcd/data" \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ 'INITIAL_CLUSTER=etcd-$$(hostname)=http://localhost:2380 \ /usr/local/bin/migrate-if-needed.sh && \ source /usr/local/bin/start-stop-etcd.sh && \ @@ -180,7 +180,7 @@ test-rollback: -e "TARGET_STORAGE=etcd3" \ -e "TARGET_VERSION=$(ROLLBACK_REGISTRY_TAG)" \ -e "DATA_DIRECTORY=/var/etcd/data" \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ 'INITIAL_CLUSTER=etcd-$$(hostname)=http://localhost:2380 \ /usr/local/bin/migrate-if-needed.sh && \ source /usr/local/bin/start-stop-etcd.sh && \ @@ -190,7 +190,7 @@ test-rollback: @echo "Checking if rollback successfully downgraded etcd to $(ROLLBACK_REGISTRY_TAG)" docker run --tty --interactive -v $(TEMP_DIR)/rollback-test:/var/etcd \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ '[ $$(cat /var/etcd/data/version.txt) = $(ROLLBACK_REGISTRY_TAG)/etcd3 ] && \ grep -q value1 /var/etcd/keyspace.txt' @@ -206,7 +206,7 @@ test-migrate: -e "TARGET_STORAGE=etcd$${MAJOR_VERSION}" \ -e "TARGET_VERSION=$${tag}" \ -e "DATA_DIRECTORY=/var/etcd/data" \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ "INITIAL_CLUSTER=etcd-\$$(hostname)=http://localhost:2380 \ /usr/local/bin/migrate-if-needed.sh && \ source /usr/local/bin/start-stop-etcd.sh && \ @@ -222,7 +222,7 @@ test-migrate: -e "TARGET_STORAGE=etcd3" \ -e "TARGET_VERSION=$(REGISTRY_TAG)" \ -e "DATA_DIRECTORY=/var/etcd/data" \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ 'INITIAL_CLUSTER=etcd-$$(hostname)=http://localhost:2380 \ /usr/local/bin/migrate-if-needed.sh && \ source /usr/local/bin/start-stop-etcd.sh && \ @@ -231,7 +231,7 @@ test-migrate: stop_etcd' && \ echo "Checking if migrate from $${tag} successfully upgraded etcd to $(REGISTRY_TAG)" && \ docker run --tty --interactive -v $(TEMP_DIR)/migrate-$${tag}:/var/etcd \ - gcr.io/google_containers/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ + $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) /bin/sh -c \ '[ $$(cat /var/etcd/data/version.txt) = $(REGISTRY_TAG)/etcd3 ] && \ grep -q value1 /var/etcd/keyspace.txt'; \ done diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh index 5ef718fae4..451ac684d4 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', '3.2.14') +# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.11', '3.2.16') # DATA_DIRECTORY - directory with etcd data # # The current etcd version and storage format is detected based on the @@ -29,7 +29,7 @@ # - 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.1.11/etcd3 -> 3.2.14/etcd3 +# - 3.1.11/etcd3 -> 3.2.16/etcd3 # # NOTE: The releases supported in this script has to match release binaries # present in the etcd image (to make this script work correctly). @@ -65,7 +65,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.2.13/op-guide/recovery.html for manual downgrade options." + echo "See https://coreos.com/etcd/docs/3.2.16/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}" @@ -139,7 +139,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 3.2.14" +SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.17 3.1.11 3.2.16" SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n") VERSION_FILE="version.txt" diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 66a782a86e..d553c817f9 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -211,7 +211,7 @@ const ( MinExternalEtcdVersion = "3.1.11" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.2.14" + DefaultEtcdVersion = "3.2.16" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -297,8 +297,8 @@ var ( // SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases SupportedEtcdVersion = map[uint8]string{ 9: "3.1.11", - 10: "3.2.14", - 11: "3.2.14", + 10: "3.2.16", + 11: "3.2.16", } ) diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go index 9129e1d01b..a73e150fe0 100644 --- a/cmd/kubeadm/app/constants/constants_test.go +++ b/cmd/kubeadm/app/constants/constants_test.go @@ -137,12 +137,12 @@ func TestEtcdSupportedVersion(t *testing.T) { }, { kubernetesVersion: "1.10.0", - expectedVersion: version.MustParseSemantic("3.2.14"), + expectedVersion: version.MustParseSemantic("3.2.16"), expectedError: nil, }, { kubernetesVersion: "1.10.1", - expectedVersion: version.MustParseSemantic("3.2.14"), + expectedVersion: version.MustParseSemantic("3.2.16"), expectedError: nil, }, } diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index 98b8eea429..470afc67ac 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -146,7 +146,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.0", KubeadmVersion: "v1.10.0", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -196,7 +196,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.1", KubeadmVersion: "v1.10.1", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -243,7 +243,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -276,7 +276,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -310,7 +310,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.0-beta.1", KubeadmVersion: "v1.10.0-beta.1", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -344,7 +344,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -378,7 +378,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.6-rc.1", KubeadmVersion: "v1.10.6-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, @@ -412,7 +412,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, { @@ -430,7 +430,7 @@ func TestGetAvailableUpgrades(t *testing.T) { KubeVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2", DNSVersion: "1.14.8", - EtcdVersion: "3.2.14", + EtcdVersion: "3.2.16", }, }, }, diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 9bb960cb44..1b36efa3cd 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.2.14} +ETCD_VERSION=${ETCD_VERSION:-3.2.16} 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 48058b0584..595dbcf544 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.2.14 + image: quay.io/coreos/etcd:v3.2.16 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 be6aaf7dde..371f3724a2 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.2.14 + image: quay.io/coreos/etcd:v3.2.16 diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index e4a179af1f..974a8f1226 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.2.14" + etcdImage := "quay.io/coreos/etcd:v3.2.16" 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 8977cbde8e..25266a0f40 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.2.14") + "TEST_ETCD_IMAGE=3.2.16") _, _, 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.2.14") + "TEST_ETCD_IMAGE=3.2.16") } 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 15900e4583..981ae8dcc1 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.2.14}" +ETCD_IMAGE="${ETCD_IMAGE:-3.2.16}" ETCD_VERSION="${ETCD_VERSION:-}" # Controller-manager related variables.