Skip to content

K
k3s
Commit 85e43bad authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46721 from mikedanese/fooloo

Automatic merge from submit-queue (batch tested with PRs 41563, 45251, 46265, 46462, 46721) change kubemark image project to match new cos image project The old project is not available anymore. https://github.com/kubernetes/kubernetes/pull/45136
parents 0d4fda77 c8e84faa
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/kubemark/gce/config-default.sh
View file @ 85e43bad
...@@ -37,7 +37,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} ...@@ -37,7 +37,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian} NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-beta-59-9460-20-0} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-beta-59-9460-20-0}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NETWORK=${KUBE_GCE_NETWORK:-default} NETWORK=${KUBE_GCE_NETWORK:-default}
INSTANCE_PREFIX="${INSTANCE_PREFIX:-"default"}" INSTANCE_PREFIX="${INSTANCE_PREFIX:-"default"}"
......
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