github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68898 from ixdy/fix-etcd-image-no-3.2.18

Browse Source 
Remove etcd 3.2.18 from the etcd image
This commit is contained in:
k8s-ci-robot 2018-09-20 14:56:25 -07:00 committed by GitHub
commit 337e0e18f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/etcd/Makefile
View File

@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [BUNDLED_ETCD_VERSIONS=2.2.1 2.3.7 3.0.17 3.1.12 3.2.18 3.2.24] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [BUNDLED_ETCD_VERSIONS=2.2.1 2.3.7 3.0.17 3.1.12 3.2.24] [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,7 +26,7 @@
# 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?=2.2.1 2.3.7 3.0.17 3.1.12 3.2.18 3.2.24 BUNDLED_ETCD_VERSIONS?=2.2.1 2.3.7 3.0.17 3.1.12 3.2.24
# LATEST_ETCD_VERSION identifies the most recent etcd version available. # LATEST_ETCD_VERSION identifies the most recent etcd version available.
LATEST_ETCD_VERSION?=3.2.24 LATEST_ETCD_VERSION?=3.2.24

7
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: '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.12', '3.2.18', '3.2.24') # TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.17', '3.1.12', '3.2.24')
# 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
@ -29,8 +29,7 @@
# - 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.12/etcd3 # - 3.0.17/etcd3 -> 3.1.12/etcd3
# - 3.1.12/etcd3 -> 3.2.18/etcd3 # - 3.1.12/etcd3 -> 3.2.24/etcd3
# - 3.2.18/etcd3 -> 3.2.24/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).
@ -43,7 +42,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="2.2.1, 2.3.7, 3.0.17, 3.1.12, 3.2.18 3.2.24" BUNDLED_VERSIONS="2.2.1, 2.3.7, 3.0.17, 3.1.12, 3.2.24"
ETCD_NAME="${ETCD_NAME:-etcd-$(hostname)}" ETCD_NAME="${ETCD_NAME:-etcd-$(hostname)}"
if [ -z "${DATA_DIRECTORY:-}" ]; then if [ -z "${DATA_DIRECTORY:-}" ]; then