Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #114093: use etcd 3.5.6-0 after promotion #114107

Merged
merged 1 commit into from
Dec 2, 2022
Merged

Automated cherry pick of #114093: use etcd 3.5.6-0 after promotion #114107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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
Expand Down
4 changes: 2 additions & 2 deletions cluster/gce/manifests/etcd.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions cluster/gce/upgrade-aliases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,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"
Expand Down Expand Up @@ -485,9 +485,9 @@ 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",
22: "3.5.6-0",
23: "3.5.6-0",
24: "3.5.6-0",
}

// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/etcd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}"
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/e2e/framework/nodes_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
)

const etcdImage = "3.5.5-0"
const etcdImage = "3.5.6-0"

// EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error {
Expand Down
2 changes: 1 addition & 1 deletion test/utils/image/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) {
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "bullseye-v1.1.0"}
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.4"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.5-0"}
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-2"}
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-2"}
Expand Down