Skip to content

Commit ac3cc3c

Browse files
thockinthockin
committed
Rename PORTAL_NET all over
1 parent 3005471 commit ac3cc3c

33 files changed

+48
-47
lines changed

‎cluster/aws/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ MINION_TAG="${INSTANCE_PREFIX}-minion"
4141
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
4242
MINION_SCOPES=""
4343
POLL_SLEEP_INTERVAL=3
44-
PORTAL_NET="10.0.0.0/16"
44+
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
4545
MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
4646
# If set to Elastic IP, master instance will be associated with this IP.
4747
# If set to auto, a new Elastic IP will be aquired

‎cluster/aws/config-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ MINION_TAG="${INSTANCE_PREFIX}-minion"
3737
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
3838
MINION_SCOPES=""
3939
POLL_SLEEP_INTERVAL=3
40-
PORTAL_NET="10.0.0.0/16"
40+
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
4141
MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
4242
# If set to Elastic IP, master instance will be associated with this IP.
4343
# If set to auto, a new Elastic IP will be aquired

‎cluster/aws/templates/create-dynamic-salt-files.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mkdir -p /srv/salt-overlay/pillar
2222
cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
2323
instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
2424
node_instance_prefix: '$(echo "$NODE_INSTANCE_PREFIX" | sed -e "s/'/''/g")'
25-
portal_net: '$(echo "$PORTAL_NET" | sed -e "s/'/''/g")'
25+
service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
2626
enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")'
2727
enable_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")'
2828
enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")'

‎cluster/aws/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function kube-up {
507507
echo "readonly ZONE='${ZONE}'"
508508
echo "readonly KUBE_USER='${KUBE_USER}'"
509509
echo "readonly KUBE_PASSWORD='${KUBE_PASSWORD}'"
510-
echo "readonly PORTAL_NET='${PORTAL_NET}'"
510+
echo "readonly SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'"
511511
echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-false}'"
512512
echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'"
513513
echo "readonly ENABLE_CLUSTER_LOGGING='${ENABLE_CLUSTER_LOGGING:-false}'"

‎cluster/azure/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
3535
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
3636
MINION_SCOPES=""
3737

38-
PORTAL_NET="10.250.0.0/16"
38+
SERVICE_CLUSTER_IP_RANGE="10.250.0.0/16" # formerly PORTAL_NET
3939

4040
# Optional: Install node logging
4141
ENABLE_NODE_LOGGING=false

‎cluster/azure/templates/create-dynamic-salt-files.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mkdir -p /srv/salt-overlay/pillar
2222
cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
2323
instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
2424
node_instance_prefix: $NODE_INSTANCE_PREFIX
25-
portal_net: $PORTAL_NET
25+
service_cluster_ip_range: $SERVICE_CLUSTER_IP_RANGE
2626
admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
2727
EOF
2828

‎cluster/azure/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ function kube-up {
322322
echo "readonly SERVER_BINARY_TAR_URL='${SERVER_BINARY_TAR_URL}'"
323323
echo "readonly SALT_TAR_URL='${SALT_TAR_URL}'"
324324
echo "readonly MASTER_HTPASSWD='${htpasswd}'"
325-
echo "readonly PORTAL_NET='${PORTAL_NET}'"
325+
echo "readonly SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'"
326326
echo "readonly ADMISSION_CONTROL='${ADMISSION_CONTROL:-}'"
327327
grep -v "^#" "${KUBE_ROOT}/cluster/azure/templates/common.sh"
328328
grep -v "^#" "${KUBE_ROOT}/cluster/azure/templates/create-dynamic-salt-files.sh"

‎cluster/gce/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}"
4444
MINION_SCOPES=("storage-ro" "compute-rw" "https://www.googleapis.com/auth/monitoring" "https://www.googleapis.com/auth/logging.write")
4545
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
4646
POLL_SLEEP_INTERVAL=3
47-
PORTAL_NET="10.0.0.0/16"
47+
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
4848
ALLOCATE_NODE_CIDRS=true
4949

5050
# When set to true, Docker Cache is enabled by default as part of the cluster bring up.

‎cluster/gce/config-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
4444
MINION_SCOPES=("storage-ro" "compute-rw" "https://www.googleapis.com/auth/logging.write" "https://www.googleapis.com/auth/monitoring")
4545
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
4646
POLL_SLEEP_INTERVAL=3
47-
PORTAL_NET="10.0.0.0/16"
47+
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
4848

4949
# When set to true, Docker Cache is enabled by default as part of the cluster bring up.
5050
ENABLE_DOCKER_REGISTRY_CACHE=true

‎cluster/gce/configure-vm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
250250
node_instance_prefix: '$(echo "$NODE_INSTANCE_PREFIX" | sed -e "s/'/''/g")'
251251
cluster_cidr: '$(echo "$CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
252252
allocate_node_cidrs: '$(echo "$ALLOCATE_NODE_CIDRS" | sed -e "s/'/''/g")'
253-
portal_net: '$(echo "$PORTAL_NET" | sed -e "s/'/''/g")'
253+
service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
254254
enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")'
255255
enable_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")'
256256
enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")'

‎cluster/gce/coreos/helper.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ NODE_INSTANCE_PREFIX: $(yaml-quote ${NODE_INSTANCE_PREFIX})
3131
CLUSTER_IP_RANGE: $(yaml-quote ${CLUSTER_IP_RANGE:-10.244.0.0/16})
3232
SERVER_BINARY_TAR_URL: $(yaml-quote ${SERVER_BINARY_TAR_URL})
3333
SALT_TAR_URL: $(yaml-quote ${SALT_TAR_URL})
34-
PORTAL_NET: $(yaml-quote ${PORTAL_NET})
34+
SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE})
3535
ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false})
3636
ENABLE_CLUSTER_MONITORING: $(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none})
3737
ENABLE_NODE_MONITORING: $(yaml-quote ${ENABLE_NODE_MONITORING:-false})
@@ -64,7 +64,7 @@ ENV_TIMESTAMP=$(yaml-quote $(date -u +%Y-%m-%dT%T%z))
6464
INSTANCE_PREFIX=$(yaml-quote ${INSTANCE_PREFIX})
6565
NODE_INSTANCE_PREFIX=$(yaml-quote ${NODE_INSTANCE_PREFIX})
6666
SERVER_BINARY_TAR_URL=$(yaml-quote ${SERVER_BINARY_TAR_URL})
67-
PORTAL_NET=$(yaml-quote ${PORTAL_NET})
67+
SERVICE_CLUSTER_IP_RANGE=$(yaml-quote ${SERVICE_CLUSTER_IP_RANGE})
6868
ENABLE_CLUSTER_MONITORING=$(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none})
6969
ENABLE_NODE_MONITORING=$(yaml-quote ${ENABLE_NODE_MONITORING:-false})
7070
ENABLE_CLUSTER_LOGGING=$(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false})

‎cluster/gce/debian/helper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ NODE_INSTANCE_PREFIX: $(yaml-quote ${NODE_INSTANCE_PREFIX})
2929
CLUSTER_IP_RANGE: $(yaml-quote ${CLUSTER_IP_RANGE:-10.244.0.0/16})
3030
SERVER_BINARY_TAR_URL: $(yaml-quote ${SERVER_BINARY_TAR_URL})
3131
SALT_TAR_URL: $(yaml-quote ${SALT_TAR_URL})
32-
PORTAL_NET: $(yaml-quote ${PORTAL_NET})
32+
SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE})
3333
ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false})
3434
ENABLE_CLUSTER_MONITORING: $(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none})
3535
ENABLE_NODE_MONITORING: $(yaml-quote ${ENABLE_NODE_MONITORING:-false})

‎cluster/libvirt-coreos/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for ((i=0; i < NUM_MINIONS; i++)) do
4646
done
4747
MINION_CONTAINER_SUBNETS[$NUM_MINIONS]=$MASTER_CONTAINER_SUBNET
4848

49-
PORTAL_NET=10.11.0.0/16
49+
SERVICE_CLUSTER_IP_RANGE=10.11.0.0/16 # formerly PORTAL_NET
5050

5151
# Optional: Install node monitoring.
5252
ENABLE_NODE_MONITORING=true

‎cluster/libvirt-coreos/user_data_master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ coreos:
1818
--port=8080 \
1919
--etcd_servers=http://127.0.0.1:4001 \
2020
--kubelet_port=10250 \
21-
--service-cluster-ip-range=${PORTAL_NET}
21+
--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}
2222
Restart=always
2323
RestartSec=2
2424

‎cluster/rackspace/cloud-config/master-cloud-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ coreos:
9393
--etcd_servers=http://127.0.0.1:4001 \
9494
--logtostderr=true \
9595
--port=8080 \
96-
--service-cluster-ip-range=PORTAL_NET \
96+
--service-cluster-ip-range=SERVICE_CLUSTER_IP_RANGE \
9797
--token-auth-file=/var/lib/kube-apiserver/known_tokens.csv \
9898
--v=2
9999
Restart=always

‎cluster/rackspace/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RAX_NUM_MINIONS="${RAX_NUM_MINIONS-4}"
3636
MINION_TAG="tags=${INSTANCE_PREFIX}-minion"
3737
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${RAX_NUM_MINIONS}}))
3838
KUBE_NETWORK="10.240.0.0/16"
39-
PORTAL_NET="10.0.0.0/16"
39+
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
4040

4141
# Optional: Install node monitoring.
4242
ENABLE_NODE_MONITORING=true

‎cluster/rackspace/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ rax-boot-master() {
164164
-e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\\&}|" \
165165
-e "s|KUBE_USER|${KUBE_USER}|" \
166166
-e "s|KUBE_PASSWORD|${KUBE_PASSWORD}|" \
167-
-e "s|PORTAL_NET|${PORTAL_NET}|" \
167+
-e "s|SERVICE_CLUSTER_IP_RANGE|${SERVICE_CLUSTER_IP_RANGE}|" \
168168
-e "s|OS_AUTH_URL|${OS_AUTH_URL}|" \
169169
-e "s|OS_USERNAME|${OS_USERNAME}|" \
170170
-e "s|OS_PASSWORD|${OS_PASSWORD}|" \

‎cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636

3737
{% set etcd_servers = "--etcd_servers=http://127.0.0.1:4001" -%}
3838

39-
{% set portal_net = "" -%}
40-
{% if pillar['portal_net'] is defined -%}
41-
{% set portal_net = "--service-cluster-ip-range=" + pillar['portal_net'] -%}
39+
{% set service_cluster_ip_range = "" -%}
40+
{% if pillar['service_cluster_ip_range'] is defined -%}
41+
{% set service_cluster_ip_range = "--service-cluster-ip-range=" + pillar['service_cluster_ip_range'] -%}
4242
{% endif -%}
4343

4444
{% set cert_file = "--tls_cert_file=/srv/kubernetes/server.cert" -%}
@@ -74,7 +74,7 @@
7474
{% set runtime_config = "--runtime_config=" + grains.runtime_config -%}
7575
{% endif -%}
7676

77-
{% set params = address + " " + etcd_servers + " " + cloud_provider + " " + cloud_config + " " + runtime_config + " " + admission_control + " " + portal_net + " " + client_ca_file + " " + basic_auth_file -%}
77+
{% set params = address + " " + etcd_servers + " " + cloud_provider + " " + cloud_config + " " + runtime_config + " " + admission_control + " " + service_cluster_ip_range + " " + client_ca_file + " " + basic_auth_file -%}
7878
{% set params = params + " " + cluster_name + " " + cert_file + " " + key_file + " --secure_port=" + secure_port + " " + token_auth_file + " " + publicAddressOverride + " " + pillar['log_level'] -%}
7979

8080

‎cluster/ubuntu/config-default.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ export roles=("ai" "i" "i")
2525
export NUM_MINIONS=${NUM_MINIONS:-3}
2626
# define the IP range used for service cluster IPs.
2727
# according to rfc 1918 ref: https://tools.ietf.org/html/rfc1918 choose a private ip range here.
28-
export PORTAL_NET=192.168.3.0/24
29-
# define the IP range used for flannel overlay network, should not conflict with above PORTAL_NET range
28+
export SERVICE_CLUSTER_IP_RANGE=192.168.3.0/24 # formerly PORTAL_NET
29+
# define the IP range used for flannel overlay network, should not conflict with above SERVICE_CLUSTER_IP_RANGE
3030
export FLANNEL_NET=172.16.0.0/16
3131

3232
# Admission Controllers to invoke prior to persisting objects in cluster
@@ -52,7 +52,7 @@ DOCKER_OPTS=""
5252

5353
# Optional: Install cluster DNS.
5454
ENABLE_CLUSTER_DNS=true
55-
# DNS_SERVER_IP must be a IP in PORTAL_NET range
55+
# DNS_SERVER_IP must be a IP in SERVICE_CLUSTER_IP_RANGE
5656
DNS_SERVER_IP="192.168.3.10"
5757
DNS_DOMAIN="cluster.local"
5858
DNS_REPLICAS=1

‎cluster/ubuntu/util.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ function provision-master() {
377377
ssh $SSH_OPTS -t $MASTER "source ~/kube/util.sh; \
378378
setClusterInfo; \
379379
create-etcd-opts "${mm[${MASTER_IP}]}" "${MASTER_IP}" "${CLUSTER}"; \
380-
create-kube-apiserver-opts "${PORTAL_NET}"; \
380+
create-kube-apiserver-opts "${SERVICE_CLUSTER_IP_RANGE}"; \
381381
create-kube-controller-manager-opts "${MINION_IPS}"; \
382382
create-kube-scheduler-opts; \
383383
sudo -p '[sudo] password to copy files and start master: ' cp ~/kube/default/* /etc/default/ && sudo cp ~/kube/init_conf/* /etc/init/ && sudo cp ~/kube/init_scripts/* /etc/init.d/ \
@@ -416,7 +416,7 @@ function provision-masterandminion() {
416416
ssh $SSH_OPTS -t $MASTER "source ~/kube/util.sh; \
417417
setClusterInfo; \
418418
create-etcd-opts "${mm[${MASTER_IP}]}" "${MASTER_IP}" "${CLUSTER}"; \
419-
create-kube-apiserver-opts "${PORTAL_NET}"; \
419+
create-kube-apiserver-opts "${SERVICE_CLUSTER_IP_RANGE}"; \
420420
create-kube-controller-manager-opts "${MINION_IPS}"; \
421421
create-kube-scheduler-opts; \
422422
create-kubelet-opts "${MASTER_IP}" "${MASTER_IP}" "${DNS_SERVER_IP}" "${DNS_DOMAIN}";

‎cluster/vagrant/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ for ((i=0; i < NUM_MINIONS; i++)) do
4343
VAGRANT_MINION_NAMES[$i]="minion-$((i+1))"
4444
done
4545

46-
PORTAL_NET=10.247.0.0/16
46+
SERVICE_CLUSTER_IP_RANGE=10.247.0.0/16 # formerly PORTAL_NET
4747

4848
# Since this isn't exposed on the network, default to a simple user/passwd
4949
MASTER_USER=vagrant

‎cluster/vagrant/provision-master.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ EOF
8585

8686
mkdir -p /srv/salt-overlay/pillar
8787
cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
88-
portal_net: '$(echo "$PORTAL_NET" | sed -e "s/'/''/g")'
88+
service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
8989
cert_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
9090
enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")'
9191
enable_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")'

‎cluster/vagrant/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function create-provision-scripts {
127127
echo "CONTAINER_ADDR='${MASTER_CONTAINER_ADDR}'"
128128
echo "MINION_CONTAINER_NETMASKS='${MINION_CONTAINER_NETMASKS[@]}'"
129129
echo "MINION_CONTAINER_SUBNETS=(${MINION_CONTAINER_SUBNETS[@]})"
130-
echo "PORTAL_NET='${PORTAL_NET}'"
130+
echo "SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'"
131131
echo "MASTER_USER='${MASTER_USER}'"
132132
echo "MASTER_PASSWD='${MASTER_PASSWD}'"
133133
echo "ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'"

‎cluster/vsphere/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
3131
MINION_MEMORY_MB=2048
3232
MINION_CPU=1
3333

34-
PORTAL_NET="10.244.240.0/20"
34+
SERVICE_CLUSTER_IP_RANGE="10.244.240.0/20" # formerly PORTAL_NET
3535

3636
# Optional: Install node monitoring.
3737
ENABLE_NODE_MONITORING=true

‎cluster/vsphere/config-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
3131
MINION_MEMORY_MB=1024
3232
MINION_CPU=1
3333

34-
PORTAL_NET="10.244.240.0/20"
34+
SERVICE_CLUSTER_IP_RANGE="10.244.240.0/20" # formerly PORTAL_NET

‎cluster/vsphere/templates/create-dynamic-salt-files.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mkdir -p /srv/salt-overlay/pillar
2222
cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
2323
instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
2424
node_instance_prefix: $NODE_INSTANCE_PREFIX
25-
portal_net: $PORTAL_NET
25+
service_cluster_ip_range: $SERVICE_CLUSTER_IP_RANGE
2626
enable_cluster_monitoring: $ENABLE_CLUSTER_MONITORING
2727
enable_node_monitoring: $ENABLE_NODE_MONITORING
2828
enable_cluster_logging: $ENABLE_CLUSTER_LOGGING

‎cluster/vsphere/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ function kube-up {
280280
echo "readonly MASTER_NAME='${MASTER_NAME}'"
281281
echo "readonly INSTANCE_PREFIX='${INSTANCE_PREFIX}'"
282282
echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'"
283-
echo "readonly PORTAL_NET='${PORTAL_NET}'"
283+
echo "readonly SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'"
284284
echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'"
285285
echo "readonly ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'"
286286
echo "readonly LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'"

‎docs/getting-started-guides/fedora/fedora_manual_config.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ systemctl stop iptables-services firewalld
6161

6262
**Configure the kubernetes services on the master.**
6363

64-
* Edit /etc/kubernetes/apiserver to appear as such. The portal_net IP addresses must be an unused block of addresses, not used anywhere else. They do not need to be routed or assigned to anything.
64+
* Edit /etc/kubernetes/apiserver to appear as such. The service_cluster_ip_range IP addresses must be an unused block of addresses, not used anywhere else. They do not need to be routed or assigned to anything.
6565

6666
```
6767
# The address on the local server to listen to.

‎docs/getting-started-guides/locally.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ firewall or other iptables-using systems, first.
9090
By default the IP range for service cluster IPs is 10.0.*.* - depending on your
9191
docker installation, this may conflict with IPs for containers. If you find
9292
containers running with IPs in this range, edit hack/local-cluster-up.sh and
93-
change the portal_net flag to something else.
93+
change the service-cluster-ip-range flag to something else.
9494

9595
#### I cannot create a replication controller with replica size greater than 1! What gives?
9696

‎docs/getting-started-guides/ubuntu.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export roles=("ai" "i" "i")
4848
4949
export NUM_MINIONS=${NUM_MINIONS:-3}
5050
51-
export PORTAL_NET=11.1.1.0/24
51+
export SERVICE_CLUSTER_IP_RANGE=11.1.1.0/24
5252
5353
export FLANNEL_NET=172.16.0.0/16
5454
@@ -61,15 +61,15 @@ Then the `roles ` variable defines the role of above machine in the same order,
6161

6262
The `NUM_MINIONS` variable defines the total number of minions.
6363

64-
The `PORTAL_NET` variable defines the kubernetes service portal ip range. Please make sure that you do have a valid private ip range defined here, because some IaaS provider may reserve private ips. You can use below three private network range accordin to rfc1918. Besides you'd better not choose the one that conflicts with your own private network range.
64+
The `SERVICE_CLUSTER_IP_RANGE` variable defines the kubernetes service portal ip range. Please make sure that you do have a valid private ip range defined here, because some IaaS provider may reserve private ips. You can use below three private network range accordin to rfc1918. Besides you'd better not choose the one that conflicts with your own private network range.
6565

6666
10.0.0.0 - 10.255.255.255 (10/8 prefix)
6767

6868
172.16.0.0 - 172.31.255.255 (172.16/12 prefix)
6969

7070
192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
7171

72-
The `FLANNEL_NET` variable defines the IP range used for flannel overlay network, should not conflict with above PORTAL_NET range
72+
The `FLANNEL_NET` variable defines the IP range used for flannel overlay network, should not conflict with above `SERVICE_CLUSTER_IP_RANGE`.
7373

7474
After all the above variable being set correctly. We can use below command in cluster/ directory to bring up the whole cluster.
7575

@@ -127,7 +127,7 @@ DNS_DOMAIN="kubernetes.local"
127127
DNS_REPLICAS=1
128128
129129
```
130-
The `DNS_SERVER_IP` is defining the ip of dns server which must be in the portal_net range.
130+
The `DNS_SERVER_IP` is defining the ip of dns server which must be in the service_cluster_ip_range.
131131

132132
The `DNS_REPLICAS` describes how many dns pod running in the cluster.
133133

‎docs/man/man1/kube-apiserver.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ The the kube\-apiserver several options.
178178
DEPRECATED: see \-\-insecure\-port instead
179179

180180
.PP
181-
\fB\-\-portal\-net\fP=
181+
\fB\-\-service\-cluster\-ip\-range\fP=
182182
A CIDR notation IP range from which to assign service cluster IPs. This must not overlap with any IP ranges assigned to nodes for pods.
183183

184184
.PP
@@ -246,7 +246,7 @@ The the kube\-apiserver several options.
246246
.RS
247247

248248
.nf
249-
/usr/bin/kube\-apiserver \-\-logtostderr=true \-\-v=0 \-\-etcd\_servers=http://127.0.0.1:4001 \-\-insecure\_bind\_address=127.0.0.1 \-\-insecure\_port=8080 \-\-kubelet\_port=10250 \-\-portal\_net=11.1.1.0/24 \-\-allow\_privileged=false
249+
/usr/bin/kube\-apiserver \-\-logtostderr=true \-\-v=0 \-\-etcd\_servers=http://127.0.0.1:4001 \-\-insecure\_bind\_address=127.0.0.1 \-\-insecure\_port=8080 \-\-kubelet\_port=10250 \-\-service\-cluster\-ip\-range=10.1.1.0/24 \-\-allow\_privileged=false
250250

251251
.fi
252252

‎docs/services.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ request. To do this, set the `spec.clusterIP` field (called `portalIP` in
206206
v1beta3 and earlier APIs). For example, if they already have an existing DNS
207207
entry that they wish to replace, or legacy systems that are configured for a
208208
specific IP address and difficult to re-configure. The IP address that a user
209-
chooses must be a valid IP address and within the portal_net CIDR range that is
210-
specified by flag to the API server. If the IP address value is invalid, the
211-
apiserver returns a 422 HTTP status code to indicate that the value is invalid.
209+
chooses must be a valid IP address and within the service_cluster_ip_range CIDR
210+
range that is specified by flag to the API server. If the IP address value is
211+
invalid, the apiserver returns a 422 HTTP status code to indicate that the
212+
value is invalid.
212213

213214
### Why not use round-robin DNS?
214215

0 commit comments

Comments
 (0)