github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Allow missing NETWORK_PROJECT_ID env var

Browse Source
This commit is contained in:
Nick Sardo
2017-07-10 14:26:47 -07:00
parent 0744964956
commit ebce7d2497
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,15 +224,24 @@ function create-master-auth {
cat <<EOF >/etc/gce.conf cat <<EOF >/etc/gce.conf
[global] [global]
EOF EOF
if [[ -n "${GCE_API_ENDPOINT:-}" ]]; then
cat <<EOF >>/etc/gce.conf
api-endpoint = ${GCE_API_ENDPOINT}
EOF
fi
if [[ -n "${PROJECT_ID:-}" && -n "${TOKEN_URL:-}" && -n "${TOKEN_BODY:-}" && -n "${NODE_NETWORK:-}" ]]; then if [[ -n "${PROJECT_ID:-}" && -n "${TOKEN_URL:-}" && -n "${TOKEN_BODY:-}" && -n "${NODE_NETWORK:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
token-url = ${TOKEN_URL} token-url = ${TOKEN_URL}
token-body = ${TOKEN_BODY} token-body = ${TOKEN_BODY}
project-id = ${PROJECT_ID} project-id = ${PROJECT_ID}
network-project-id = ${NETWORK_PROJECT_ID}
network-name = ${NODE_NETWORK} network-name = ${NODE_NETWORK}
EOF EOF
if [[ -n "${NETWORK_PROJECT_ID:-}" ]]; then
cat <<EOF >>/etc/gce.conf
network-project-id = ${NETWORK_PROJECT_ID}
EOF
fi
if [[ -n "${NODE_SUBNETWORK:-}" ]]; then if [[ -n "${NODE_SUBNETWORK:-}" ]]; then
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
subnetwork-name = ${NODE_SUBNETWORK} subnetwork-name = ${NODE_SUBNETWORK}

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

@@ -390,9 +390,13 @@ EOF
token-url = ${TOKEN_URL} token-url = ${TOKEN_URL}
token-body = ${TOKEN_BODY} token-body = ${TOKEN_BODY}
project-id = ${PROJECT_ID} project-id = ${PROJECT_ID}
network-project-id = ${NETWORK_PROJECT_ID}
network-name = ${NODE_NETWORK} network-name = ${NODE_NETWORK}
EOF EOF
if [[ -n "${NETWORK_PROJECT_ID:-}" ]]; then
cat <<EOF >>/etc/gce.conf
network-project-id = ${NETWORK_PROJECT_ID}
EOF
fi
if [[ -n "${NODE_SUBNETWORK:-}" ]]; then if [[ -n "${NODE_SUBNETWORK:-}" ]]; then
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
subnetwork-name = ${NODE_SUBNETWORK} subnetwork-name = ${NODE_SUBNETWORK}