mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-18 17:33:39 +00:00
use etcd 3.5.6-0 after promotion
This commit is contained in:
parent
7530baa9a1
commit
75f89875f8
@ -55,7 +55,7 @@ dependencies:
|
||||
|
||||
# etcd
|
||||
- name: "etcd"
|
||||
version: 3.5.5
|
||||
version: 3.5.6
|
||||
refPaths:
|
||||
- path: cluster/gce/manifests/etcd.manifest
|
||||
match: etcd_docker_tag|etcd_version
|
||||
|
@ -18,7 +18,7 @@
|
||||
{
|
||||
"name": "etcd-container",
|
||||
{{security_context}}
|
||||
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.5-0') }}",
|
||||
"image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.6-0') }}",
|
||||
"resources": {
|
||||
"requests": {
|
||||
"cpu": {{ cpulimit }}
|
||||
@ -34,7 +34,7 @@
|
||||
"value": "{{ pillar.get('storage_backend', 'etcd3') }}"
|
||||
},
|
||||
{ "name": "TARGET_VERSION",
|
||||
"value": "{{ pillar.get('etcd_version', '3.5.5') }}"
|
||||
"value": "{{ pillar.get('etcd_version', '3.5.6') }}"
|
||||
},
|
||||
{
|
||||
"name": "DO_NOT_MOVE_BINARIES",
|
||||
|
@ -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.5-0
|
||||
export ETCD_VERSION=3.5.5
|
||||
export ETCD_IMAGE=3.5.6-0
|
||||
export ETCD_VERSION=3.5.6
|
||||
|
||||
# Upgrade master with updated kube envs
|
||||
"${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l
|
||||
|
@ -309,7 +309,7 @@ const (
|
||||
MinExternalEtcdVersion = "3.2.18"
|
||||
|
||||
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
|
||||
DefaultEtcdVersion = "3.5.5-0"
|
||||
DefaultEtcdVersion = "3.5.6-0"
|
||||
|
||||
// Etcd defines variable used internally when referring to etcd component
|
||||
Etcd = "etcd"
|
||||
@ -476,10 +476,10 @@ var (
|
||||
19: "3.4.13-0",
|
||||
20: "3.4.13-0",
|
||||
21: "3.4.13-0",
|
||||
22: "3.5.5-0",
|
||||
23: "3.5.5-0",
|
||||
24: "3.5.5-0",
|
||||
25: "3.5.5-0",
|
||||
22: "3.5.6-0",
|
||||
23: "3.5.6-0",
|
||||
24: "3.5.6-0",
|
||||
25: "3.5.6-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.5}
|
||||
ETCD_VERSION=${ETCD_VERSION:-3.5.6}
|
||||
ETCD_HOST=${ETCD_HOST:-127.0.0.1}
|
||||
ETCD_PORT=${ETCD_PORT:-2379}
|
||||
# This is intentionally not called ETCD_LOG_LEVEL:
|
||||
|
@ -26,4 +26,4 @@ spec:
|
||||
imagePullPolicy: Never
|
||||
args: [ "--etcd-servers=http://localhost:2379" ]
|
||||
- name: etcd
|
||||
image: gcr.io/etcd-development/etcd:v3.5.5
|
||||
image: gcr.io/etcd-development/etcd:v3.5.6
|
||||
|
@ -25,7 +25,7 @@ import (
|
||||
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
|
||||
)
|
||||
|
||||
const etcdImage = "3.5.5-0"
|
||||
const etcdImage = "3.5.6-0"
|
||||
|
||||
// EtcdUpgrade upgrades etcd on GCE.
|
||||
func EtcdUpgrade(targetStorage, targetVersion string) error {
|
||||
|
@ -241,7 +241,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
|
||||
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
|
||||
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
|
||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.1.2"}
|
||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.5-1"}
|
||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.6-0"}
|
||||
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"}
|
||||
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
||||
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
||||
|
Loading…
Reference in New Issue
Block a user