Skip to content

K
k3s
Commit e2a25f9b authored by Joe Betz's avatar Joe Betz
Browse files
Options

Bump to etcd 3.1.12 to pick up critical fix

parent 71b40cbc
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 73 deletions
build/build-image/cross/Dockerfile
View file @ e2a25f9b
...@@ -71,7 +71,7 @@ RUN go get golang.org/x/tools/cmd/cover \ ...@@ -71,7 +71,7 @@ RUN go get golang.org/x/tools/cmd/cover \
golang.org/x/tools/cmd/goimports golang.org/x/tools/cmd/goimports
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.
RUN export ETCD_VERSION=v3.1.11; \ RUN export ETCD_VERSION=v3.1.12; \
mkdir -p /usr/local/src/etcd \ mkdir -p /usr/local/src/etcd \
&& cd /usr/local/src/etcd \ && cd /usr/local/src/etcd \
&& curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \ && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \
......
build/root/WORKSPACE
View file @ e2a25f9b
...@@ -19,12 +19,12 @@ http_archive( ...@@ -19,12 +19,12 @@ http_archive(
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
) )
ETCD_VERSION = "3.1.11" ETCD_VERSION = "3.1.12"
new_http_archive( new_http_archive(
name = "com_coreos_etcd", name = "com_coreos_etcd",
build_file = "third_party/etcd.BUILD", build_file = "third_party/etcd.BUILD",
sha256 = "b80c6c0719beee703821ece80f9e48b071ad5f59bb284bd3ea2104700738d9ec", sha256 = "4b22184bef1bba8b4908b14bae6af4a6d33ec2b91e4f7a240780e07fa43f2111",
strip_prefix = "etcd-v%s-linux-amd64" % ETCD_VERSION, strip_prefix = "etcd-v%s-linux-amd64" % ETCD_VERSION,
urls = ["https://github.com/coreos/etcd/releases/download/v%s/etcd-v%s-linux-amd64.tar.gz" % (ETCD_VERSION, ETCD_VERSION)], urls = ["https://github.com/coreos/etcd/releases/download/v%s/etcd-v%s-linux-amd64.tar.gz" % (ETCD_VERSION, ETCD_VERSION)],
) )
......
cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml
View file @ e2a25f9b
...@@ -24,4 +24,4 @@ spec: ...@@ -24,4 +24,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.1.11.0 image: k8s.gcr.io/etcd-empty-dir-cleanup:3.1.12.0
cluster/gce/config-test.sh
View file @ e2a25f9b
...@@ -160,7 +160,7 @@ METADATA_AGENT_VERSION="${KUBE_METADATA_AGENT_VERSION:-0.2-0.0.16-1}" ...@@ -160,7 +160,7 @@ METADATA_AGENT_VERSION="${KUBE_METADATA_AGENT_VERSION:-0.2-0.0.16-1}"
# Useful for scheduling heapster in large clusters with nodes of small size. # Useful for scheduling heapster in large clusters with nodes of small size.
HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}" HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}"
# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.11) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.12) if you need
# non-default version. # non-default version.
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
ETCD_DOCKER_REPOSITORY="${TEST_ETCD_DOCKER_REPOSITORY:-}" ETCD_DOCKER_REPOSITORY="${TEST_ETCD_DOCKER_REPOSITORY:-}"
......
cluster/gce/manifests/etcd.manifest
View file @ e2a25f9b
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,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.1.11') }}", "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.1.12') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,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.1.11') }}" "value": "{{ pillar.get('etcd_version', '3.1.12') }}"
}, },
{ "name": "DATA_DIRECTORY", { "name": "DATA_DIRECTORY",
"value": "/var/etcd/data{{ suffix }}" "value": "/var/etcd/data{{ suffix }}"
......
cluster/gce/upgrade-aliases.sh
View file @ e2a25f9b
...@@ -161,8 +161,8 @@ export KUBE_GCE_ENABLE_IP_ALIASES=true ...@@ -161,8 +161,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.1.11 export ETCD_IMAGE=3.1.12
export ETCD_VERSION=3.1.11 export ETCD_VERSION=3.1.12
# 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
......
cluster/images/etcd-empty-dir-cleanup/Makefile
View file @ e2a25f9b
...@@ -14,9 +14,13 @@ ...@@ -14,9 +14,13 @@
.PHONY: build push .PHONY: build push
ETCD_VERSION = 3.1.11 ETCD_VERSION = 3.1.12
IMAGE = staging-k8s.gcr.io/etcd-empty-dir-cleanup # Image should be pulled from k8s.gcr.io, which will auto-detect
TAG = 3.1.11.0 # region (us, eu, asia, ...) and pull from the closest.
REGISTRY = k8s.gcr.io
# Images should be pushed to staging-k8s.gcr.io.
PUSH_REGISTRY = staging-k8s.gcr.io
TAG = 3.1.12.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
...@@ -25,8 +29,9 @@ build: clean ...@@ -25,8 +29,9 @@ build: clean
curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
tar xzvf etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz tar xzvf etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
cp etcd-v$(ETCD_VERSION)-linux-amd64/etcdctl . cp etcd-v$(ETCD_VERSION)-linux-amd64/etcdctl .
docker build --pull -t $(IMAGE):$(TAG) . docker build --pull -t $(REGISTRY)/etcd-empty-dir-cleanup:$(TAG) .
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
push: build push: build
docker push $(IMAGE):$(TAG) docker tag $(REGISTRY)/etcd-empty-dir-cleanup:$(TAG) $(PUSH_REGISTRY)/etcd-empty-dir-cleanup:$(TAG)
docker push $(PUSH_REGISTRY)/etcd-empty-dir-cleanup:$(TAG)
cluster/images/etcd/Makefile
View file @ e2a25f9b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [TAGS=2.2.1 2.3.7 3.0.17 3.1.11] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [TAGS=2.2.1 2.3.7 3.0.17 3.1.12] [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 tag from here. # upgrades. Thus be careful when removing any tag from here.
...@@ -26,12 +26,16 @@ ...@@ -26,12 +26,16 @@
# Except from etcd-$(tag) and etcdctl-$(tag) binaries, we also # Except from etcd-$(tag) and etcdctl-$(tag) 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 tag from $(TAGS). # That binary will be set to the last tag from $(TAGS).
TAGS?=2.2.1 2.3.7 3.0.17 3.1.11 TAGS?=2.2.1 2.3.7 3.0.17 3.1.12
REGISTRY_TAG?=3.1.11 REGISTRY_TAG?=3.1.12
# ROLLBACK_REGISTRY_TAG specified the tag that REGISTRY_TAG may be rolled back to. # ROLLBACK_REGISTRY_TAG specified the tag that REGISTRY_TAG may be rolled back to.
ROLLBACK_REGISTRY_TAG?=3.1.11 ROLLBACK_REGISTRY_TAG?=3.1.12
ARCH?=amd64 ARCH?=amd64
# Image should be pulled from k8s.gcr.io, which will auto-detect
# 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.
PUSH_REGISTRY?=staging-k8s.gcr.io
# golang version should match the golang version from https://github.com/coreos/etcd/releases for REGISTRY_TAG version of etcd. # golang version should match the golang version from https://github.com/coreos/etcd/releases for REGISTRY_TAG version of etcd.
GOLANG_VERSION?=1.8.5 GOLANG_VERSION?=1.8.5
GOARM=7 GOARM=7
...@@ -83,10 +87,10 @@ else ...@@ -83,10 +87,10 @@ else
# For each release create a tmp dir 'etcd_release_tmp_dir' and unpack the release tar there. # For each release create a tmp dir 'etcd_release_tmp_dir' and unpack the release tar there.
for tag in $(TAGS); do \ for tag in $(TAGS); do \
etcd_release_tmp_dir=$(shell mktemp -d); \ etcd_release_tmp_dir=$(shell mktemp -d); \
docker run --interactive -v $$etcd_release_tmp_dir:/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \ docker run --interactive -v $${etcd_release_tmp_dir}:/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \
"git clone https://github.com/coreos/etcd /go/src/github.com/coreos/etcd \ "git clone https://github.com/coreos/etcd /go/src/github.com/coreos/etcd \
&& cd /go/src/github.com/coreos/etcd \ && cd /go/src/github.com/coreos/etcd \
&& git checkout v$$tag \ && git checkout v$${tag} \
&& GOARM=$(GOARM) GOARCH=$(ARCH) ./build \ && GOARM=$(GOARM) GOARCH=$(ARCH) ./build \
&& cp -f bin/$(ARCH)/etcd* bin/etcd* /etcdbin; echo 'done'"; \ && cp -f bin/$(ARCH)/etcd* bin/etcd* /etcdbin; echo 'done'"; \
cp $$etcd_release_tmp_dir/etcd $$etcd_release_tmp_dir/etcdctl $(TEMP_DIR)/; \ cp $$etcd_release_tmp_dir/etcd $$etcd_release_tmp_dir/etcdctl $(TEMP_DIR)/; \
...@@ -108,7 +112,8 @@ endif ...@@ -108,7 +112,8 @@ endif
docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR) docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build push: build
docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(PUSH_REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
docker push $(PUSH_REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # Backward compatibility. TODO: deprecate this image tag
......
cluster/images/etcd/migrate-if-needed.sh
View file @ e2a25f9b
...@@ -18,7 +18,7 @@ ...@@ -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: 'etcd2', 'etcd3') # TARGET_STORAGE - API of etcd to be used (supported: 'etcd2', 'etcd3')
# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.11') # TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.12')
# 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 @@ ...@@ -28,7 +28,7 @@
# The update workflow support the following upgrade steps: # The update workflow support the following upgrade steps:
# - 2.2.1/etcd2 -> 2.3.7/etcd2 # - 2.2.1/etcd2 -> 2.3.7/etcd2
# - 2.3.7/etcd2 -> 3.0.17/etcd2 # - 2.3.7/etcd2 -> 3.0.17/etcd2
# - 3.0.17/etcd3 -> 3.1.11/etcd3 # - 3.0.17/etcd3 -> 3.1.12/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).
...@@ -64,7 +64,7 @@ rollback_etcd3_minor_version() { ...@@ -64,7 +64,7 @@ rollback_etcd3_minor_version() {
echo "Starting etcd version ${START_VERSION} to capture rollback snapshot." echo "Starting etcd version ${START_VERSION} to capture rollback snapshot."
if ! start_etcd; then if ! start_etcd; then
echo "Unable to automatically downgrade etcd: starting etcd version ${START_VERSION} to capture rollback snapshot failed." echo "Unable to automatically downgrade etcd: starting etcd version ${START_VERSION} to capture rollback snapshot failed."
echo "See https://coreos.com/etcd/docs/3.1.11/op-guide/recovery.html for manual downgrade options." echo "See https://coreos.com/etcd/docs/latest/op-guide/recovery.html for manual downgrade options."
exit 1 exit 1
else else
ETCDCTL_API=3 ${ETCDCTL_CMD} snapshot --endpoints "http://127.0.0.1:${ETCD_PORT}" save "${SNAPSHOT_FILE}" ETCDCTL_API=3 ${ETCDCTL_CMD} snapshot --endpoints "http://127.0.0.1:${ETCD_PORT}" save "${SNAPSHOT_FILE}"
...@@ -138,7 +138,7 @@ fi ...@@ -138,7 +138,7 @@ fi
# NOTE: SUPPORTED_VERSION has to match release binaries present in the # NOTE: SUPPORTED_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).
# We cannot use array since sh doesn't support it. # We cannot use array since sh doesn't support it.
SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.17 3.1.11" SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.17 3.1.12"
SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n") SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n")
VERSION_FILE="version.txt" VERSION_FILE="version.txt"
......
cluster/kubemark/gce/config-default.sh
View file @ e2a25f9b
...@@ -62,7 +62,7 @@ TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} ...@@ -62,7 +62,7 @@ TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
KUBE_APISERVER_REQUEST_TIMEOUT=300 KUBE_APISERVER_REQUEST_TIMEOUT=300
ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}" ETCD_COMPACTION_INTERVAL_SEC="${KUBEMARK_ETCD_COMPACTION_INTERVAL_SEC:-}"
# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.11) if you need # Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.12) if you need
# non-default version. # non-default version.
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}" ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
ETCD_VERSION="${TEST_ETCD_VERSION:-}" ETCD_VERSION="${TEST_ETCD_VERSION:-}"
......
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View file @ e2a25f9b
...@@ -133,7 +133,7 @@ _____________________________________________________________________ ...@@ -133,7 +133,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0", KubeVersion: "v1.9.0",
KubeadmVersion: "v1.9.0", KubeadmVersion: "v1.9.0",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -149,7 +149,7 @@ Controller Manager v1.8.3 v1.9.0 ...@@ -149,7 +149,7 @@ Controller Manager v1.8.3 v1.9.0
Scheduler v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0
Kube Proxy v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0
Kube DNS 1.14.5 1.14.8 Kube DNS 1.14.5 1.14.8
Etcd 3.0.17 3.1.11 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
...@@ -194,7 +194,7 @@ _____________________________________________________________________ ...@@ -194,7 +194,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0", KubeVersion: "v1.9.0",
KubeadmVersion: "v1.9.0", KubeadmVersion: "v1.9.0",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -230,7 +230,7 @@ Controller Manager v1.8.3 v1.9.0 ...@@ -230,7 +230,7 @@ Controller Manager v1.8.3 v1.9.0
Scheduler v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0
Kube Proxy v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0
Kube DNS 1.14.5 1.14.8 Kube DNS 1.14.5 1.14.8
Etcd 3.0.17 3.1.11 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
...@@ -259,7 +259,7 @@ _____________________________________________________________________ ...@@ -259,7 +259,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0-beta.1", KubeVersion: "v1.9.0-beta.1",
KubeadmVersion: "v1.9.0-beta.1", KubeadmVersion: "v1.9.0-beta.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -275,7 +275,7 @@ Controller Manager v1.8.5 v1.9.0-beta.1 ...@@ -275,7 +275,7 @@ Controller Manager v1.8.5 v1.9.0-beta.1
Scheduler v1.8.5 v1.9.0-beta.1 Scheduler v1.8.5 v1.9.0-beta.1
Kube Proxy v1.8.5 v1.9.0-beta.1 Kube Proxy v1.8.5 v1.9.0-beta.1
Kube DNS 1.14.5 1.14.8 Kube DNS 1.14.5 1.14.8
Etcd 3.0.17 3.1.11 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
...@@ -304,7 +304,7 @@ _____________________________________________________________________ ...@@ -304,7 +304,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0-rc.1", KubeVersion: "v1.9.0-rc.1",
KubeadmVersion: "v1.9.0-rc.1", KubeadmVersion: "v1.9.0-rc.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -320,7 +320,7 @@ Controller Manager v1.8.5 v1.9.0-rc.1 ...@@ -320,7 +320,7 @@ Controller Manager v1.8.5 v1.9.0-rc.1
Scheduler v1.8.5 v1.9.0-rc.1 Scheduler v1.8.5 v1.9.0-rc.1
Kube Proxy v1.8.5 v1.9.0-rc.1 Kube Proxy v1.8.5 v1.9.0-rc.1
Kube DNS 1.14.5 1.14.8 Kube DNS 1.14.5 1.14.8
Etcd 3.0.17 3.1.11 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
......
cmd/kubeadm/app/constants/constants.go
View file @ e2a25f9b
...@@ -208,10 +208,10 @@ const ( ...@@ -208,10 +208,10 @@ const (
KubeletBaseConfigurationFile = "kubelet" KubeletBaseConfigurationFile = "kubelet"
// MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports // MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports
MinExternalEtcdVersion = "3.1.11" MinExternalEtcdVersion = "3.1.12"
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses // DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.1.11" DefaultEtcdVersion = "3.1.12"
// Etcd defines variable used internally when referring to etcd component // Etcd defines variable used internally when referring to etcd component
Etcd = "etcd" Etcd = "etcd"
...@@ -296,9 +296,9 @@ var ( ...@@ -296,9 +296,9 @@ var (
// SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases // SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases
SupportedEtcdVersion = map[uint8]string{ SupportedEtcdVersion = map[uint8]string{
9: "3.1.11", 9: "3.1.12",
10: "3.1.11", 10: "3.1.12",
11: "3.1.11", 11: "3.1.12",
} }
) )
......
cmd/kubeadm/app/constants/constants_test.go
View file @ e2a25f9b
...@@ -127,22 +127,22 @@ func TestEtcdSupportedVersion(t *testing.T) { ...@@ -127,22 +127,22 @@ func TestEtcdSupportedVersion(t *testing.T) {
}, },
{ {
kubernetesVersion: "1.9.0", kubernetesVersion: "1.9.0",
expectedVersion: version.MustParseSemantic("3.1.11"), expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil, expectedError: nil,
}, },
{ {
kubernetesVersion: "1.9.2", kubernetesVersion: "1.9.2",
expectedVersion: version.MustParseSemantic("3.1.11"), expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil, expectedError: nil,
}, },
{ {
kubernetesVersion: "1.10.0", kubernetesVersion: "1.10.0",
expectedVersion: version.MustParseSemantic("3.1.11"), expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil, expectedError: nil,
}, },
{ {
kubernetesVersion: "1.10.1", kubernetesVersion: "1.10.1",
expectedVersion: version.MustParseSemantic("3.1.11"), expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil, expectedError: nil,
}, },
} }
......
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @ e2a25f9b
...@@ -64,7 +64,7 @@ type fakeEtcdCluster struct{} ...@@ -64,7 +64,7 @@ type fakeEtcdCluster struct{}
func (f fakeEtcdCluster) GetEtcdClusterStatus() (*clientv3.StatusResponse, error) { func (f fakeEtcdCluster) GetEtcdClusterStatus() (*clientv3.StatusResponse, error) {
client := &clientv3.StatusResponse{} client := &clientv3.StatusResponse{}
client.Version = "3.1.11" client.Version = "3.1.12"
return client, nil return client, nil
} }
...@@ -108,13 +108,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -108,13 +108,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.2", KubeadmVersion: "v1.9.2",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.9.3", KubeVersion: "v1.9.3",
KubeadmVersion: "v1.9.3", KubeadmVersion: "v1.9.3",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -140,13 +140,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -140,13 +140,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.10.0", KubeadmVersion: "v1.10.0",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0", KubeVersion: "v1.10.0",
KubeadmVersion: "v1.10.0", KubeadmVersion: "v1.10.0",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -172,13 +172,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -172,13 +172,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.9.5", KubeVersion: "v1.9.5",
KubeadmVersion: "v1.9.5", // Note: The kubeadm version mustn't be "downgraded" here KubeadmVersion: "v1.9.5", // Note: The kubeadm version mustn't be "downgraded" here
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
{ {
...@@ -190,13 +190,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -190,13 +190,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.1", KubeVersion: "v1.10.1",
KubeadmVersion: "v1.10.1", KubeadmVersion: "v1.10.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -237,13 +237,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -237,13 +237,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-alpha.2", KubeVersion: "v1.10.0-alpha.2",
KubeadmVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -270,13 +270,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -270,13 +270,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-alpha.2", KubeVersion: "v1.10.0-alpha.2",
KubeadmVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -304,13 +304,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -304,13 +304,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-beta.1", KubeVersion: "v1.10.0-beta.1",
KubeadmVersion: "v1.10.0-beta.1", KubeadmVersion: "v1.10.0-beta.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -338,13 +338,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -338,13 +338,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-rc.1", KubeVersion: "v1.10.0-rc.1",
KubeadmVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -372,13 +372,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -372,13 +372,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.6-rc.1", KubeVersion: "v1.10.6-rc.1",
KubeadmVersion: "v1.10.6-rc.1", KubeadmVersion: "v1.10.6-rc.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
...@@ -406,13 +406,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -406,13 +406,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-rc.1", KubeVersion: "v1.10.0-rc.1",
KubeadmVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
{ {
...@@ -424,13 +424,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -424,13 +424,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.11.0-alpha.2", KubeVersion: "v1.11.0-alpha.2",
KubeadmVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2",
DNSVersion: "1.14.8", DNSVersion: "1.14.8",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.12",
}, },
}, },
}, },
......
hack/lib/etcd.sh
View file @ e2a25f9b
...@@ -16,7 +16,7 @@ ...@@ -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.1.11} ETCD_VERSION=${ETCD_VERSION:-3.1.12}
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}
......
staging/src/k8s.io/apiextensions-apiserver/artifacts/example/rc.yaml
View file @ e2a25f9b
...@@ -23,4 +23,4 @@ spec: ...@@ -23,4 +23,4 @@ spec:
- "--etcd-servers=http://localhost:2379" - "--etcd-servers=http://localhost:2379"
- "--audit-log-path=-" - "--audit-log-path=-"
- name: etcd - name: etcd
image: quay.io/coreos/etcd:v3.1.11 image: quay.io/coreos/etcd:v3.1.12
staging/src/k8s.io/sample-apiserver/artifacts/example/rc.yaml
View file @ e2a25f9b
...@@ -21,4 +21,4 @@ spec: ...@@ -21,4 +21,4 @@ spec:
imagePullPolicy: Never imagePullPolicy: Never
command: [ "/kube-sample-apiserver", "--etcd-servers=http://localhost:2379" ] command: [ "/kube-sample-apiserver", "--etcd-servers=http://localhost:2379" ]
- name: etcd - name: etcd
image: quay.io/coreos/etcd:v3.1.11 image: quay.io/coreos/etcd:v3.1.12
test/e2e/apimachinery/aggregator.go
View file @ e2a25f9b
...@@ -133,7 +133,7 @@ func TestSampleAPIServer(f *framework.Framework, image string) { ...@@ -133,7 +133,7 @@ func TestSampleAPIServer(f *framework.Framework, image string) {
// kubectl create -f deploy.yaml // kubectl create -f deploy.yaml
deploymentName := "sample-apiserver-deployment" deploymentName := "sample-apiserver-deployment"
etcdImage := "quay.io/coreos/etcd:v3.1.11" etcdImage := "quay.io/coreos/etcd:v3.1.12"
podLabels := map[string]string{"app": "sample-apiserver", "apiserver": "true"} podLabels := map[string]string{"app": "sample-apiserver", "apiserver": "true"}
replicas := int32(1) replicas := int32(1)
zero := int64(0) zero := int64(0)
......
test/e2e/framework/nodes_util.go
View file @ e2a25f9b
...@@ -67,7 +67,7 @@ func etcdUpgradeGCE(target_storage, target_version string) error { ...@@ -67,7 +67,7 @@ func etcdUpgradeGCE(target_storage, target_version string) error {
os.Environ(), os.Environ(),
"TEST_ETCD_VERSION="+target_version, "TEST_ETCD_VERSION="+target_version,
"STORAGE_BACKEND="+target_storage, "STORAGE_BACKEND="+target_storage,
"TEST_ETCD_IMAGE=3.1.11") "TEST_ETCD_IMAGE=3.1.12")
_, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M") _, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M")
return err return err
...@@ -107,7 +107,7 @@ func masterUpgradeGCE(rawV string, enableKubeProxyDaemonSet bool) error { ...@@ -107,7 +107,7 @@ func masterUpgradeGCE(rawV string, enableKubeProxyDaemonSet bool) error {
env = append(env, env = append(env,
"TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion, "TEST_ETCD_VERSION="+TestContext.EtcdUpgradeVersion,
"STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage, "STORAGE_BACKEND="+TestContext.EtcdUpgradeStorage,
"TEST_ETCD_IMAGE=3.1.11") "TEST_ETCD_IMAGE=3.1.12")
} else { } else {
// In e2e tests, we skip the confirmation prompt about // In e2e tests, we skip the confirmation prompt about
// implicit etcd upgrades to simulate the user entering "y". // implicit etcd upgrades to simulate the user entering "y".
......
test/kubemark/start-kubemark.sh
View file @ e2a25f9b
...@@ -59,7 +59,7 @@ SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}" ...@@ -59,7 +59,7 @@ SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
EVENT_PD="${EVENT_PD:-}" EVENT_PD="${EVENT_PD:-}"
# Etcd related variables. # Etcd related variables.
ETCD_IMAGE="${ETCD_IMAGE:-3.1.11}" ETCD_IMAGE="${ETCD_IMAGE:-3.1.12}"
ETCD_VERSION="${ETCD_VERSION:-}" ETCD_VERSION="${ETCD_VERSION:-}"
# Controller-manager related variables. # Controller-manager related variables.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment