Skip to content

K
k3s
Commit 3acf04dd authored by Dawn Chen's avatar Dawn Chen
Browse files
Options

Merge pull request #26851 from zmerlynn/container-v1-3-v20160604

Bump GCE debian image to container-v1-3-v20160604
parents b6b079b1 20408cad
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/gce/config-default.sh
View file @ 3acf04dd
...@@ -40,7 +40,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci} ...@@ -40,7 +40,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci}
# By default a cluster will be started with the master on GCI and nodes on # By default a cluster will be started with the master on GCI and nodes on
# containervm. If you are updating the containervm version, update this # containervm. If you are updating the containervm version, update this
# variable. # variable.
CVM_VERSION=container-v1-3-v20160517 CVM_VERSION=container-v1-3-v20160604
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
......
cluster/gce/config-test.sh
View file @ 3acf04dd
...@@ -41,7 +41,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci} ...@@ -41,7 +41,7 @@ OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-gci}
# By default a cluster will be started with the master on GCI and nodes on # By default a cluster will be started with the master on GCI and nodes on
# containervm. If you are updating the containervm version, update this # containervm. If you are updating the containervm version, update this
# variable. # variable.
CVM_VERSION=container-v1-3-v20160517 CVM_VERSION=container-v1-3-v20160604
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
......
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