From 6da86de89a979950dcd1cf4d771bd705856260e0 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Mon, 15 Apr 2019 10:29:10 -0700 Subject: [PATCH 1/3] Add documentation for --service-cluster-ip-range flag https://github.com/docker/orca/pull/16417 adds support to make service cluster IP range subnet configurable for UCP install via the --service-cluster-ip-range flag --- ee/ucp/admin/configure/ucp-configuration-file.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index 78ce30c8a5..a87fb4ac85 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -189,6 +189,7 @@ components. Assigning these values overrides the settings in a container's | `calico_mtu` | no | Set the MTU (maximum transmission unit) size for the Calico plugin. | | `ipip_mtu` | no | Set the IPIP MTU size for the calico IPIP tunnel interface. | | `azure_ip_count` | no | Set the IP count for azure allocator to allocate IPs per Azure virtual machine. | +| `service-cluster-ip-range` | yes | Sets the subnet pool from which the IP for Services should be allocated. Default is `10.96.0.0/16` | `nodeport_range` | yes | Set the port range that for Kubernetes services of type NodePort can be exposed in. Default is `32768-35535`. | | `custom_kube_api_server_flags` | no | Set the configuration options for the Kubernetes API server. (dev) | | `custom_kube_controller_manager_flags` | no | Set the configuration options for the Kubernetes controller manager. (dev) | From 017f76247a0d66dc5980d368874be27ac2956ffc Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Mon, 15 Apr 2019 14:13:36 -0400 Subject: [PATCH 2/3] Added a period. --- ee/ucp/admin/configure/ucp-configuration-file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index a87fb4ac85..53070b1eee 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -189,7 +189,7 @@ components. Assigning these values overrides the settings in a container's | `calico_mtu` | no | Set the MTU (maximum transmission unit) size for the Calico plugin. | | `ipip_mtu` | no | Set the IPIP MTU size for the calico IPIP tunnel interface. | | `azure_ip_count` | no | Set the IP count for azure allocator to allocate IPs per Azure virtual machine. | -| `service-cluster-ip-range` | yes | Sets the subnet pool from which the IP for Services should be allocated. Default is `10.96.0.0/16` +| `service-cluster-ip-range` | yes | Sets the subnet pool from which the IP for Services should be allocated. Default is `10.96.0.0/16`. | `nodeport_range` | yes | Set the port range that for Kubernetes services of type NodePort can be exposed in. Default is `32768-35535`. | | `custom_kube_api_server_flags` | no | Set the configuration options for the Kubernetes API server. (dev) | | `custom_kube_controller_manager_flags` | no | Set the configuration options for the Kubernetes controller manager. (dev) | From d1213b86bc9b854624a1365e3cb38a9caab71a3a Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Mon, 15 Apr 2019 11:27:53 -0700 Subject: [PATCH 3/3] Add documentation for UCP install page Signed-off-by: Arko Dasgupta --- reference/ucp/3.1/cli/install.md | 1 + 1 file changed, 1 insertion(+) diff --git a/reference/ucp/3.1/cli/install.md b/reference/ucp/3.1/cli/install.md index 4c0d06528c..96979016cc 100644 --- a/reference/ucp/3.1/cli/install.md +++ b/reference/ucp/3.1/cli/install.md @@ -71,6 +71,7 @@ If you are installing on Azure, see [Install UCP on Azure](/ee/ucp/admin/install | `--kv-timeout` | Timeout in milliseconds for the key-value store | | `--license` | Add a license: e.g.` --license "$(cat license.lic)" ` | | `--pod-cidr` | Kubernetes cluster IP pool for the pods to allocated IPs from (Default: `192.168.0.0/16`) | +|`--service-cluster-ip-range`| Sets the subnet pool from which the IP for Services should be allocated (Default is `10.96.0.0/16`). | | `--preserve-certs` | Don't generate certificates if they already exist | | `--pull` | Pull UCP images: `always`, when `missing`, or `never` | | `--random` | Set the Docker Swarm scheduler to random mode. Used for backwards compatibility |