mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
Upgrade etcd to 3.5.0
This commit is contained in:
parent
b0010c2d9e
commit
ebe550bd48
@ -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
|
||||
|
@ -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:-}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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}"
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user