Skip to content

Commit 1c7ebc4

Browse files
committed
Merge pull request kubernetes#13213 from mbforbes/removeMasterIpRange
Make MASTER_IP_RANGE master-only
2 parents b00c04c + 48801da commit 1c7ebc4

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

cluster/gce/coreos/helper.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ DNS_DOMAIN=${DNS_DOMAIN:-}
8888
KUBELET_TOKEN=${KUBELET_TOKEN:-}
8989
KUBE_PROXY_TOKEN=${KUBE_PROXY_TOKEN:-}
9090
ADMISSION_CONTROL=${ADMISSION_CONTROL:-}
91-
MASTER_IP_RANGE=${MASTER_IP_RANGE}
9291
KUBERNETES_MASTER_NAME=${MASTER_NAME}
9392
ZONE=${ZONE}
9493
EXTRA_DOCKER_OPTS=${EXTRA_DOCKER_OPTS:-}

cluster/gce/debian/helper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
5050
KUBELET_TOKEN: $(yaml-quote ${KUBELET_TOKEN:-})
5151
KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-})
5252
ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-})
53-
MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE})
5453
CA_CERT: $(yaml-quote ${CA_CERT_BASE64:-})
5554
KUBELET_CERT: $(yaml-quote ${KUBELET_CERT_BASE64:-})
5655
KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-})
@@ -73,6 +72,7 @@ KUBE_USER: $(yaml-quote ${KUBE_USER})
7372
KUBE_PASSWORD: $(yaml-quote ${KUBE_PASSWORD})
7473
KUBE_BEARER_TOKEN: $(yaml-quote ${KUBE_BEARER_TOKEN})
7574
MASTER_CERT: $(yaml-quote ${MASTER_CERT_BASE64:-})
75+
MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE})
7676
MASTER_KEY: $(yaml-quote ${MASTER_KEY_BASE64:-})
7777
KUBECFG_CERT: $(yaml-quote ${KUBECFG_CERT_BASE64:-})
7878
KUBECFG_KEY: $(yaml-quote ${KUBECFG_KEY_BASE64:-})

0 commit comments

Comments
 (0)