github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100612 from pacoxu/patch-8

Browse Source 
kubeadm: upgrade etcd to 3.4.13-3
This commit is contained in:
Kubernetes Prow Robot 2021-05-05 07:11:27 -07:00 committed by GitHub
commit 7d176851f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/manifests/etcd.manifest
View File

@ -18,7 +18,7 @@
{
"name": "etcd-container",
{{security_context}}
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.13-0') }}",
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.13-3') }}",
"resources": {
"requests": {
"cpu": {{ cpulimit }}

2
cluster/gce/upgrade-aliases.sh
View File

@ -170,7 +170,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.4.13-0
export ETCD_IMAGE=3.4.13-3
export ETCD_VERSION=3.4.13
# Upgrade master with updated kube envs

6
cmd/kubeadm/app/constants/constants.go
View File

@ -290,7 +290,7 @@ const (
MinExternalEtcdVersion = "3.2.18"
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.4.13-0"
DefaultEtcdVersion = "3.4.13-3"
// Etcd defines variable used internally when referring to etcd component
Etcd = "etcd"
@ -459,8 +459,8 @@ var (
19: "3.4.13-0",
20: "3.4.13-0",
21: "3.4.13-0",
22: "3.4.13-0",
23: "3.4.13-0",
22: "3.4.13-3",
23: "3.4.13-3",
}
// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows