mirror of https://github.com/k3s-io/k3s
Update clusters to use 3.0.17 etcd
parent
a7d2136ce1
commit
b70e392161
|
@ -110,7 +110,7 @@ ENABLE_L7_LOADBALANCING="${KUBE_ENABLE_L7_LOADBALANCING:-glbc}"
|
|||
# standalone - Heapster only. Metrics available via Heapster REST API.
|
||||
ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}"
|
||||
|
||||
# Set etcd image (e.g. 3.0.14-experimental.1) version (e.g. 3.0.14) if you need
|
||||
# Set etcd image (e.g. 3.0.17-alpha.1) and version (e.g. 3.0.17) if you need
|
||||
# non-default version.
|
||||
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
|
||||
ETCD_VERSION="${TEST_ETCD_VERSION:-}"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
# Build the etcd image
|
||||
#
|
||||
# Usage:
|
||||
# [TAGS=2.2.1 2.3.7 3.0.14] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
|
||||
# [TAGS=2.2.1 2.3.7 3.0.17] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
|
||||
|
||||
# The image contains different etcd versions to simplify
|
||||
# upgrades. Thus be careful when removing any tag from here.
|
||||
|
@ -26,8 +26,8 @@
|
|||
# Except from etcd-$(tag) and etcdctl-$(tag) binaries, we also
|
||||
# need etcd and etcdctl binaries for backward compatibility reasons.
|
||||
# That binary will be set to the last tag from $(TAGS).
|
||||
TAGS?=2.2.1 2.3.7 3.0.14
|
||||
REGISTRY_TAG?=3.0.14
|
||||
TAGS?=2.2.1 2.3.7 3.0.17
|
||||
REGISTRY_TAG?=3.0.17
|
||||
ARCH?=amd64
|
||||
REGISTRY?=gcr.io/google_containers
|
||||
GOLANG_VERSION?=1.7.5
|
||||
|
|
|
@ -49,7 +49,7 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.240.0.0/11}"
|
|||
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
|
||||
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
|
||||
|
||||
# Set etcd image (e.g. 3.0.14-experimental.1) version (e.g. 3.0.14) if you need
|
||||
# Set etcd image (e.g. 3.0.17-alpha.1) and version (e.g. 3.0.17) if you need
|
||||
# non-default version.
|
||||
ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
|
||||
ETCD_VERSION="${TEST_ETCD_VERSION:-}"
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
"containers":[
|
||||
{
|
||||
"name": "etcd-container",
|
||||
"image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.14-alpha.1') }}",
|
||||
"image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.17-alpha.1') }}",
|
||||
"resources": {
|
||||
"requests": {
|
||||
"cpu": {{ cpulimit }}
|
||||
|
@ -52,7 +52,7 @@
|
|||
"value": "{{ pillar.get('storage_backend', 'etcd3') }}"
|
||||
},
|
||||
{ "name": "TARGET_VERSION",
|
||||
"value": "{{ pillar.get('etcd_version', '3.0.14') }}"
|
||||
"value": "{{ pillar.get('etcd_version', '3.0.17') }}"
|
||||
},
|
||||
{ "name": "DATA_DIRECTORY",
|
||||
"value": "/var/etcd/data{{ suffix }}"
|
||||
|
|
|
@ -43,7 +43,7 @@ spec:
|
|||
mountPath: /srv/kubernetes/
|
||||
readOnly: true
|
||||
- name: etcd
|
||||
image: gcr.io/google_containers/etcd:3.0.14-alpha.1
|
||||
image: gcr.io/google_containers/etcd:3.0.17-alpha.1
|
||||
command:
|
||||
- /usr/local/bin/etcd
|
||||
- --data-dir
|
||||
|
|
|
@ -622,7 +622,7 @@ func createAPIServer(clientset *client.Clientset, namespace, name, image, creden
|
|||
},
|
||||
{
|
||||
Name: "etcd",
|
||||
Image: "gcr.io/google_containers/etcd:3.0.14-alpha.1",
|
||||
Image: "gcr.io/google_containers/etcd:3.0.17-alpha.1",
|
||||
Command: []string{
|
||||
"/usr/local/bin/etcd",
|
||||
"--data-dir",
|
||||
|
|
|
@ -830,7 +830,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na
|
|||
},
|
||||
{
|
||||
Name: "etcd",
|
||||
Image: "gcr.io/google_containers/etcd:3.0.14-alpha.1",
|
||||
Image: "gcr.io/google_containers/etcd:3.0.17-alpha.1",
|
||||
Command: []string{
|
||||
"/usr/local/bin/etcd",
|
||||
"--data-dir",
|
||||
|
|
|
@ -159,7 +159,7 @@ killApiServer
|
|||
|
||||
kube::etcd::stop
|
||||
TARGET_STORAGE="etcd3" \
|
||||
TARGET_VERSION="3.0.14" \
|
||||
TARGET_VERSION="3.0.17" \
|
||||
DATA_DIRECTORY="${ETCD_DIR}" \
|
||||
ETCD=$(which etcd) \
|
||||
ETCDCTL=$(which etcdctl) \
|
||||
|
|
|
@ -50,7 +50,7 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
|
|||
SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
|
||||
|
||||
# Etcd related variables.
|
||||
ETCD_IMAGE="${ETCD_IMAGE:-3.0.14-alpha.1}"
|
||||
ETCD_IMAGE="${ETCD_IMAGE:-3.0.17-alpha.1}"
|
||||
ETCD_VERSION="${ETCD_VERSION:-}"
|
||||
|
||||
# Controller-manager related variables.
|
||||
|
|
Loading…
Reference in New Issue