mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Update etcd* version to use latest released images.
This commit is contained in:
parent
21bec91e89
commit
1f0f050fde
@ -175,7 +175,7 @@ ENABLE_METADATA_AGENT="${KUBE_ENABLE_METADATA_AGENT:-none}"
|
|||||||
# 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.3.10-0) if you need
|
# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.3.10-1) 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:-}"
|
||||||
|
@ -14,4 +14,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.10.0
|
image: k8s.gcr.io/etcd-empty-dir-cleanup:3.3.10.1
|
||||||
|
@ -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.10-0') }}",
|
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.3.10-1') }}",
|
||||||
"resources": {
|
"resources": {
|
||||||
"requests": {
|
"requests": {
|
||||||
"cpu": {{ cpulimit }}
|
"cpu": {{ cpulimit }}
|
||||||
|
@ -161,7 +161,7 @@ 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.10-0
|
export ETCD_IMAGE=3.3.10-1
|
||||||
export ETCD_VERSION=3.3.10
|
export ETCD_VERSION=3.3.10
|
||||||
|
|
||||||
# Upgrade master with updated kube envs
|
# Upgrade master with updated kube envs
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
ARCH:=amd64
|
ARCH:=amd64
|
||||||
GOLANG_VERSION?=1.8.3
|
GOLANG_VERSION?=1.8.3
|
||||||
REGISTRY?=staging-k8s.gcr.io
|
REGISTRY?=staging-k8s.gcr.io
|
||||||
TAG?=0.1.2
|
TAG?=0.1.3
|
||||||
IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
|
IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
|
||||||
CURRENT_DIR:=$(pwd)
|
CURRENT_DIR:=$(pwd)
|
||||||
TEMP_DIR:=$(shell mktemp -d)
|
TEMP_DIR:=$(shell mktemp -d)
|
||||||
|
@ -7,7 +7,7 @@ spec:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: etcd-version-monitor
|
- name: etcd-version-monitor
|
||||||
image: k8s.gcr.io/etcd-version-monitor:0.1.2
|
image: k8s.gcr.io/etcd-version-monitor:0.1.3
|
||||||
command:
|
command:
|
||||||
- /etcd-version-monitor
|
- /etcd-version-monitor
|
||||||
- --logtostderr
|
- --logtostderr
|
||||||
|
@ -34,7 +34,7 @@ LATEST_ETCD_VERSION?=3.3.10
|
|||||||
# 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
|
||||||
# for each revision of this image at that etcd version.
|
# for each revision of this image at that etcd version.
|
||||||
REVISION?=0
|
REVISION?=1
|
||||||
|
|
||||||
# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
|
# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
|
||||||
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
|
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
|
||||||
|
@ -60,7 +60,7 @@ func etcdUpgradeGCE(targetStorage, targetVersion string) error {
|
|||||||
os.Environ(),
|
os.Environ(),
|
||||||
"TEST_ETCD_VERSION="+targetVersion,
|
"TEST_ETCD_VERSION="+targetVersion,
|
||||||
"STORAGE_BACKEND="+targetStorage,
|
"STORAGE_BACKEND="+targetStorage,
|
||||||
"TEST_ETCD_IMAGE=3.3.10-0")
|
"TEST_ETCD_IMAGE=3.3.10-1")
|
||||||
|
|
||||||
_, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M")
|
_, _, err := RunCmdEnv(env, gceUpgradeScript(), "-l", "-M")
|
||||||
return err
|
return err
|
||||||
@ -80,7 +80,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.3.10-0")
|
"TEST_ETCD_IMAGE=3.3.10-1")
|
||||||
} 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".
|
||||||
|
@ -64,7 +64,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.3.10-0}"
|
ETCD_IMAGE="${ETCD_IMAGE:-3.3.10-1}"
|
||||||
ETCD_VERSION="${ETCD_VERSION:-}"
|
ETCD_VERSION="${ETCD_VERSION:-}"
|
||||||
|
|
||||||
# Controller-manager related variables.
|
# Controller-manager related variables.
|
||||||
|
Loading…
Reference in New Issue
Block a user