github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94287 from jingyih/update_etcd_server_3p4p13

Browse Source 
Update default etcd server to 3.4.13
This commit is contained in:
Kubernetes Prow Robot 2020-09-01 15:35:20 -07:00 committed by GitHub
commit b49724d5fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -74,7 +74,7 @@ dependencies:
# etcd # etcd
- name: "etcd" - name: "etcd"
version: 3.4.9 version: 3.4.13
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

8
build/workspace.bzl
View File

@ -38,11 +38,11 @@ _CRI_TARBALL_ARCH_SHA256 = {
"windows-amd64": "df60ff65ab71c5cf1d8c38f51db6f05e3d60a45d3a3293c3248c925c25375921", "windows-amd64": "df60ff65ab71c5cf1d8c38f51db6f05e3d60a45d3a3293c3248c925c25375921",
} }
ETCD_VERSION = "3.4.9" ETCD_VERSION = "3.4.13"
_ETCD_TARBALL_ARCH_SHA256 = { _ETCD_TARBALL_ARCH_SHA256 = {
"amd64": "bcab421f6bf4111accfceb004e0a0ac2bcfb92ac93081d9429e313248dd78c41", "amd64": "2ac029e47bab752dacdb7b30032f230f49e2f457cbc32e8f555c2210bb5ff107",
"arm64": "fd9bf37662a851905d75160fea0f5d10055c1bee0a734e78c5112cc56c9faa18", "arm64": "1934ebb9f9f6501f706111b78e5e321a7ff8d7792d3d96a76e2d01874e42a300",
"ppc64le": "bfdcea0fc83c6d6edb70667a2272f8fc597c61976ecc6f8ecbfeb380ff02618b", "ppc64le": "fc77c3949b5178373734c3b276eb2281c954c3cd2225ccb05cdbdf721e1f775a",
} }
# Dependencies needed for a Kubernetes "release", e.g. building docker images, # Dependencies needed for a Kubernetes "release", e.g. building docker images,

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

@ -202,7 +202,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.9-1) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.4.13-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

@ -17,7 +17,7 @@
"containers":[ "containers":[
{ {
"name": "etcd-container", "name": "etcd-container",
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.9-1') }}", "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.13-0') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
@ -33,7 +33,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.9') }}" "value": "{{ pillar.get('etcd_version', '3.4.13') }}"
}, },
{ "name": "DATA_DIRECTORY", { "name": "DATA_DIRECTORY",
"value": "/var/etcd/data{{ suffix }}" "value": "/var/etcd/data{{ suffix }}"

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.9-1 export ETCD_IMAGE=3.4.13-0
export ETCD_VERSION=3.4.9 export ETCD_VERSION=3.4.13
# 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

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

@ -265,7 +265,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.9-1" DefaultEtcdVersion = "3.4.13-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"
@ -434,7 +434,7 @@ var (
17: "3.4.3-0", 17: "3.4.3-0",
18: "3.4.3-0", 18: "3.4.3-0",
19: "3.4.9-1", 19: "3.4.9-1",
20: "3.4.9-1", 20: "3.4.13-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.9} ETCD_VERSION=${ETCD_VERSION:-3.4.13}
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.9 image: quay.io/coreos/etcd:v3.4.13

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.9-1" const etcdImage = "3.4.13-0"
// EtcdUpgrade upgrades etcd on GCE. // EtcdUpgrade upgrades etcd on GCE.
func EtcdUpgrade(targetStorage, targetVersion string) error { func EtcdUpgrade(targetStorage, targetVersion string) error {

2
test/utils/image/manifest.go
View File

@ -212,7 +212,7 @@ func initImageConfigs() map[int]Config {
configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"} configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"}
configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.2"} configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "v12.1.2"}
configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"}
configs[Etcd] = Config{gcRegistry, "etcd", "3.4.9"} configs[Etcd] = Config{gcRegistry, "etcd", "3.4.13-0"}
configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"}
configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"}
configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}