diff --git a/cluster/images/hyperkube/master-multi.json b/cluster/images/hyperkube/master-multi.json index 49a34de4560..4b980648387 100644 --- a/cluster/images/hyperkube/master-multi.json +++ b/cluster/images/hyperkube/master-multi.json @@ -23,7 +23,7 @@ "command": [ "/hyperkube", "apiserver", - "--portal_net=10.0.0.1/24", + "--service-cluster-ip-range=10.0.0.1/24", "--address=0.0.0.0", "--etcd_servers=http://127.0.0.1:4001", "--cluster_name=kubernetes", diff --git a/cluster/images/hyperkube/master.json b/cluster/images/hyperkube/master.json index ff94d0f1e1e..13975101b6c 100644 --- a/cluster/images/hyperkube/master.json +++ b/cluster/images/hyperkube/master.json @@ -23,7 +23,7 @@ "command": [ "/hyperkube", "apiserver", - "--portal_net=10.0.0.1/24", + "--service-cluster-ip-range=10.0.0.1/24", "--address=127.0.0.1", "--etcd_servers=http://127.0.0.1:4001", "--cluster_name=kubernetes", diff --git a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl index b45fd6dd839..3f0109eb83a 100644 --- a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl +++ b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl @@ -11,7 +11,7 @@ exec /usr/local/bin/apiserver \ --address=%(api_bind_address)s \ --etcd_servers=%(etcd_servers)s \ --logtostderr=true \ - --portal_net=10.244.240.0/20 + --service-cluster-ip-range=10.244.240.0/20 diff --git a/cluster/libvirt-coreos/user_data_master.yml b/cluster/libvirt-coreos/user_data_master.yml index 256c62fa2ce..5bd61bbca85 100644 --- a/cluster/libvirt-coreos/user_data_master.yml +++ b/cluster/libvirt-coreos/user_data_master.yml @@ -18,7 +18,7 @@ coreos: --port=8080 \ --etcd_servers=http://127.0.0.1:4001 \ --kubelet_port=10250 \ - --portal_net=${PORTAL_NET} + --service-cluster-ip-range=${PORTAL_NET} Restart=always RestartSec=2 diff --git a/cluster/rackspace/cloud-config/master-cloud-config.yaml b/cluster/rackspace/cloud-config/master-cloud-config.yaml index 83e09db30b7..9238d4c9b07 100644 --- a/cluster/rackspace/cloud-config/master-cloud-config.yaml +++ b/cluster/rackspace/cloud-config/master-cloud-config.yaml @@ -93,7 +93,7 @@ coreos: --etcd_servers=http://127.0.0.1:4001 \ --logtostderr=true \ --port=8080 \ - --portal_net=PORTAL_NET \ + --service-cluster-ip-range=PORTAL_NET \ --token-auth-file=/var/lib/kube-apiserver/known_tokens.csv \ --v=2 Restart=always diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest index d5a74e2201a..23cc31de4d8 100644 --- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest +++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest @@ -38,7 +38,7 @@ {% set portal_net = "" -%} {% if pillar['portal_net'] is defined -%} - {% set portal_net = "--portal_net=" + pillar['portal_net'] -%} + {% set portal_net = "--service-cluster-ip-range=" + pillar['portal_net'] -%} {% endif -%} {% set cert_file = "--tls_cert_file=/srv/kubernetes/server.cert" -%} diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index 9ae5129e225..2e7e556d204 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -210,7 +210,7 @@ KUBE_APISERVER_OPTS="--address=0.0.0.0 \ --port=8080 \ --etcd_servers=http://127.0.0.1:4001 \ --logtostderr=true \ ---portal_net=${1}" +--service-cluster-ip-range=${1}" EOF } @@ -450,4 +450,4 @@ function kube-push { # Perform preparations required to run e2e tests function prepare-e2e() { echo "Ubuntu doesn't need special preparations for e2e tests" 1>&2 -} \ No newline at end of file +} diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index e770947f9d0..cae071cbb55 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -183,9 +183,12 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.OldEtcdPathPrefix, "old-etcd-prefix", s.OldEtcdPathPrefix, "The previous prefix for all resource paths in etcd, if any.") fs.Var(&s.CorsAllowedOriginList, "cors-allowed-origins", "List of allowed origins for CORS, comma separated. An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled.") fs.BoolVar(&s.AllowPrivileged, "allow-privileged", s.AllowPrivileged, "If true, allow privileged containers.") - fs.Var(&s.ServiceClusterIPRange, "portal-net", "A CIDR notation IP range from which to assign portal IPs. This must not overlap with any IP ranges assigned to nodes for pods.") - fs.Var(&s.ServiceNodePortRange, "service-node-ports", "A port range to reserve for services with NodePort visibility. Example: '30000-32767'. Inclusive at both ends of the range.") - + fs.Var(&s.ServiceClusterIPRange, "service-cluster-ip-range", "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.") + fs.Var(&s.ServiceClusterIPRange, "portal-net", "Deprecated: see --service-cluster-ip-range instead.") + fs.MarkDeprecated("portal-net", "see --service-cluster-ip-range instead.") + fs.Var(&s.ServiceNodePortRange, "service-node-port-range", "A port range to reserve for services with NodePort visibility. Example: '30000-32767'. Inclusive at both ends of the range.") + fs.Var(&s.ServiceNodePortRange, "service-node-ports", "Deprecated: see --service-node-port-range instead.") + fs.MarkDeprecated("service-node-ports", "see --service-node-port-range instead.") fs.StringVar(&s.MasterServiceNamespace, "master-service-namespace", s.MasterServiceNamespace, "The namespace from which the kubernetes master services should be injected into pods") fs.Var(&s.RuntimeConfig, "runtime-config", "A set of key=value pairs that describe runtime configuration that may be passed to the apiserver. api/ key can be used to turn on/off specific api versions. api/all and api/legacy are special keys to control all and legacy api versions respectively.") client.BindKubeletClientConfigFlags(fs, &s.KubeletConfig) diff --git a/contrib/ansible/roles/master/templates/apiserver.j2 b/contrib/ansible/roles/master/templates/apiserver.j2 index eaabd3bf3e4..c389419c596 100644 --- a/contrib/ansible/roles/master/templates/apiserver.j2 +++ b/contrib/ansible/roles/master/templates/apiserver.j2 @@ -14,7 +14,7 @@ KUBE_API_ADDRESS="--address=0.0.0.0" # KUBELET_PORT="--kubelet_port=10250" # Address range to use for services -KUBE_SERVICE_ADDRESSES="--portal_net={{ kube_service_addresses }}" +KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range={{ kube_service_addresses }}" # Location of the etcd cluster KUBE_ETCD_SERVERS="--etcd_servers=http://{{ groups['etcd'][0] }}:2379" diff --git a/contrib/init/systemd/environ/apiserver b/contrib/init/systemd/environ/apiserver index 3196610f8ec..1f5725712d8 100644 --- a/contrib/init/systemd/environ/apiserver +++ b/contrib/init/systemd/environ/apiserver @@ -17,7 +17,7 @@ KUBE_API_ADDRESS="--address=127.0.0.1" KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001" # Address range to use for services -KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16" +KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" # default admission control policies KUBE_ADMISSION_CONTROL="--admission_control=NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml index 4959f1ad7bd..af8d61078a7 100644 --- a/docs/getting-started-guides/aws/cloud-configs/master.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/master.yaml @@ -118,7 +118,7 @@ coreos: ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver ExecStart=/opt/bin/kube-apiserver \ --insecure-bind-address=0.0.0.0 \ - --portal-net=10.100.0.0/16 \ + --service-cluster-ip-range=10.100.0.0/16 \ --etcd-servers=http://localhost:2379 Restart=always RestartSec=10 diff --git a/docs/getting-started-guides/aws/cloudformation-template.json b/docs/getting-started-guides/aws/cloudformation-template.json index 0129f990dc3..7617445125c 100644 --- a/docs/getting-started-guides/aws/cloudformation-template.json +++ b/docs/getting-started-guides/aws/cloudformation-template.json @@ -260,7 +260,7 @@ " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver\n", " ExecStart=/opt/bin/kube-apiserver \\\n", " --insecure-bind-address=0.0.0.0 \\\n", - " --portal-net=10.100.0.0/16 \\\n", + " --service-cluster-ip-range=10.100.0.0/16 \\\n", " --etcd-servers=http://localhost:2379\n", " Restart=always\n", " RestartSec=10\n", diff --git a/docs/getting-started-guides/centos/centos_manual_config.md b/docs/getting-started-guides/centos/centos_manual_config.md index f24c3b41b96..c76c4cba543 100644 --- a/docs/getting-started-guides/centos/centos_manual_config.md +++ b/docs/getting-started-guides/centos/centos_manual_config.md @@ -97,7 +97,7 @@ KUBE_MASTER="--master=http://centos-master:8080" KUBELET_PORT="--kubelet_port=10250" # Address range to use for services -KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16" +KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" # Add your own! KUBE_API_ARGS="" diff --git a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml index c9988eea217..53dc5d56706 100644 --- a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml +++ b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml @@ -273,7 +273,7 @@ coreos: --address=0.0.0.0 \ --port=8080 \ $ETCD_SERVERS \ - --portal_net=10.1.0.0/16 \ + --service-cluster-ip-range=10.1.0.0/16 \ --cloud_provider=vagrant \ --logtostderr=true --v=3 Restart=always diff --git a/docs/getting-started-guides/coreos/bare_metal_offline.md b/docs/getting-started-guides/coreos/bare_metal_offline.md index fd323a42380..4a4a13803ab 100644 --- a/docs/getting-started-guides/coreos/bare_metal_offline.md +++ b/docs/getting-started-guides/coreos/bare_metal_offline.md @@ -363,7 +363,7 @@ On the PXE server make and fill in the variables ```vi /var/www/html/coreos/pxe- ExecStart=/opt/bin/kube-apiserver \ --address=0.0.0.0 \ --port=8080 \ - --portal_net=10.100.0.0/16 \ + --service-cluster-ip-range=10.100.0.0/16 \ --etcd_servers=http://127.0.0.1:4001 \ --logtostderr=true Restart=always diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml index b58da94ad07..cffee3de510 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/master.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/master.yaml @@ -116,7 +116,7 @@ coreos: --insecure_port=8080 \ --kubelet_https=true \ --secure_port=6443 \ - --portal_net=10.100.0.0/16 \ + --service-cluster-ip-range=10.100.0.0/16 \ --etcd_servers=http://127.0.0.1:4001 \ --public_address_override=${DEFAULT_IPV4} \ --logtostderr=true diff --git a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml index f9fd09560fa..a37b05e37d3 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml @@ -84,7 +84,7 @@ coreos: --insecure_port=8080 \ --kubelet_https=true \ --secure_port=6443 \ - --portal_net=10.100.0.0/16 \ + --service-cluster-ip-range=10.100.0.0/16 \ --etcd_servers=http://127.0.0.1:4001 \ --public_address_override=127.0.0.1 \ --logtostderr=true diff --git a/docs/getting-started-guides/fedora/fedora_manual_config.md b/docs/getting-started-guides/fedora/fedora_manual_config.md index fe1c1d828cc..5ff3faacc91 100644 --- a/docs/getting-started-guides/fedora/fedora_manual_config.md +++ b/docs/getting-started-guides/fedora/fedora_manual_config.md @@ -71,7 +71,7 @@ KUBE_API_ADDRESS="--address=0.0.0.0" KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001" # Address range to use for services -KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16" +KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" # Add your own! KUBE_API_ARGS="" diff --git a/docs/getting-started-guides/mesos.md b/docs/getting-started-guides/mesos.md index 103a07832e9..7c4067ed1d1 100644 --- a/docs/getting-started-guides/mesos.md +++ b/docs/getting-started-guides/mesos.md @@ -69,7 +69,7 @@ $ ./bin/km apiserver \ --address=${servicehost} \ --mesos_master=${mesos_master} \ --etcd_servers=http://${servicehost}:4001 \ - --portal_net=10.10.10.0/24 \ + --service-cluster-ip-range=10.10.10.0/24 \ --port=8888 \ --cloud_provider=mesos \ --v=1 >apiserver.log 2>&1 & diff --git a/docs/man/kube-apiserver.1.md b/docs/man/kube-apiserver.1.md index f078f3a3d86..21e4edbda9f 100644 --- a/docs/man/kube-apiserver.1.md +++ b/docs/man/kube-apiserver.1.md @@ -134,7 +134,7 @@ The the kube-apiserver several options. **--port**=8080 DEPRECATED: see --insecure-port instead -**--portal-net**= +**--service-cluster-ip-range**= 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. **--profiling**=true @@ -184,7 +184,7 @@ The the kube-apiserver several options. # EXAMPLES ``` -/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 +/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 ``` # HISTORY diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index ff86bb0ca53..48b024bbe79 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -166,7 +166,7 @@ sudo -E "${GO_OUT}/kube-apiserver" \ --port="${API_PORT}" \ --runtime_config=api/v1beta3 \ --etcd_servers="http://127.0.0.1:4001" \ - --portal_net="10.0.0.0/24" \ + --service-cluster-ip-range="10.0.0.0/24" \ --cors_allowed_origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 & APISERVER_PID=$! diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 1fa85fbc92e..6a81355a00e 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -94,7 +94,7 @@ kube::log::status "Starting kube-apiserver" --kubelet_port=${KUBELET_PORT} \ --runtime_config=api/v1beta3 \ --cert_dir="${TMPDIR:-/tmp/}" \ - --portal_net="10.0.0.0/24" 1>&2 & + --service-cluster-ip-range="10.0.0.0/24" 1>&2 & APISERVER_PID=$! kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: " diff --git a/hack/test-update-storage-objects.sh b/hack/test-update-storage-objects.sh index a595c69816d..90f21820960 100755 --- a/hack/test-update-storage-objects.sh +++ b/hack/test-update-storage-objects.sh @@ -53,7 +53,7 @@ function startApiServer() { --kubelet_port=${KUBELET_PORT} \ --runtime_config="${RUNTIME_CONFIG}" \ --cert_dir="${TMPDIR:-/tmp/}" \ - --portal_net="10.0.0.0/24" 1>&2 & + --service-cluster-ip-range="10.0.0.0/24" 1>&2 & APISERVER_PID=$! kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: " diff --git a/hack/update-swagger-spec.sh b/hack/update-swagger-spec.sh index 1fc4e5abc11..d1699accf9a 100755 --- a/hack/update-swagger-spec.sh +++ b/hack/update-swagger-spec.sh @@ -54,7 +54,7 @@ kube::log::status "Starting kube-apiserver" --public_address_override="127.0.0.1" \ --kubelet_port=${KUBELET_PORT} \ --runtime_config=api/v1beta3 \ - --portal_net="10.0.0.0/24" 1>&2 & + --service-cluster-ip-range="10.0.0.0/24" 1>&2 & APISERVER_PID=$! kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: "