diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 13bf2af4296..fe68c3816ab 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -180,6 +180,7 @@ ENABLE_METADATA_AGENT="${KUBE_ENABLE_METADATA_AGENT:-none}" # Useful for scheduling heapster in large clusters with nodes of small size. HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}" +MASTER_NODE_LABELS="${KUBE_MASTER_NODE_LABELS:-}" # NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes. NON_MASTER_NODE_LABELS="${KUBE_NON_MASTER_NODE_LABELS:-}" WINDOWS_NON_MASTER_NODE_LABELS="${WINDOWS_NON_MASTER_NODE_LABELS:-}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index eaafa514abe..7950767c069 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -223,6 +223,7 @@ CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS:-} ${TEST_CLUSTER_R SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}" KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}" +MASTER_NODE_LABELS="${KUBE_MASTER_NODE_LABELS:-}" # NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes. NON_MASTER_NODE_LABELS="${KUBE_NON_MASTER_NODE_LABELS:-}" WINDOWS_NON_MASTER_NODE_LABELS="${WINDOWS_NON_MASTER_NODE_LABELS:-}" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index a8d36f53e57..01140aeecd2 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -619,6 +619,9 @@ function build-linux-node-labels { if [[ -n "${NON_MASTER_NODE_LABELS:-}" && "${master}" != "true" ]]; then node_labels="${node_labels:+${node_labels},}${NON_MASTER_NODE_LABELS}" fi + if [[ -n "${MASTER_NODE_LABELS:-}" && "${master}" == "true" ]]; then + node_labels="${node_labels:+${node_labels},}${MASTER_NODE_LABELS}" + fi echo $node_labels }