Regroup additional printer columns (#3770)

- Put READY and REASON columns at right most position
knative · Aug 11, 2020 · 3ec8f09 · 3ec8f09
1 parent b502732
commit 3ec8f09
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 66 deletions.
diff --git a/config/channels/in-memory-channel/300-in-memory-channel.yaml b/config/channels/in-memory-channel/300-in-memory-channel.yaml
@@ -38,18 +38,18 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: URL
       type: string
       jsonPath: .status.address.url
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
   - << : *version
     name: v1
     served: true

diff --git a/config/core/resources/apiserversource.yaml b/config/core/resources/apiserversource.yaml
@@ -51,18 +51,18 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: Sink
       type: string
       jsonPath: ".status.sinkUri"
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
   - << : *version
     name: v1alpha2
     served: true

diff --git a/config/core/resources/broker.yaml b/config/core/resources/broker.yaml
@@ -38,18 +38,18 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: URL
       type: string
       jsonPath: .status.address.url
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
   - << : *version
     name: v1
     served: true

diff --git a/config/core/resources/channel.yaml b/config/core/resources/channel.yaml
@@ -31,18 +31,18 @@ spec:
     subresources:
       status: {}
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: URL
       type: string
       jsonPath: .status.address.url
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     schema:
       openAPIV3Schema:
         type: object

diff --git a/config/core/resources/containersource.yaml b/config/core/resources/containersource.yaml
@@ -39,18 +39,18 @@ spec:
           # see issue: https://github.com/knative/serving/issues/912
           x-kubernetes-preserve-unknown-fields: true
       additionalPrinterColumns:
-        - name: Ready
-          type: string
-          jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-        - name: Reason
-          type: string
-          jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
         - name: Sink
           type: string
           jsonPath: ".status.sinkUri"
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
+        - name: Ready
+          type: string
+          jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+        - name: Reason
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
     - <<: *version
       name: v1beta1
       served: true

diff --git a/config/core/resources/parallel.yaml b/config/core/resources/parallel.yaml
@@ -37,18 +37,18 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: URL
       type: string
       jsonPath: .status.address.url
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
   - <<: *version
     name: v1
     served: true

diff --git a/config/core/resources/pingsource.yaml b/config/core/resources/pingsource.yaml
@@ -45,18 +45,18 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type=='Ready')].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
     - name: Sink
       type: string
       jsonPath: .status.sinkUri
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type=='Ready')].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
   - << : *version
     name: v1alpha2
     served: true

diff --git a/config/core/resources/sequence.yaml b/config/core/resources/sequence.yaml
@@ -37,18 +37,18 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: URL
       type: string
       jsonPath: .status.address.url
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
   - <<: *version
     name: v1
     served: true

diff --git a/config/core/resources/sinkbindings.yaml b/config/core/resources/sinkbindings.yaml
@@ -40,18 +40,18 @@ spec:
           # see issue: https://github.com/knative/serving/issues/912
           x-kubernetes-preserve-unknown-fields: true
       additionalPrinterColumns:
-        - name: Ready
-          type: string
-          jsonPath: ".status.conditions[?(@.type=='Ready')].status"
-        - name: Reason
-          type: string
-          jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
         - name: Sink
           type: string
           jsonPath: ".status.sinkUri"
         - name: Age
           type: date
           jsonPath: .metadata.creationTimestamp
+        - name: Ready
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Ready')].status"
+        - name: Reason
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
     - <<: *version
       name: v1alpha2
       served: true

diff --git a/config/core/resources/subscription.yaml b/config/core/resources/subscription.yaml
@@ -36,15 +36,15 @@ spec:
         # see issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
     additionalPrinterColumns:
+    - name: Age
+      type: date
+      jsonPath: .metadata.creationTimestamp
     - name: Ready
       type: string
       jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
     - name: Reason
       type: string
       jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
-    - name: Age
-      type: date
-      jsonPath: .metadata.creationTimestamp
   - <<: *version
     name: v1
     served: true

diff --git a/config/core/resources/trigger.yaml b/config/core/resources/trigger.yaml
@@ -29,12 +29,6 @@ spec:
     subresources:
       status: {}
     additionalPrinterColumns:
-    - name: Ready
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
-    - name: Reason
-      type: string
-      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     - name: Broker
       type: string
       jsonPath: .spec.broker
@@ -44,6 +38,12 @@ spec:
     - name: Age
       type: date
       jsonPath: .metadata.creationTimestamp
+    - name: Ready
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Ready\")].reason"
     schema:
       openAPIV3Schema:
         type: object

diff --git a/docs/spec/sources.md b/docs/spec/sources.md
@@ -97,15 +97,15 @@ resource.
 
 ```yaml
 additionalPrinterColumns:
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   - name: Ready
     type: string
     JSONPath: '.status.conditions[?(@.type=="Ready")].status'
   - name: Reason
     type: string
     JSONPath: '.status.conditions[?(@.type=="Ready")].reason'
-  - name: Age
-    type: date
-    JSONPath: .metadata.creationTimestamp
 ```
 
 ### Source Validation