Skip to content

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

Merge pull request #40113 from maisem/cos

Automatic merge from submit-queue Adding cos as an alias for gci. **What this PR does / why we need it**: Adding COS as an alias for GCI. cc: @adityakali @wonderfly
parents c1ecedf4 52b6c9bb
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 0 deletions
cluster/gce/config-default.sh
View file @ 29e2d8be
...@@ -46,6 +46,14 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "coreos" ]]; then ...@@ -46,6 +46,14 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "coreos" ]]; then
NODE_OS_DISTRIBUTION="container-linux" NODE_OS_DISTRIBUTION="container-linux"
fi fi
if [[ "${MASTER_OS_DISTRIBUTION}" == "cos" ]]; then
MASTER_OS_DISTRIBUTION="gci"
fi
if [[ "${NODE_OS_DISTRIBUTION}" == "cos" ]]; then
NODE_OS_DISTRIBUTION="gci"
fi
# 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. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
......
cluster/gce/config-test.sh
View file @ 29e2d8be
...@@ -47,6 +47,14 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "coreos" ]]; then ...@@ -47,6 +47,14 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "coreos" ]]; then
NODE_OS_DISTRIBUTION="container-linux" NODE_OS_DISTRIBUTION="container-linux"
fi fi
if [[ "${MASTER_OS_DISTRIBUTION}" == "cos" ]]; then
MASTER_OS_DISTRIBUTION="gci"
fi
if [[ "${NODE_OS_DISTRIBUTION}" == "cos" ]]; then
NODE_OS_DISTRIBUTION="gci"
fi
# 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. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
......
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