diff --git a/ee/dtr/images/access-tokens-1.png b/ee/dtr/images/access-tokens-1.png index 4f539a8686..8cafd89aa0 100644 Binary files a/ee/dtr/images/access-tokens-1.png and b/ee/dtr/images/access-tokens-1.png differ diff --git a/ee/dtr/images/access-tokens-2.png b/ee/dtr/images/access-tokens-2.png index 0d8c54fc79..0604f29ac7 100644 Binary files a/ee/dtr/images/access-tokens-2.png and b/ee/dtr/images/access-tokens-2.png differ diff --git a/ee/dtr/images/access-tokens-3.png b/ee/dtr/images/access-tokens-3.png index ed14462894..a897104a63 100644 Binary files a/ee/dtr/images/access-tokens-3.png and b/ee/dtr/images/access-tokens-3.png differ diff --git a/ee/dtr/images/auto-delete-job-logs-0.png b/ee/dtr/images/auto-delete-job-logs-0.png index 4cdce3bbb2..4dcef7c524 100644 Binary files a/ee/dtr/images/auto-delete-job-logs-0.png and b/ee/dtr/images/auto-delete-job-logs-0.png differ diff --git a/ee/dtr/images/auto-delete-job-logs-1.png b/ee/dtr/images/auto-delete-job-logs-1.png index f9a31f02f1..e59b201690 100644 Binary files a/ee/dtr/images/auto-delete-job-logs-1.png and b/ee/dtr/images/auto-delete-job-logs-1.png differ diff --git a/ee/dtr/images/auto-delete-job-logs-2.png b/ee/dtr/images/auto-delete-job-logs-2.png index 88eeebccf8..0b7689ea0e 100644 Binary files a/ee/dtr/images/auto-delete-job-logs-2.png and b/ee/dtr/images/auto-delete-job-logs-2.png differ diff --git a/ee/dtr/images/auto-delete-job-logs-3.png b/ee/dtr/images/auto-delete-job-logs-3.png index d7c19cfb2b..c8246d4f66 100644 Binary files a/ee/dtr/images/auto-delete-job-logs-3.png and b/ee/dtr/images/auto-delete-job-logs-3.png differ diff --git a/ee/dtr/images/auto-delete-repo-events-0.png b/ee/dtr/images/auto-delete-repo-events-0.png index afee687131..23618539df 100644 Binary files a/ee/dtr/images/auto-delete-repo-events-0.png and b/ee/dtr/images/auto-delete-repo-events-0.png differ diff --git a/ee/dtr/images/auto-delete-repo-events-1.png b/ee/dtr/images/auto-delete-repo-events-1.png index 8425ac5f6a..763a2c5c6a 100644 Binary files a/ee/dtr/images/auto-delete-repo-events-1.png and b/ee/dtr/images/auto-delete-repo-events-1.png differ diff --git a/ee/dtr/images/auto-delete-repo-events-2.png b/ee/dtr/images/auto-delete-repo-events-2.png index 9ce3dc3509..aba001925b 100644 Binary files a/ee/dtr/images/auto-delete-repo-events-2.png and b/ee/dtr/images/auto-delete-repo-events-2.png differ diff --git a/ee/dtr/images/create-repository-1.png b/ee/dtr/images/create-repository-1.png index ff9dc37058..1a9c63a3cb 100644 Binary files a/ee/dtr/images/create-repository-1.png and b/ee/dtr/images/create-repository-1.png differ diff --git a/ee/dtr/images/create-repository-2.png b/ee/dtr/images/create-repository-2.png index c57a266729..53403b8160 100644 Binary files a/ee/dtr/images/create-repository-2.png and b/ee/dtr/images/create-repository-2.png differ diff --git a/ee/dtr/images/create-repository-3.png b/ee/dtr/images/create-repository-3.png index 8274ba7c2e..f47b8a1954 100644 Binary files a/ee/dtr/images/create-repository-3.png and b/ee/dtr/images/create-repository-3.png differ diff --git a/ee/dtr/images/garbage-collection-0.png b/ee/dtr/images/garbage-collection-0.png index 87e9b38d43..1af11123c5 100644 Binary files a/ee/dtr/images/garbage-collection-0.png and b/ee/dtr/images/garbage-collection-0.png differ diff --git a/ee/dtr/images/garbage-collection-1.png b/ee/dtr/images/garbage-collection-1.png index 233cbdeb6b..8ec1b4f88a 100644 Binary files a/ee/dtr/images/garbage-collection-1.png and b/ee/dtr/images/garbage-collection-1.png differ diff --git a/ee/dtr/images/garbage-collection-2.png b/ee/dtr/images/garbage-collection-2.png index 30f1d8a72c..5ea21458ac 100644 Binary files a/ee/dtr/images/garbage-collection-2.png and b/ee/dtr/images/garbage-collection-2.png differ diff --git a/ee/dtr/images/immutable-repo-0.png b/ee/dtr/images/immutable-repo-0.png index ec1da70d6f..54e2a34cf7 100644 Binary files a/ee/dtr/images/immutable-repo-0.png and b/ee/dtr/images/immutable-repo-0.png differ diff --git a/ee/dtr/images/immutable-repo-2.png b/ee/dtr/images/immutable-repo-2.png index 345a9309fe..92cbe6e136 100644 Binary files a/ee/dtr/images/immutable-repo-2.png and b/ee/dtr/images/immutable-repo-2.png differ diff --git a/ee/dtr/images/manage-repo-events-0.png b/ee/dtr/images/manage-repo-events-0.png index b040cae4ce..df063270f0 100644 Binary files a/ee/dtr/images/manage-repo-events-0.png and b/ee/dtr/images/manage-repo-events-0.png differ diff --git a/ee/dtr/images/manage-repo-events-1.png b/ee/dtr/images/manage-repo-events-1.png index cf2251fa8f..92ba506936 100644 Binary files a/ee/dtr/images/manage-repo-events-1.png and b/ee/dtr/images/manage-repo-events-1.png differ diff --git a/ee/dtr/images/manage-repo-events-2.png b/ee/dtr/images/manage-repo-events-2.png index 7ac47b8b89..3d9cc5bda8 100644 Binary files a/ee/dtr/images/manage-repo-events-2.png and b/ee/dtr/images/manage-repo-events-2.png differ diff --git a/ee/dtr/images/migration-error.png b/ee/dtr/images/migration-error.png index 58ac6a5bc3..dee647e75b 100644 Binary files a/ee/dtr/images/migration-error.png and b/ee/dtr/images/migration-error.png differ diff --git a/ee/dtr/images/migration-warning.png b/ee/dtr/images/migration-warning.png index 84efb52e98..e8d5210671 100644 Binary files a/ee/dtr/images/migration-warning.png and b/ee/dtr/images/migration-warning.png differ diff --git a/ee/dtr/images/tag-pruning-0.png b/ee/dtr/images/tag-pruning-0.png index 13bdb544be..b28f69d6d4 100644 Binary files a/ee/dtr/images/tag-pruning-0.png and b/ee/dtr/images/tag-pruning-0.png differ diff --git a/ee/dtr/images/tag-pruning-1.png b/ee/dtr/images/tag-pruning-1.png index 871aa7c729..2e45a44a23 100644 Binary files a/ee/dtr/images/tag-pruning-1.png and b/ee/dtr/images/tag-pruning-1.png differ diff --git a/ee/dtr/images/tag-pruning-2.png b/ee/dtr/images/tag-pruning-2.png index 8a912ff916..79fb0b83bf 100644 Binary files a/ee/dtr/images/tag-pruning-2.png and b/ee/dtr/images/tag-pruning-2.png differ diff --git a/ee/dtr/images/tag-pruning-3.png b/ee/dtr/images/tag-pruning-3.png index 33bf4032f3..da3055b190 100644 Binary files a/ee/dtr/images/tag-pruning-3.png and b/ee/dtr/images/tag-pruning-3.png differ diff --git a/ee/dtr/images/tag-pruning-4.png b/ee/dtr/images/tag-pruning-4.png index 2593c851bb..f25112ca65 100644 Binary files a/ee/dtr/images/tag-pruning-4.png and b/ee/dtr/images/tag-pruning-4.png differ diff --git a/ee/dtr/images/tag-pruning-5.png b/ee/dtr/images/tag-pruning-5.png index 706ab58502..9d8462fbea 100644 Binary files a/ee/dtr/images/tag-pruning-5.png and b/ee/dtr/images/tag-pruning-5.png differ diff --git a/ee/dtr/images/view-job-logs-1.png b/ee/dtr/images/view-job-logs-1.png index c1f2848195..29fcbe27be 100644 Binary files a/ee/dtr/images/view-job-logs-1.png and b/ee/dtr/images/view-job-logs-1.png differ diff --git a/ee/dtr/images/view-job-logs-2.png b/ee/dtr/images/view-job-logs-2.png index b7ab85e445..9a7b179f2b 100644 Binary files a/ee/dtr/images/view-job-logs-2.png and b/ee/dtr/images/view-job-logs-2.png differ diff --git a/ee/dtr/images/view-job-logs-4.png b/ee/dtr/images/view-job-logs-4.png index a9593ffabf..875c84e214 100644 Binary files a/ee/dtr/images/view-job-logs-4.png and b/ee/dtr/images/view-job-logs-4.png differ diff --git a/ee/images/docker-ee-overview-1.png b/ee/images/docker-ee-overview-1.png new file mode 100644 index 0000000000..fa54c7f1e8 Binary files /dev/null and b/ee/images/docker-ee-overview-1.png differ diff --git a/ee/images/docker-ee-overview-2.png b/ee/images/docker-ee-overview-2.png index c9587d0a7a..e4acb8af54 100644 Binary files a/ee/images/docker-ee-overview-2.png and b/ee/images/docker-ee-overview-2.png differ diff --git a/ee/images/get-support-1.png b/ee/images/get-support-1.png index 7f8771f2f1..e6ad5aa623 100644 Binary files a/ee/images/get-support-1.png and b/ee/images/get-support-1.png differ diff --git a/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md b/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md index 036fb92565..db98ffa057 100644 --- a/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md +++ b/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md @@ -13,12 +13,12 @@ are scheduled on a node with a specific label. For example, you can apply labels based on their role in the development lifecycle, or the hardware resources they have. -![](../../images/add-labels-to-cluster-nodes-1.svg) +![](../../images/add-labels-to-cluster-nodes-1.svg){: .with-border} Don't create labels for authorization and permissions to resources. Instead, use resource sets, either UCP collections or Kubernetes namespaces, to organize access to your cluster. -[Learn about managing access with resource sets](../../authorization/group-resources.md). +[Learn about managing access with resource sets](../../authorization/group-resources.md). ## Apply labels to a node @@ -26,18 +26,20 @@ In this example we'll apply the `ssd` label to a node. Then we'll deploy a service with a deployment constraint to make sure the service is always scheduled to run on a node that has the `ssd` label. -Log in with administrator credentials in the UCP web UI, navigate to the -**Nodes** page, and choose the node you want to apply labels to. In the -details pane, click **Configure**. +1. Log in with administrator credentials in the UCP web interface. +2. Select **Nodes** in the left-hand navigation menu. +3. In the nodes list, select the node to which you want to apply labels. +4. In the details pane, select the edit node icon in the upper-right corner to edit the node. + ![](../../images/add-labels-to-cluster-nodes-3.png) -In the **Edit Node** page, scroll down to the **Labels** section. - -Click **Add Label**, and add a label with the key `disk` and a value of `ssd`. +5. In the **Edit Node** page, scroll down to the **Labels** section. +6. Select **Add Label**. +7. Add a label with the key `disk` and a value of `ssd`. ![](../../images/add-labels-to-cluster-nodes-2.png){: .with-border} -Click **Save** and dismiss the **Edit Node** page. In the node's details -pane, click **Labels** to view the labels that are applied to the node. +8. Click **Save** then dismiss the **Edit Node** page. +9. In the node's details pane, select **Labels** to view the labels that are applied to the node. You can also do this from the CLI by running: @@ -55,10 +57,11 @@ In this example, when users deploy a service, they can add a constraint for the service to be scheduled only on nodes that have SSD storage: `node.labels.disk == ssd`. -Navigate to the **Stacks** page. Name the new stack "wordpress", and in the -**Mode** dropdown, check **Swarm Services**. +1. Navigate to the **Stacks** page. +2. Name the new stack "wordpress". +3. Under **Orchestrator Mode**, select **Swarm Services**. -In the **docker-compose.yml** editor, paste the following stack file. +4. In the **docker-compose.yml** editor, paste the following stack file. ``` version: "3.1" @@ -103,20 +106,20 @@ networks: wordpress-net: ``` -Click **Create** to deploy the stack, and when the stack deploys, +5. Click **Create** to deploy the stack, and when the stack deploys, click **Done**. ![](../../images/use-constraints-in-stack-deployment.png) -Navigate to the **Nodes** page, and click the node that has the +6. Navigate to the **Nodes** page, and click the node that has the `disk` label. In the details pane, click the **Inspect Resource** -dropdown and select **Containers**. +dropdown and select **Containers**. ![](../../images/use-constraints-in-stack-deployment-2.png) Dismiss the filter and navigate to the **Nodes** page. Click a node that doesn't have the `disk` label. In the details pane, click the -**Inspect Resource** dropdown and select **Containers**. There are no +**Inspect Resource** dropdown and select **Containers**. There are no WordPress containers scheduled on the node. Dismiss the filter. ## Add a constraint to a service by using the UCP web UI @@ -125,13 +128,13 @@ You can declare the deployment constraints in your docker-compose.yml file or when you're creating a stack. Also, you can apply them when you're creating a service. -To check if a service has deployment constraints, navigate to the +To check if a service has deployment constraints, navigate to the **Services** page and choose the service that you want to check. In the details pane, click **Constraints** to list the constraint labels. To edit the constraints on the service, click **Configure** and select **Details** to open the **Update Service** page. Click **Scheduling** to -view the constraints. +view the constraints. ![](../../images/add-constraint-to-service.png) @@ -140,5 +143,3 @@ You can add or remove deployment constraints on this page. ## Where to go next - [Store logs in an external system](store-logs-in-an-external-system.md) - - diff --git a/ee/ucp/images/add-labels-to-cluster-nodes-2.png b/ee/ucp/images/add-labels-to-cluster-nodes-2.png index 1cffa9c320..db2951844c 100644 Binary files a/ee/ucp/images/add-labels-to-cluster-nodes-2.png and b/ee/ucp/images/add-labels-to-cluster-nodes-2.png differ diff --git a/ee/ucp/images/add-labels-to-cluster-nodes-3.png b/ee/ucp/images/add-labels-to-cluster-nodes-3.png new file mode 100644 index 0000000000..696cd0aa54 Binary files /dev/null and b/ee/ucp/images/add-labels-to-cluster-nodes-3.png differ diff --git a/ee/ucp/images/add-node-ucp.png b/ee/ucp/images/add-node-ucp.png index 5e6b28bb2a..5886cdfa13 100644 Binary files a/ee/ucp/images/add-node-ucp.png and b/ee/ucp/images/add-node-ucp.png differ diff --git a/ee/ucp/images/client-bundle.png b/ee/ucp/images/client-bundle.png index e4a419ada3..beedb9ec4c 100644 Binary files a/ee/ucp/images/client-bundle.png and b/ee/ucp/images/client-bundle.png differ diff --git a/ee/ucp/images/kube-create-role.png b/ee/ucp/images/kube-create-role.png index a7c56e7e32..efec65e4b0 100644 Binary files a/ee/ucp/images/kube-create-role.png and b/ee/ucp/images/kube-create-role.png differ diff --git a/ee/ucp/images/kube-grant-rolebinding.png b/ee/ucp/images/kube-grant-rolebinding.png index be2ca63060..173215a1fa 100644 Binary files a/ee/ucp/images/kube-grant-rolebinding.png and b/ee/ucp/images/kube-grant-rolebinding.png differ diff --git a/ee/ucp/images/kube-grant-roleselect.png b/ee/ucp/images/kube-grant-roleselect.png index 4d13fe017d..c308c32669 100644 Binary files a/ee/ucp/images/kube-grant-roleselect.png and b/ee/ucp/images/kube-grant-roleselect.png differ diff --git a/ee/ucp/images/kube-grant-wizard.png b/ee/ucp/images/kube-grant-wizard.png index bf54c277f6..b6f906d65e 100644 Binary files a/ee/ucp/images/kube-grant-wizard.png and b/ee/ucp/images/kube-grant-wizard.png differ diff --git a/ee/ucp/images/kube-rbac-grants.png b/ee/ucp/images/kube-rbac-grants.png index 87eaf8a729..6624abd602 100644 Binary files a/ee/ucp/images/kube-rbac-grants.png and b/ee/ucp/images/kube-rbac-grants.png differ diff --git a/ee/ucp/images/kube-rbac-roles.png b/ee/ucp/images/kube-rbac-roles.png index ccc2adb02a..0991ebcaed 100644 Binary files a/ee/ucp/images/kube-rbac-roles.png and b/ee/ucp/images/kube-rbac-roles.png differ diff --git a/ee/ucp/images/kube-role-create.png b/ee/ucp/images/kube-role-create.png index 35d3318aec..204646dd07 100644 Binary files a/ee/ucp/images/kube-role-create.png and b/ee/ucp/images/kube-role-create.png differ diff --git a/ee/ucp/images/license-ucp-1.png b/ee/ucp/images/license-ucp-1.png index ddd871f7a4..224e9ba029 100644 Binary files a/ee/ucp/images/license-ucp-1.png and b/ee/ucp/images/license-ucp-1.png differ diff --git a/ee/ucp/images/license-ucp-2.png b/ee/ucp/images/license-ucp-2.png index dccb3f7c36..f55003d218 100644 Binary files a/ee/ucp/images/license-ucp-2.png and b/ee/ucp/images/license-ucp-2.png differ diff --git a/ee/ucp/images/license-ucp.png b/ee/ucp/images/license-ucp.png index 7eec8f70b9..6c33b3216a 100644 Binary files a/ee/ucp/images/license-ucp.png and b/ee/ucp/images/license-ucp.png differ diff --git a/ee/ucp/images/nodes-page-ucp.png b/ee/ucp/images/nodes-page-ucp.png index 5d1f9d8c00..7a0bfb2dbe 100644 Binary files a/ee/ucp/images/nodes-page-ucp.png and b/ee/ucp/images/nodes-page-ucp.png differ diff --git a/ee/ucp/images/overview-1.png b/ee/ucp/images/overview-1.png index 7bb908139f..c6c25bf20a 100644 Binary files a/ee/ucp/images/overview-1.png and b/ee/ucp/images/overview-1.png differ diff --git a/ee/ucp/images/overview-2.png b/ee/ucp/images/overview-2.png index 22261dd985..13ea54d8ab 100644 Binary files a/ee/ucp/images/overview-2.png and b/ee/ucp/images/overview-2.png differ diff --git a/ee/ucp/images/overview-3.png b/ee/ucp/images/overview-3.png index b15bd322fc..94b72faf26 100644 Binary files a/ee/ucp/images/overview-3.png and b/ee/ucp/images/overview-3.png differ diff --git a/ee/ucp/images/saml_enabled.png b/ee/ucp/images/saml_enabled.png index 022c9e37fb..b50948538a 100644 Binary files a/ee/ucp/images/saml_enabled.png and b/ee/ucp/images/saml_enabled.png differ diff --git a/ee/ucp/images/use-constraints-in-stack-deployment.png b/ee/ucp/images/use-constraints-in-stack-deployment.png index 358d15996b..5f3b7a3fae 100644 Binary files a/ee/ucp/images/use-constraints-in-stack-deployment.png and b/ee/ucp/images/use-constraints-in-stack-deployment.png differ