From 863e7de61608793dc0f690c67e6c1023b3654bac Mon Sep 17 00:00:00 2001
From: Navid Shaikh <nshaikh@redhat.com>
Date: Mon, 3 Aug 2020 14:02:01 +0530
Subject: [PATCH] Regroup additional printer columns

 - Put READY and REASON columns at right most position
---
 .../in-memory-channel/300-in-memory-channel.yaml     | 12 ++++++------
 config/core/resources/apiserversource.yaml           | 12 ++++++------
 config/core/resources/broker.yaml                    | 12 ++++++------
 config/core/resources/channel.yaml                   | 12 ++++++------
 config/core/resources/containersource.yaml           | 12 ++++++------
 config/core/resources/parallel.yaml                  | 12 ++++++------
 config/core/resources/pingsource.yaml                | 12 ++++++------
 config/core/resources/sequence.yaml                  | 12 ++++++------
 config/core/resources/sinkbindings.yaml              | 12 ++++++------
 config/core/resources/subscription.yaml              |  6 +++---
 config/core/resources/trigger.yaml                   | 12 ++++++------
 docs/spec/sources.md                                 |  6 +++---
 12 files changed, 66 insertions(+), 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
index 53b32383dba..4448289f476 100644
--- 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
index d1cd9184d42..ebce3c37094 100644
--- 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
index 5500a04cfa2..ca5588c156f 100644
--- 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
index ad9555ef272..bfa872003c1 100644
--- 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
index b767cb7a641..deda63a03fc 100644
--- 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
index 5bd8350964a..cae9c1b795f 100644
--- 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
index 10b827d07d6..82fd31b01dd 100644
--- 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
index e03f61f7432..208011f2ff2 100644
--- 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
index c141ff50587..366a3fa5ed3 100644
--- 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
index fd3e9ec8405..ca418f63c90 100644
--- 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
index 25d0aed65c6..e77984dd533 100644
--- 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
index abd35403e07..f7133ca8b4d 100644
--- 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