github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #51827 from bowei/2ndary-range-name 

Automatic merge from submit-queue (batch tested with PRs 51682, 51546, 51369, 50924, 51827)

Add `secondary-range-name` to the gce.conf

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-09-03 15:54:25 -07:00 committed by GitHub
parent f9a82dd3b7 1aeebcf6d3
commit 53ee4397e7
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/container-linux/configure-helper.sh
View File

@ -234,6 +234,12 @@ EOF
use_cloud_config="true"
cat <<EOF >>/etc/gce.conf
alpha-features = ${GCE_ALPHA_FEATURES}
EOF
fi
if [[ -n "${SECONDARY_RANGE_NAME:-}" ]]; then
use_cloud_config="true"
cat <<EOF >> /etc/gce.conf
secondary-range-name = ${SECONDARY-RANGE-NAME}
EOF
fi
if [[ "${use_cloud_config}" != "true" ]]; then

6
cluster/gce/gci/configure-helper.sh
View File

@ -394,6 +394,12 @@ EOF
use_cloud_config="true"
cat <<EOF >>/etc/gce.conf
alpha-features = ${GCE_ALPHA_FEATURES}
EOF
fi
if [[ -n "${SECONDARY_RANGE_NAME:-}" ]]; then
use_cloud_config="true"
cat <<EOF >> /etc/gce.conf
secondary-range-name = ${SECONDARY-RANGE-NAME}
EOF
fi
if [[ "${use_cloud_config}" != "true" ]]; then