Skip to content

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

Merge pull request #48735 from nicksardo/gce-empty-network-proj

Automatic merge from submit-queue (batch tested with PRs 48698, 48712, 48516, 48734, 48735) GCE: Allow empty NETWORK_PROJECT_ID env var Changes: 1. Adds `GCE_API_ENDPOINT` logic to container-linux as it was added to GCI in #47881. 1. Apply `NETWORK_PROJECT_ID` value to gce.conf only if the env var is set. /sig network /area platform/gce **Release note**: ```release-note NONE ```
parents 0e461035 ebce7d24
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 2 deletions
cluster/gce/container-linux/configure-helper.sh
View file @ 787f5e0f
...@@ -224,15 +224,24 @@ function create-master-auth { ...@@ -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}
......
cluster/gce/gci/configure-helper.sh
View file @ 787f5e0f
...@@ -390,9 +390,13 @@ EOF ...@@ -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}
......
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