From f67101e4f5e6fe5d35b681966638485e2de88d28 Mon Sep 17 00:00:00 2001 From: ddeyo Date: Mon, 22 Oct 2018 17:05:30 -0700 Subject: [PATCH] update to supported platforms --- ee/supported-platforms.md | 10 +++------- ee/ucp/admin/install/system-requirements.md | 10 +++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index b612964b94..74b1634160 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -1,5 +1,5 @@ --- -title: About Docker EE +title: About Docker Enterprise description: Information about Docker Enterprise Edition Platform 2.0 keywords: enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine redirect_from: @@ -25,10 +25,6 @@ options, see [Docker Enterprise](https://www.docker.com/enterprise-edition/). {% include docker_ce_ee.md %} -### Enterprise Edition - -[Learn more about the supported platforms](#supported-platforms). - ### Docker Enterprise With Docker Enterprise, you can deploy Docker Engine - Enterprise @@ -40,7 +36,7 @@ management with support for Kubernetes and Swarm orchestrators, and allows you t node-based RBAC policies, image promotion policies, image mirroring, and scan your images for vulnerabilities. -Docker EEnterprise has enterprise class support with defined SLAs, extended +Docker Enterprise has enterprise class support with defined SLAs, extended maintenance cycles for patches for up to 24 months. [Learn more about Docker Enterprise](/ee/index.md). @@ -82,7 +78,7 @@ feature negotiation. ## Upgrades and support If you're a Docker DDC or CS Engine customer, you don't need to upgrade to -Docker EE to continue to get support. We will continue to support customers +Docker Enterprise to continue to get support. We will continue to support customers with valid subscriptions whether the subscription covers Docker EE or Commercially Supported Docker. You can choose to stay with your current deployed version, or you can upgrade to the latest Docker EE version. For diff --git a/ee/ucp/admin/install/system-requirements.md b/ee/ucp/admin/install/system-requirements.md index a52686a251..49c83aad04 100644 --- a/ee/ucp/admin/install/system-requirements.md +++ b/ee/ucp/admin/install/system-requirements.md @@ -13,7 +13,7 @@ Before installing, be sure your infrastructure has these requirements. You can install UCP on-premises or on a cloud provider. Common requirements: -* [Docker EE Engine](/ee/supported-platforms.md) version 17.06.2-ee-8; +* [Docker EE Engine](/ee/supported-platforms.md) version 17.06.2-ee-8; values of `n` in the `-ee-` suffix must be 8 or higher * Linux kernel version 3.10 or higher * A static IP address @@ -29,7 +29,7 @@ You can install UCP on-premises or on a cloud provider. Common requirements: * 16GB of RAM for manager nodes * 4 vCPUs for manager nodes * 25-100GB of free disk space - + Note that Windows container images are typically larger than Linux ones and for this reason, you should consider provisioning more local storage for Windows nodes and for DTR setups that will store Windows container images. @@ -66,7 +66,7 @@ host types: | managers | TCP 2376 (configurable) | Internal | Port for the Docker Swarm manager. Used for backwards compatibility | | managers | TCP 2377 (configurable) | Internal, | Port for control communication between swarm nodes | | managers, workers | UDP 4789 | Internal, | Port for overlay networking | -| managers | TCP 6443 (configurable) | External, Internal | Port for Kubernetes API server | +| managers | TCP 6443 (configurable) | External, Internal | Port for Kubernetes API server endpoint | | managers, workers | TCP 6444 | Self | Port for Kubernetes API reverse proxy | | managers, workers | TCP, UDP 7946 | Internal | Port for gossip-based clustering | | managers, workers | TCP 10250 | Internal | Port for Kubelet | @@ -80,7 +80,7 @@ host types: | managers | TCP 12384 | Internal | Port for the authentication storage backend for replication across managers | | managers | TCP 12385 | Internal | Port for the authentication service API | | managers | TCP 12386 | Internal | Port for the authentication worker | -| managers | TCP 12387 | Internal | Port for the metrics service | +| managers | TCP 12388 | Internal | Internal Port for the Kubernetes API Server | ## Enable ESP traffic @@ -94,7 +94,7 @@ Number 4 for IP-in-IP encapsulation. If you're deploying to AWS or another cloud provider, enable IP-in-IP traffic for your cloud provider's security group. - + ## Timeout settings Make sure the networks you're using allow the UCP components enough time