Merge pull request #67912 from duritong/patch-3

resource presentation not as a List

Author: ousleyp

modules/nw-ingress-sharding-default.adoc

@@ -34,22 +34,20 @@ $ oc edit ingresscontroller -n openshift-ingress-operator default
 +
 [source,yaml]
 ----
-apiVersion: v1
-items:
-- apiVersion: operator.openshift.io/v1
-  kind: IngressController
-  metadata:
-    name: default
-    namespace: openshift-ingress-operator
-  spec:
+apiVersion: operator.openshift.io/v1
+kind: IngressController
+metadata:
+  name: default
+  namespace: openshift-ingress-operator
+spec:
   namespaceSelector:
     matchExpressions:
-    - key: type
-      operator: NotIn
-      values:
-      - finance
-      - ops
-      - dev
+      - key: type
+        operator: NotIn
+        values:
+          - finance
+          - ops
+          - dev
 ----
 
 The default Ingress Controller will no longer serve the namespaces labeled `name:finance`, `name:ops`, and `name:dev`.

modules/nw-ingress-sharding-namespace-labels.adoc

@@ -31,27 +31,20 @@ to another.
 .Example output
 [source,yaml]
 ----
-apiVersion: v1
-items:
-- apiVersion: operator.openshift.io/v1
-  kind: IngressController
-  metadata:
-    name: sharded
-    namespace: openshift-ingress-operator
-  spec:
-    domain: <apps-sharded.basedomain.example.net> <1>
-    nodePlacement:
-      nodeSelector:
-        matchLabels:
-          node-role.kubernetes.io/worker: ""
-    namespaceSelector:
-      matchLabels:
-        type: sharded
-  status: {}
-kind: List
+apiVersion: operator.openshift.io/v1
+kind: IngressController
 metadata:
-  resourceVersion: ""
-  selfLink: ""
+  name: sharded
+  namespace: openshift-ingress-operator
+spec:
+  domain: <apps-sharded.basedomain.example.net> <1>
+  nodePlacement:
+    nodeSelector:
+      matchLabels:
+        node-role.kubernetes.io/worker: ""
+  namespaceSelector:
+    matchLabels:
+      type: sharded
 ----
 <1> Specify a domain to be used by the Ingress Controller. This domain must be different from the default Ingress Controller domain.
 

modules/nw-ingress-sharding-route-labels.adoc

@@ -26,27 +26,20 @@ to another.
 [source,terminal]
 ----
 # cat router-internal.yaml
-apiVersion: v1
-items:
-- apiVersion: operator.openshift.io/v1
-  kind: IngressController
-  metadata:
-    name: sharded
-    namespace: openshift-ingress-operator
-  spec:
-    domain: <apps-sharded.basedomain.example.net> <1>
-    nodePlacement:
-      nodeSelector:
-        matchLabels:
-          node-role.kubernetes.io/worker: ""
-    routeSelector:
-      matchLabels:
-        type: sharded
-  status: {}
-kind: List
+apiVersion: operator.openshift.io/v1
+kind: IngressController
 metadata:
-  resourceVersion: ""
-  selfLink: ""
+  name: sharded
+  namespace: openshift-ingress-operator
+spec:
+  domain: <apps-sharded.basedomain.example.net> <1>
+  nodePlacement:
+    nodeSelector:
+      matchLabels:
+        node-role.kubernetes.io/worker: ""
+  routeSelector:
+    matchLabels:
+      type: sharded
 ----
 <1> Specify a domain to be used by the Ingress Controller. This domain must be different from the default Ingress Controller domain.
 

modules/nw-ingress-sharding.adoc

@@ -37,37 +37,33 @@ An Ingress Controller `finops-router` is configured with the label selector `spe
 .Example YAML definition for `finops-router`
 [source,yaml]
 ----
-apiVersion: v1
-items:
-- apiVersion: operator.openshift.io/v1
-  kind: IngressController
-  metadata:
-    name: finops-router
-    namespace: openshift-ingress-operator
-  spec:
-    namespaceSelector:
-      matchLabels:
-        name:
-          - finance
-          - ops
+apiVersion: operator.openshift.io/v1
+kind: IngressController
+metadata:
+  name: finops-router
+  namespace: openshift-ingress-operator
+spec:
+  namespaceSelector:
+    matchLabels:
+      name:
+        - finance
+        - ops
 ----
 
 A second Ingress Controller `dev-router` is configured with the label selector `spec.namespaceSelector.matchLabels.name` set to `dev`:
 
 .Example YAML definition for `dev-router`
 [source,yaml]
 ----
-apiVersion: v1
-items:
-- apiVersion: operator.openshift.io/v1
-  kind: IngressController
-  metadata:
-    name: dev-router
-    namespace: openshift-ingress-operator
-  spec:
-    namespaceSelector:
-      matchLabels:
-        name: dev
+apiVersion: operator.openshift.io/v1
+kind: IngressController
+metadata:
+  name: dev-router
+  namespace: openshift-ingress-operator
+spec:
+  namespaceSelector:
+    matchLabels:
+      name: dev
 ----
 
 If all application routes are in separate namespaces, each labeled with `name:finance`, `name:ops`, and `name:dev` respectively, this configuration effectively distributes your routes between the two Ingress Controllers. {product-title} routes for console, authentication, and other purposes should not be handled.
@@ -86,19 +82,17 @@ In addition to `finops-router` and `dev-router` in the example above, you also h
 .Example YAML definition for `devops-router`
 [source,yaml]
 ----
-apiVersion: v1
-items:
-- apiVersion: operator.openshift.io/v1
-  kind: IngressController
-  metadata:
-    name: devops-router
-    namespace: openshift-ingress-operator
-  spec:
-    namespaceSelector:
-      matchLabels:
-        name:
-          - dev
-          - ops
+apiVersion: operator.openshift.io/v1
+kind: IngressController
+metadata:
+  name: devops-router
+  namespace: openshift-ingress-operator
+spec:
+  namespaceSelector:
+    matchLabels:
+      name:
+        - dev
+        - ops
 ----
 The routes in the namespaces labeled `name:dev` and `name:ops` are now serviced by two different Ingress Controllers. With this configuration, you have overlapping subsets of routes.