diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index aaeaab6ad0e..ba1c2f04aa7 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -175,7 +175,7 @@ ENABLE_METADATA_AGENT="${KUBE_ENABLE_METADATA_AGENT:-none}" # 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.3.10-0) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.3.10-1) 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 6795aa23499..51750a06304 100644 --- a/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml +++ b/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml @@ -14,4 +14,4 @@ spec: dnsPolicy: Default containers: - name: etcd-empty-dir-cleanup - image: k8s.gcr.io/etcd-empty-dir-cleanup:3.3.10.0 + image: k8s.gcr.io/etcd-empty-dir-cleanup:3.3.10.1 diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index 0211aa1dbb2..4500d1df9e6 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.3.10-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.3.10-1') }}", "resources": { "requests": { "cpu": {{ cpulimit }} diff --git a/cluster/gce/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index 92b2382074a..907e15a0f6e 100755 --- a/cluster/gce/upgrade-aliases.sh +++ b/cluster/gce/upgrade-aliases.sh @@ -161,7 +161,7 @@ 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.3.10-0 +export ETCD_IMAGE=3.3.10-1 export ETCD_VERSION=3.3.10 # Upgrade master with updated kube envs diff --git a/cluster/images/etcd-version-monitor/Makefile b/cluster/images/etcd-version-monitor/Makefile index 0c019322b2f..88429b31896 100644 --- a/cluster/images/etcd-version-monitor/Makefile +++ b/cluster/images/etcd-version-monitor/Makefile @@ -20,7 +20,7 @@ ARCH:=amd64 GOLANG_VERSION?=1.8.3 REGISTRY?=staging-k8s.gcr.io -TAG?=0.1.2 +TAG?=0.1.3 IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG) CURRENT_DIR:=$(pwd) TEMP_DIR:=$(shell mktemp -d) diff --git a/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml b/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml index b02592679a2..c2a3df136ea 100644 --- a/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml +++ b/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml @@ -7,7 +7,7 @@ spec: hostNetwork: true containers: - name: etcd-version-monitor - image: k8s.gcr.io/etcd-version-monitor:0.1.2 + image: k8s.gcr.io/etcd-version-monitor:0.1.3 command: - /etcd-version-monitor - --logtostderr diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index e7ba544c6aa..874f3a86bd1 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.3.10 # 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 # for each revision of this image at that etcd version. -REVISION?=0 +REVISION?=1 # IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "-". IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index d7c0dc055b7..4211376560d 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -60,7 +60,7 @@ func etcdUpgradeGCE(targetStorage, targetVersion string) error { os.Environ(), "TEST_ETCD_VERSION="+targetVersion, "STORAGE_BACKEND="+targetStorage, - "TEST_ETCD_IMAGE=3.3.10-0") + "TEST_ETCD_IMAGE=3.3.10-1") _, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M") return err @@ -80,7 +80,7 @@ func masterUpgradeGCE(rawV string, enableKubeProxyDaemonSet bool) error { env = append(env, "TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion, "STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage, - "TEST_ETCD_IMAGE=3.3.10-0") + "TEST_ETCD_IMAGE=3.3.10-1") } 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 6cdf012fd9b..933a39615d5 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -64,7 +64,7 @@ SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}" EVENT_PD="${EVENT_PD:-}" # Etcd related variables. -ETCD_IMAGE="${ETCD_IMAGE:-3.3.10-0}" +ETCD_IMAGE="${ETCD_IMAGE:-3.3.10-1}" ETCD_VERSION="${ETCD_VERSION:-}" # Controller-manager related variables.