Skip to content

K
k3s
Commit b3ab7d8d authored by Abhi Shah's avatar Abhi Shah
Browse files
Options

Merge pull request #9693 from zmerlynn/testing_container_vm

Update GCE/debian to container-vm-v20150611
parents 09a06448 c0317082
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/gce/config-default.sh
View file @ b3ab7d8d
...@@ -27,9 +27,9 @@ MINION_DISK_TYPE=pd-standard ...@@ -27,9 +27,9 @@ MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150505} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150611}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150505} MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150611}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}
......
cluster/gce/config-test.sh
View file @ b3ab7d8d
...@@ -28,9 +28,9 @@ MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} ...@@ -28,9 +28,9 @@ MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB}
KUBE_APISERVER_REQUEST_TIMEOUT=300 KUBE_APISERVER_REQUEST_TIMEOUT=300
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150505} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150611}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150505} MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-container-vm-v20150611}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5} RKT_VERSION=${KUBE_RKT_VERSION:-0.5.5}
......
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