diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/saltbase/salt/etcd/etcd.manifest index ad886d0cf03..b0eee99cafc 100644 --- a/cluster/saltbase/salt/etcd/etcd.manifest +++ b/cluster/saltbase/salt/etcd/etcd.manifest @@ -36,7 +36,7 @@ "containers":[ { "name": "etcd-container", - "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.17-alpha.1') }}", + "image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.17') }}", "resources": { "requests": { "cpu": {{ cpulimit }} diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go index b337d8ab772..3f714c9390b 100644 --- a/cmd/kubeadm/app/images/images.go +++ b/cmd/kubeadm/app/images/images.go @@ -30,7 +30,7 @@ const ( KubeSchedulerImage = "scheduler" KubeProxyImage = "proxy" - etcdVersion = "3.0.14-kubeadm" + etcdVersion = "3.0.17" ) func GetCoreImage(image string, cfg *kubeadmapi.MasterConfiguration, overrideImage string) string { diff --git a/federation/manifests/federation-apiserver-deployment.yaml b/federation/manifests/federation-apiserver-deployment.yaml index 20f43e5d648..a6e8adf84ba 100644 --- a/federation/manifests/federation-apiserver-deployment.yaml +++ b/federation/manifests/federation-apiserver-deployment.yaml @@ -43,7 +43,7 @@ spec: mountPath: /srv/kubernetes/ readOnly: true - name: etcd - image: gcr.io/google_containers/etcd:3.0.17-alpha.1 + image: gcr.io/google_containers/etcd:3.0.17 command: - /usr/local/bin/etcd - --data-dir diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index b8ba6d16b6c..dd6710aaeea 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -652,7 +652,7 @@ func createAPIServer(clientset client.Interface, namespace, name, image, credent }, { Name: "etcd", - Image: "gcr.io/google_containers/etcd:3.0.17-alpha.1", + Image: "gcr.io/google_containers/etcd:3.0.17", Command: []string{ "/usr/local/bin/etcd", "--data-dir", diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 7307f7e5c1d..b39e19b679e 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -829,7 +829,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na }, { Name: "etcd", - Image: "gcr.io/google_containers/etcd:3.0.17-alpha.1", + Image: "gcr.io/google_containers/etcd:3.0.17", Command: []string{ "/usr/local/bin/etcd", "--data-dir", diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 9659cc69663..8e49e64462d 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -50,7 +50,7 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-}" SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}" # Etcd related variables. -ETCD_IMAGE="${ETCD_IMAGE:-3.0.17-alpha.1}" +ETCD_IMAGE="${ETCD_IMAGE:-3.0.17}" ETCD_VERSION="${ETCD_VERSION:-}" # Controller-manager related variables.