From 89ea6bd6bb446d3267b02c82da3636fac60e96f4 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Thu, 2 Apr 2020 17:01:20 -0700 Subject: [PATCH] Edit section on annotating imported clusters --- .../imported-clusters/_index.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md index da3a97264c8..8f59cbb3348 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/imported-clusters/_index.md @@ -153,18 +153,13 @@ This example annotation indicates that a pod security policy is enabled: "capabilities.cattle.io/pspEnabled": "true" ``` -This annotation indicates Ingress capabilities: +The following annotation indicates Ingress capabilities. Note that that the values of non-primitive objects need to be JSON encoded, with quotations escaped. ```json -capabilities.cattle.io/ingressCapabilities": "[ - { - "customDefaultBackend":true, - "ingressProvider":"asdf" - } -]" +"capabilities.cattle.io/ingressCapabilities": "[{"customDefaultBackend":true,"ingressProvider":"asdf"}]" ``` -The following capabilities can be annotated for the cluster: +These capabilities can be annotated for the cluster: - `ingressCapabilities` - `loadBalancerCapabilities` @@ -173,7 +168,7 @@ The following capabilities can be annotated for the cluster: - `pspEnabled` - `taintSupport` -All the capabilities and their type defintions can be viewed in the Rancher API view, at `[Rancher Server URL]/v3/schemas/capabilities`. +All the capabilities and their type definitions can be viewed in the Rancher API view, at `[Rancher Server URL]/v3/schemas/capabilities`. To annotate an imported cluster,