Replace tableconvertor with APC (#20)

mszostok · May 14, 2019 · efc7657 · efc7657
1 parent ecc9d78
commit efc7657
Show file tree

Hide file tree

Showing 45 changed files with 576 additions and 77 deletions.
diff --git a/charts/catalog/templates/crds.yaml b/charts/catalog/templates/crds.yaml
@@ -12,6 +12,16 @@ spec:
     plural: clusterservicebrokers
     singular: clusterservicebroker
     kind: ClusterServiceBroker
+  additionalPrinterColumns:
+    - name: URL
+      type: string
+      JSONPath: .spec.url
+    - name: Status
+      type: string
+      JSONPath: .status.lastConditionState
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -31,6 +41,16 @@ spec:
     plural: servicebrokers
     singular: servicebroker
     kind: ServiceBroker
+  additionalPrinterColumns:
+  - name: URL
+    type: string
+    JSONPath: .spec.url
+  - name: Status
+    type: string
+    JSONPath: .status.lastConditionState
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -50,6 +70,16 @@ spec:
     plural: serviceclasses
     singular: serviceclass
     kind: ServiceClass
+  additionalPrinterColumns:
+  - name: External-Name
+    type: string
+    JSONPath: .spec.externalName
+  - name: Broker
+    type: string
+    JSONPath: .spec.clusterServiceBrokerName
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -69,6 +99,16 @@ spec:
     plural: clusterserviceclasses
     singular: clusterserviceclass
     kind: ClusterServiceClass
+  additionalPrinterColumns:
+  - name: External-Name
+    type: string
+    JSONPath: .spec.externalName
+  - name: Broker
+    type: string
+    JSONPath: .spec.clusterServiceBrokerName
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -88,6 +128,19 @@ spec:
     plural: serviceplans
     singular: serviceplan
     kind: ServicePlan
+  additionalPrinterColumns:
+  - name: External-Name
+    type: string
+    JSONPath: .spec.externalName
+  - name: Broker
+    type: string
+    JSONPath: .spec.serviceBrokerName
+  - name: Class
+    type: string
+    JSONPath: .spec.serviceClassRef.Name
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -107,6 +160,19 @@ spec:
     plural: clusterserviceplans
     singular: clusterserviceplan
     kind: ClusterServicePlan
+  additionalPrinterColumns:
+  - name: External-Name
+    type: string
+    JSONPath: .spec.externalName
+  - name: Broker
+    type: string
+    JSONPath: .spec.clusterServiceBrokerName
+  - name: Class
+    type: string
+    JSONPath: .spec.clusterServiceClassRef.name
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -126,6 +192,19 @@ spec:
     plural: serviceinstances
     singular: serviceinstance
     kind: ServiceInstance
+  additionalPrinterColumns:
+  - name: Class
+    type: string
+    JSONPath: .status.userSpecifiedClassName
+  - name: Plan
+    type: string
+    JSONPath: .status.userSpecifiedPlanName
+  - name: Status
+    type: string
+    JSONPath: .status.lastConditionState
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
@@ -145,7 +224,20 @@ spec:
     plural: servicebindings
     singular: servicebinding
     kind: ServiceBinding
+  additionalPrinterColumns:
+  - name: Service-Instance
+    type: string
+    JSONPath: .spec.instanceRef.name
+  - name: Secret-Name
+    type: string
+    JSONPath: .spec.secretName
+  - name: Status
+    type: string
+    JSONPath: .status.lastConditionState
+  - name: Age
+    type: date
+    JSONPath: .metadata.creationTimestamp
   subresources:
     status: {}
 
----
+---
diff --git a/charts/catalog/values.yaml b/charts/catalog/values.yaml
@@ -1,6 +1,6 @@
 # Default values for Service Catalog
 # service-catalog image to use
-image: eu.gcr.io/kyma-project/develop/service-catalog/service-catalog-amd64:crd-0.0.5
+image: eu.gcr.io/kyma-project/develop/service-catalog/service-catalog-amd64:crd-0.0.11
 # imagePullPolicy for the service-catalog; valid values are "IfNotPresent",
 # "Never", and "Always"
 imagePullPolicy: Always

diff --git a/cmd/svcat/testdata/output/get-binding.json b/cmd/svcat/testdata/output/get-binding.json
@@ -58,6 +58,7 @@
          "parameterChecksum": "23ca85e0f9fc05340ea0a13ef945602cd5cdc3f52d763e750cb0ab0cb172a94f"
       },
       "orphanMitigationInProgress": false,
-      "unbindStatus": "Required"
+      "unbindStatus": "Required",
+      "lastConditionState": "Ready"
    }
 }
diff --git a/cmd/svcat/testdata/output/get-binding.yaml b/cmd/svcat/testdata/output/get-binding.yaml
@@ -39,6 +39,7 @@ status:
         ps2: two
       secretparam1: <redacted>
       secretparam2: <redacted>
+  lastConditionState: Ready
   orphanMitigationInProgress: false
   reconciledGeneration: 1
   unbindStatus: Required
diff --git a/cmd/svcat/testdata/output/get-bindings.json b/cmd/svcat/testdata/output/get-bindings.json
@@ -42,7 +42,8 @@
                "parameterChecksum": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a"
             },
             "orphanMitigationInProgress": false,
-            "unbindStatus": "Required"
+            "unbindStatus": "Required",
+            "lastConditionState": "Ready"
          }
       }
    ]

diff --git a/cmd/svcat/testdata/output/get-bindings.yaml b/cmd/svcat/testdata/output/get-bindings.yaml
@@ -26,6 +26,7 @@ items:
     externalProperties:
       parameterChecksum: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
       parameters: {}
+    lastConditionState: Ready
     orphanMitigationInProgress: false
     reconciledGeneration: 1
     unbindStatus: Required

diff --git a/cmd/svcat/testdata/output/get-broker.json b/cmd/svcat/testdata/output/get-broker.json
@@ -27,6 +27,7 @@
          }
       ],
       "reconciledGeneration": 2,
-      "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
+      "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z",
+      "lastConditionState": "Ready"
    }
 }
diff --git a/cmd/svcat/testdata/output/get-broker.yaml b/cmd/svcat/testdata/output/get-broker.yaml
@@ -20,4 +20,5 @@ status:
     status: "True"
     type: Ready
   lastCatalogRetrievalTime: "2018-01-12T02:10:27Z"
+  lastConditionState: Ready
   reconciledGeneration: 2
diff --git a/cmd/svcat/testdata/output/get-brokers.json b/cmd/svcat/testdata/output/get-brokers.json
@@ -28,7 +28,8 @@
             }
          ],
          "reconciledGeneration": 2,
-         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
+         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z",
+         "lastConditionState": "Ready"
       }
    },
    {
@@ -60,7 +61,8 @@
             }
          ],
          "reconciledGeneration": 2,
-         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
+         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z",
+         "lastConditionState": "Ready"
       }
    }
 ]
diff --git a/cmd/svcat/testdata/output/get-brokers.yaml b/cmd/svcat/testdata/output/get-brokers.yaml
@@ -20,6 +20,7 @@
       status: "True"
       type: Ready
     lastCatalogRetrievalTime: "2018-01-12T02:10:27Z"
+    lastConditionState: Ready
     reconciledGeneration: 2
 - metadata:
     creationTimestamp: "2018-01-11T20:53:30Z"
@@ -43,4 +44,5 @@
       status: "True"
       type: Ready
     lastCatalogRetrievalTime: "2018-01-12T02:10:27Z"
+    lastConditionState: Ready
     reconciledGeneration: 2
diff --git a/cmd/svcat/testdata/output/get-instance.json b/cmd/svcat/testdata/output/get-instance.json
@@ -67,6 +67,9 @@
          "parameterChecksum": "23ca85e0f9fc05340ea0a13ef945602cd5cdc3f52d763e750cb0ab0cb172a94f"
       },
       "provisionStatus": "",
-      "deprovisionStatus": "Required"
+      "deprovisionStatus": "Required",
+      "lastConditionState": "Ready",
+      "userSpecifiedPlanName": "",
+      "userSpecifiedClassName": ""
    }
 }
diff --git a/cmd/svcat/testdata/output/get-instance.yaml b/cmd/svcat/testdata/output/get-instance.yaml
@@ -46,7 +46,10 @@ status:
         ps2: two
       secretparam1: <redacted>
       secretparam2: <redacted>
+  lastConditionState: Ready
   observedGeneration: 0
   orphanMitigationInProgress: false
   provisionStatus: ""
   reconciledGeneration: 1
+  userSpecifiedClassName: ""
+  userSpecifiedPlanName: ""
diff --git a/cmd/svcat/testdata/output/get-instances.json b/cmd/svcat/testdata/output/get-instances.json
@@ -51,7 +51,10 @@
                "parameterChecksum": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a"
             },
             "provisionStatus": "",
-            "deprovisionStatus": "Required"
+            "deprovisionStatus": "Required",
+            "lastConditionState": "Ready",
+            "userSpecifiedPlanName": "",
+            "userSpecifiedClassName": ""
          }
       }
    ]

diff --git a/cmd/svcat/testdata/output/get-instances.yaml b/cmd/svcat/testdata/output/get-instances.yaml
@@ -33,10 +33,13 @@ items:
       clusterServicePlanExternalName: default
       parameterChecksum: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
       parameters: {}
+    lastConditionState: Ready
     observedGeneration: 0
     orphanMitigationInProgress: false
     provisionStatus: ""
     reconciledGeneration: 1
+    userSpecifiedClassName: ""
+    userSpecifiedPlanName: ""
 metadata:
   resourceVersion: "109"
   selfLink: /apis/servicecatalog.k8s.io/v1beta1/serviceinstances
diff --git a/cmd/svcat/testdata/responses/catalog/clusterservicebrokers.json b/cmd/svcat/testdata/responses/catalog/clusterservicebrokers.json
@@ -34,6 +34,7 @@
             "message": "Successfully fetched catalog entries from broker."
           }
         ],
+        "lastConditionState": "Ready",
         "reconciledGeneration": 2,
         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
       }

diff --git a/cmd/svcat/testdata/responses/catalog/clusterservicebrokers/ups-broker.json b/cmd/svcat/testdata/responses/catalog/clusterservicebrokers/ups-broker.json
@@ -28,6 +28,7 @@
         "message": "Successfully fetched catalog entries from broker."
       }
     ],
+    "lastConditionState": "Ready",
     "reconciledGeneration": 2,
     "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
   }

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebindings.json b/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebindings.json
@@ -37,6 +37,7 @@
             "message": "Injected bind result"
           }
         ],
+        "lastConditionState": "Ready",
         "asyncOpInProgress": false,
         "reconciledGeneration": 1,
         "externalProperties": {

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebindings/ups-binding.json b/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebindings/ups-binding.json
@@ -31,6 +31,7 @@
         "message": "Injected bind result"
       }
     ],
+    "lastConditionState": "Ready",
     "asyncOpInProgress": false,
     "reconciledGeneration": 1,
     "externalProperties": {

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebrokers.json b/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebrokers.json
@@ -34,6 +34,7 @@
             "message": "Successfully fetched catalog entries from broker."
           }
         ],
+        "lastConditionState": "Ready",
         "reconciledGeneration": 2,
         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
       }

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebrokers/ups-broker.json b/cmd/svcat/testdata/responses/catalog/namespaces/default/servicebrokers/ups-broker.json
@@ -28,6 +28,7 @@
         "message": "Successfully fetched catalog entries from broker."
       }
     ],
+    "lastConditionState": "Ready",
     "reconciledGeneration": 2,
     "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
   }

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/default/serviceinstances.json b/cmd/svcat/testdata/responses/catalog/namespaces/default/serviceinstances.json
@@ -42,6 +42,7 @@
             "message": "The instance was provisioned successfully"
           }
         ],
+        "lastConditionState": "Ready",
         "asyncOpInProgress": false,
         "orphanMitigationInProgress": false,
         "reconciledGeneration": 1,

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/default/serviceinstances/ups-instance.json b/cmd/svcat/testdata/responses/catalog/namespaces/default/serviceinstances/ups-instance.json
@@ -36,6 +36,7 @@
         "message": "The instance was provisioned successfully"
       }
     ],
+    "lastConditionState": "Ready",
     "asyncOpInProgress": false,
     "orphanMitigationInProgress": false,
     "reconciledGeneration": 1,

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebindings.json b/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebindings.json
@@ -44,7 +44,8 @@
           "parameterChecksum": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a"
         },
         "orphanMitigationInProgress": false,
-        "unbindStatus": "Required"
+        "unbindStatus": "Required",
+        "lastConditionState": "Ready"
       }
     }
   ]

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebindings/ups-binding.json b/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebindings/ups-binding.json
@@ -34,6 +34,7 @@
         "message": "Injected bind result"
       }
     ],
+    "lastConditionState": "Ready",
     "asyncOpInProgress": false,
     "reconciledGeneration": 1,
     "externalProperties": {

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebrokers.json b/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebrokers.json
@@ -35,6 +35,7 @@
             "message": "Successfully fetched catalog entries from broker."
           }
         ],
+        "lastConditionState": "Ready",
         "reconciledGeneration": 2,
         "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
       }

diff --git a/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebrokers/ups-broker-ns.json b/cmd/svcat/testdata/responses/catalog/namespaces/test-ns/servicebrokers/ups-broker-ns.json
@@ -29,6 +29,7 @@
         "message": "Successfully fetched catalog entries from broker."
       }
     ],
+    "lastConditionState": "Ready",
     "reconciledGeneration": 2,
     "lastCatalogRetrievalTime": "2018-01-12T02:10:27Z"
   }