scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade etcd server version to 3.5.0-rc.0

Browse Source
This commit is contained in:
Marek Siarkowicz
2021-05-17 16:19:53 +02:00
parent 7696a48612
commit 12447bc803
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@@ -78,7 +78,7 @@ dependencies:
# etcd # etcd
- name: "etcd" - name: "etcd"
version: 3.4.13 version: 3.5.0-rc.0
refPaths: refPaths:
- path: cluster/gce/manifests/etcd.manifest - path: cluster/gce/manifests/etcd.manifest
match: etcd_docker_tag|etcd_version match: etcd_docker_tag|etcd_version

2
cluster/gce/config-test.sh
View File

@@ -212,7 +212,7 @@ HEAPSTER_MACHINE_TYPE=${HEAPSTER_MACHINE_TYPE:-}
NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-} NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-}
ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-} ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-}
# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.4.13-0) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. v3.5.0-rc.0-0) if you need
# non-default version. # non-default version.
export ETCD_IMAGE=${TEST_ETCD_IMAGE:-} export ETCD_IMAGE=${TEST_ETCD_IMAGE:-}
export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-} export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-}

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

@@ -18,7 +18,7 @@
{ {
"name": "etcd-container", "name": "etcd-container",
{{security_context}} {{security_context}}
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.13-3') }}", "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.0-rc.0-0') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
@@ -34,7 +34,7 @@
"value": "{{ pillar.get('storage_backend', 'etcd3') }}" "value": "{{ pillar.get('storage_backend', 'etcd3') }}"
}, },
{ "name": "TARGET_VERSION", { "name": "TARGET_VERSION",
"value": "{{ pillar.get('etcd_version', '3.4.13') }}" "value": "{{ pillar.get('etcd_version', '3.5.0-rc.0') }}"
}, },
{ {
"name": "DO_NOT_MOVE_BINARIES", "name": "DO_NOT_MOVE_BINARIES",

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

@@ -170,8 +170,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true
export SECONDARY_RANGE_NAME="pods-default" export SECONDARY_RANGE_NAME="pods-default"
export STORAGE_BACKEND="etcd3" export STORAGE_BACKEND="etcd3"
export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf" export STORAGE_MEDIA_TYPE="application/vnd.kubernetes.protobuf"
export ETCD_IMAGE=3.4.13-3 export ETCD_IMAGE=3.5.0-rc.0-0
export ETCD_VERSION=3.4.13 export ETCD_VERSION=3.5.0-rc.0
# Upgrade master with updated kube envs # Upgrade master with updated kube envs
"${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l "${KUBE_ROOT}/cluster/gce/upgrade.sh" -M -l

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

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

2
hack/lib/etcd.sh
View File

@@ -16,7 +16,7 @@
# A set of helpers for starting/running etcd for tests # A set of helpers for starting/running etcd for tests
ETCD_VERSION=${ETCD_VERSION:-3.4.13} ETCD_VERSION=${ETCD_VERSION:-3.5.0-rc.0}
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}
export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}" export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}"

2
staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
View File

@@ -26,4 +26,4 @@ spec:
imagePullPolicy: Never imagePullPolicy: Never
args: [ "--etcd-servers=http://localhost:2379" ] args: [ "--etcd-servers=http://localhost:2379" ]
- name: etcd - name: etcd
image: quay.io/coreos/etcd:v3.4.13 image: quay.io/coreos/etcd:v3.5.0-rc.0

2
test/e2e/framework/nodes_util.go
View File

@@ -34,7 +34,7 @@ import (
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
) )
const etcdImage = "3.4.13-0" const etcdImage = "3.5.0-rc.0-0"
// EtcdUpgrade upgrades etcd on GCE. // EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error { func EtcdUpgrade(targetStorage, targetVersion string) error {

4
test/integration/framework/etcd.go
View File

@@ -120,8 +120,8 @@ func RunCustomEtcd(dataDir string, customFlags []string) (url string, stopFn fun
customURL, customURL,
"--listen-peer-urls", "--listen-peer-urls",
"http://127.0.0.1:0", "http://127.0.0.1:0",
"--log-package-levels", "-log-level",
"*=NOTICE", // set to INFO or DEBUG for more logs "warn", // set to info or debug for more logs
} }
args = append(args, customFlags...) args = append(args, customFlags...)
cmd := exec.CommandContext(ctx, etcdPath, args...) cmd := exec.CommandContext(ctx, etcdPath, args...)