mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Update GCE to container-vm-v20150806
Also changes the node image to default to master image
This commit is contained in:
parent
2fa3004500
commit
5ea2bfaa1b
@ -28,10 +28,10 @@ MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
|
||||
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
|
||||
|
||||
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
|
||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150715}
|
||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806}
|
||||
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
|
||||
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150715}
|
||||
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers}
|
||||
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"}
|
||||
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
|
||||
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
|
||||
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}
|
||||
|
||||
|
@ -29,10 +29,10 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
|
||||
KUBE_APISERVER_REQUEST_TIMEOUT=300
|
||||
|
||||
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
|
||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150715}
|
||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806}
|
||||
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
|
||||
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150715}
|
||||
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers}
|
||||
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"}
|
||||
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
|
||||
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
|
||||
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user