diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 4ad6e52eebf..897b40c093e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -78,7 +78,7 @@ dependencies: # etcd - name: "etcd" - version: 3.5.0-rc.0 + version: 3.5.0 refPaths: - path: cluster/gce/manifests/etcd.manifest match: etcd_docker_tag|etcd_version diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 855c1f7b1f6..512ff97376e 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -212,7 +212,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. v3.5.0-rc.0-0) if you need +# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. v3.5.0-0) 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/upgrade-aliases.sh b/cluster/gce/upgrade-aliases.sh index cef09514f99..d77c652d9f7 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.5.0-rc.0-0 -export ETCD_VERSION=3.5.0-rc.0 +export ETCD_IMAGE=3.5.0-0 +export ETCD_VERSION=3.5.0 # 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 e3a834ab37f..4afe80fb38f 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -286,7 +286,7 @@ const ( MinExternalEtcdVersion = "3.2.18" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.5.0-rc.0-0" + DefaultEtcdVersion = "3.5.0-0" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" @@ -467,8 +467,8 @@ var ( 19: "3.4.13-0", 20: "3.4.13-0", 21: "3.4.13-0", - 22: "3.5.0-rc.0-0", - 23: "3.5.0-rc.0-0", + 22: "3.5.0-0", + 23: "3.5.0-0", } // KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 74c5ef11264..e7a62cab15d 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.5.0-rc.0} +ETCD_VERSION=${ETCD_VERSION:-3.5.0} 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 2671610acac..e8fa6307fbb 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.5.0-rc.0 + image: quay.io/coreos/etcd:v3.5.0 diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 84e67466a33..d4689e01356 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.5.0-rc.0-0" +const etcdImage = "3.5.0-0" // EtcdUpgrade upgrades etcd on GCE. func EtcdUpgrade(targetStorage, targetVersion string) error {