github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56861 from freehan/fix-gce-config-array

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix gce.conf multi-value parameter processing

fixes: https://github.com/kubernetes/kubernetes/issues/56833

alternative to: https://github.com/kubernetes/kubernetes/pull/56857


```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-12-05 16:45:14 -08:00 committed by GitHub
commit 64ed037e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,14 +215,19 @@ EOF
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
if [[ -n "${NODE_TAGS:-}" ]]; then if [[ -n "${NODE_TAGS:-}" ]]; then
local -r node_tags="${NODE_TAGS}" # split NODE_TAGS into an array by comma.
IFS=',' read -r -a node_tags <<< ${NODE_TAGS}
else else
local -r node_tags="${NODE_INSTANCE_PREFIX}" local -r node_tags="${NODE_INSTANCE_PREFIX}"
fi fi
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
node-tags = ${node_tags}
node-instance-prefix = ${NODE_INSTANCE_PREFIX} node-instance-prefix = ${NODE_INSTANCE_PREFIX}
EOF EOF
for tag in ${node_tags[@]}; do
cat <<EOF >>/etc/gce.conf
node-tags = ${tag}
EOF
done
fi fi
if [[ -n "${MULTIZONE:-}" ]]; then if [[ -n "${MULTIZONE:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
@ -232,9 +237,13 @@ EOF
fi fi
if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
# split GCE_ALPHA_FEATURES into an array by comma.
IFS=',' read -r -a alpha_features <<< ${GCE_ALPHA_FEATURES}
for feature in ${alpha_features[@]}; do
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
alpha-features = ${GCE_ALPHA_FEATURES} alpha-features = ${feature}
EOF EOF
done
fi fi
if [[ -n "${SECONDARY_RANGE_NAME:-}" ]]; then if [[ -n "${SECONDARY_RANGE_NAME:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"

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

@ -583,14 +583,19 @@ EOF
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
if [[ -n "${NODE_TAGS:-}" ]]; then if [[ -n "${NODE_TAGS:-}" ]]; then
local -r node_tags="${NODE_TAGS}" # split NODE_TAGS into an array by comma.
IFS=',' read -r -a node_tags <<< ${NODE_TAGS}
else else
local -r node_tags="${NODE_INSTANCE_PREFIX}" local -r node_tags="${NODE_INSTANCE_PREFIX}"
fi fi
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
node-tags = ${node_tags}
node-instance-prefix = ${NODE_INSTANCE_PREFIX} node-instance-prefix = ${NODE_INSTANCE_PREFIX}
EOF EOF
for tag in ${node_tags[@]}; do
cat <<EOF >>/etc/gce.conf
node-tags = ${tag}
EOF
done
fi fi
if [[ -n "${MULTIZONE:-}" ]]; then if [[ -n "${MULTIZONE:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
@ -600,9 +605,13 @@ EOF
fi fi
if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"
# split GCE_ALPHA_FEATURES into an array by comma.
IFS=',' read -r -a alpha_features <<< ${GCE_ALPHA_FEATURES}
for feature in ${alpha_features[@]}; do
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
alpha-features = ${GCE_ALPHA_FEATURES} alpha-features = ${feature}
EOF EOF
done
fi fi
if [[ -n "${SECONDARY_RANGE_NAME:-}" ]]; then if [[ -n "${SECONDARY_RANGE_NAME:-}" ]]; then
use_cloud_config="true" use_cloud_config="true"

3
pkg/cloudprovider/providers/gce/gce.go
View File

@ -149,6 +149,7 @@ type GCECloud struct {
AlphaFeatureGate *AlphaFeatureGate AlphaFeatureGate *AlphaFeatureGate
} }
// TODO: replace gcfg with json
type ConfigGlobal struct { type ConfigGlobal struct {
TokenURL string `gcfg:"token-url"` TokenURL string `gcfg:"token-url"`
TokenBody string `gcfg:"token-body"` TokenBody string `gcfg:"token-body"`
@ -173,7 +174,7 @@ type ConfigGlobal struct {
// located in (i.e. where the controller will be running). If this is // located in (i.e. where the controller will be running). If this is
// blank, then the local zone will be discovered via the metadata server. // blank, then the local zone will be discovered via the metadata server.
LocalZone string `gcfg:"local-zone"` LocalZone string `gcfg:"local-zone"`
// Possible values: List of api names separated by comma. Default to none. // Default to none.
// For example: MyFeatureFlag // For example: MyFeatureFlag
AlphaFeatures []string `gcfg:"alpha-features"` AlphaFeatures []string `gcfg:"alpha-features"`
} }