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

Upgrade to etcd server 3.3.17

Browse Source
This commit is contained in:
Joe Betz 2019-10-11 13:51:38 -07:00
parent f985367ba4
commit c92bd5e7b5
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -1,6 +1,6 @@
dependencies: dependencies:
- name: "etcd" - name: "etcd"
version: 3.3.15 version: 3.3.17
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

@ -35,11 +35,11 @@ _CRI_TARBALL_ARCH_SHA256 = {
"s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d", "s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d",
} }
ETCD_VERSION = "3.3.15" ETCD_VERSION = "3.3.17"
_ETCD_TARBALL_ARCH_SHA256 = { _ETCD_TARBALL_ARCH_SHA256 = {
"amd64": "87e30dc472a48b775a9e764cb742a5df0a2844e7b82d12917d7ea489febbc8c8", "amd64": "8c1168a24d17a2d6772f8148ea35d4f3398c51f1e23db90c849d506adb387060",
"arm64": "0cdacf1a5f8095322ee77b62ac5e79c3326a5166deb69f558214b110b312b4c0", "arm64": "0ea20dfbf3085f584f788287fd398979d0f1271549be6497d81ec635b9b4c121",
"ppc64le": "dcaa8d0ec1a117f6456778f3b9c7e685d4609c2a3c448afda1aa7a4232d0c481", "ppc64le": "49cef090eb67f0d24ebd1733303ed2088c291ad47c60f57746da9f689aa1de7a",
} }
# 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/manifests/etcd-empty-dir-cleanup.yaml
View File

@ -13,4 +13,4 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: etcd-empty-dir-cleanup - name: etcd-empty-dir-cleanup
image: k8s.gcr.io/etcd-empty-dir-cleanup:3.3.15.0 image: k8s.gcr.io/etcd-empty-dir-cleanup:3.3.17.0

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

@ -14,7 +14,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.3.15-0') }}", "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.3.17-0') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
@ -30,7 +30,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.3.15') }}" "value": "{{ pillar.get('etcd_version', '3.3.17') }}"
}, },
{ "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.3.15-0 export ETCD_IMAGE=3.3.17-0
export ETCD_VERSION=3.3.15 export ETCD_VERSION=3.3.17
# 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
cluster/images/etcd-empty-dir-cleanup/Makefile
View File

@ -14,13 +14,13 @@
.PHONY: build push .PHONY: build push
ETCD_VERSION = 3.3.15 ETCD_VERSION = 3.3.17
# Image should be pulled from k8s.gcr.io, which will auto-detect # Image should be pulled from k8s.gcr.io, which will auto-detect
# region (us, eu, asia, ...) and pull from the closest. # region (us, eu, asia, ...) and pull from the closest.
REGISTRY = k8s.gcr.io REGISTRY = k8s.gcr.io
# Images should be pushed to staging-k8s.gcr.io. # Images should be pushed to staging-k8s.gcr.io.
PUSH_REGISTRY = staging-k8s.gcr.io PUSH_REGISTRY = staging-k8s.gcr.io
TAG = 3.3.15.0 TAG = 3.3.17.0
clean: clean:
rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz

6
cluster/images/etcd/Makefile
View File

@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.12 3.2.24 3.3.15] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.12 3.2.24 3.3.17] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# #
# The image contains different etcd versions to simplify # The image contains different etcd versions to simplify
# upgrades. Thus be careful when removing any versions from here. # upgrades. Thus be careful when removing any versions from here.
@ -26,10 +26,10 @@
# Except from etcd-$(version) and etcdctl-$(version) binaries, we also # Except from etcd-$(version) and etcdctl-$(version) binaries, we also
# need etcd and etcdctl binaries for backward compatibility reasons. # need etcd and etcdctl binaries for backward compatibility reasons.
# That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS). # That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.12 3.2.24 3.3.15 BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.12 3.2.24 3.3.17
# LATEST_ETCD_VERSION identifies the most recent etcd version available. # LATEST_ETCD_VERSION identifies the most recent etcd version available.
LATEST_ETCD_VERSION?=3.3.15 LATEST_ETCD_VERSION?=3.3.17
# REVISION provides a version number fo this image and all it's bundled # REVISION provides a version number fo this image and all it's bundled
# artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment # artifacts. It should start at zero for each LATEST_ETCD_VERSION and increment

6
cluster/images/etcd/migrate-if-needed.sh
View File

@ -18,7 +18,7 @@
# This script performs etcd upgrade based on the following environmental # This script performs etcd upgrade based on the following environmental
# variables: # variables:
# TARGET_STORAGE - API of etcd to be used (supported: 'etcd3') # TARGET_STORAGE - API of etcd to be used (supported: 'etcd3')
# TARGET_VERSION - etcd release to be used (supported: '3.0.17', '3.1.12', '3.2.24', "3.3.15") # TARGET_VERSION - etcd release to be used (supported: '3.0.17', '3.1.12', '3.2.24', "3.3.17")
# DATA_DIRECTORY - directory with etcd data # DATA_DIRECTORY - directory with etcd data
# #
# The current etcd version and storage format is detected based on the # The current etcd version and storage format is detected based on the
@ -28,7 +28,7 @@
# The update workflow support the following upgrade steps: # The update workflow support the following upgrade steps:
# - 3.0.17/etcd3 -> 3.1.12/etcd3 # - 3.0.17/etcd3 -> 3.1.12/etcd3
# - 3.1.12/etcd3 -> 3.2.24/etcd3 # - 3.1.12/etcd3 -> 3.2.24/etcd3
# - 3.2.24/etcd3 -> 3.3.15/etcd3 # - 3.2.24/etcd3 -> 3.3.17/etcd3
# #
# NOTE: The releases supported in this script has to match release binaries # NOTE: The releases supported in this script has to match release binaries
# present in the etcd image (to make this script work correctly). # present in the etcd image (to make this script work correctly).
@ -41,7 +41,7 @@ set -o nounset
# NOTE: BUNDLED_VERSION has to match release binaries present in the # NOTE: BUNDLED_VERSION has to match release binaries present in the
# etcd image (to make this script work correctly). # etcd image (to make this script work correctly).
BUNDLED_VERSIONS="3.0.17, 3.1.12, 3.2.24, 3.3.15" BUNDLED_VERSIONS="3.0.17, 3.1.12, 3.2.24, 3.3.17"
ETCD_NAME="${ETCD_NAME:-etcd-$(hostname)}" ETCD_NAME="${ETCD_NAME:-etcd-$(hostname)}"
if [ -z "${DATA_DIRECTORY:-}" ]; then if [ -z "${DATA_DIRECTORY:-}" ]; then

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

@ -262,7 +262,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.3.15-0" DefaultEtcdVersion = "3.3.17-0"
// PauseVersion indicates the default pause image version for kubeadm // PauseVersion indicates the default pause image version for kubeadm
PauseVersion = "3.1" PauseVersion = "3.1"
@ -426,8 +426,8 @@ var (
14: "3.3.10", 14: "3.3.10",
15: "3.3.10", 15: "3.3.10",
16: "3.3.15-0", 16: "3.3.15-0",
17: "3.3.15-0", 17: "3.3.17-0",
18: "3.3.15-0", 18: "3.3.17-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.3.15} ETCD_VERSION=${ETCD_VERSION:-3.3.17}
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/rc.yaml
View File

@ -25,4 +25,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.3.15 image: quay.io/coreos/etcd:v3.3.17

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

@ -25,14 +25,14 @@ import (
"sync" "sync"
"time" "time"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
) )
const etcdImage = "3.3.15-0" const etcdImage = "3.3.17-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

@ -228,7 +228,7 @@ func initImageConfigs() map[int]Config {
configs[Dnsutils] = Config{e2eRegistry, "dnsutils", "1.1"} configs[Dnsutils] = Config{e2eRegistry, "dnsutils", "1.1"}
configs[DebianBase] = Config{googleContainerRegistry, "debian-base", "0.4.1"} configs[DebianBase] = Config{googleContainerRegistry, "debian-base", "0.4.1"}
configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"}
configs[Etcd] = Config{gcRegistry, "etcd", "3.3.15"} configs[Etcd] = Config{gcRegistry, "etcd", "3.3.17"}
configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"} configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"}
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"}