Merge pull request #181 from abays/cli_status

openshift-merge-bot[bot] · web-flow · commit 336a1272b72d · 2024-11-06T12:54:49.000Z
Add missing status message to resources in CLI
diff --git a/api/bases/barbican.openstack.org_barbicanapis.yaml b/api/bases/barbican.openstack.org_barbicanapis.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbicanapi
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: BarbicanAPI is the Schema for the barbicanapis API
diff --git a/api/bases/barbican.openstack.org_barbicankeystonelisteners.yaml b/api/bases/barbican.openstack.org_barbicankeystonelisteners.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbicankeystonelistener
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: BarbicanKeystoneListener is the Schema for the barbicankeystonelistener
diff --git a/api/bases/barbican.openstack.org_barbicans.yaml b/api/bases/barbican.openstack.org_barbicans.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbican
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: Barbican is the Schema for the barbicans API
diff --git a/api/bases/barbican.openstack.org_barbicanworkers.yaml b/api/bases/barbican.openstack.org_barbicanworkers.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbicanworker
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: BarbicanWorker is the Schema for the barbicanworkers API
diff --git a/api/v1beta1/barbican_types.go b/api/v1beta1/barbican_types.go
@@ -125,6 +125,8 @@ type BarbicanStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
+//+kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
 
 // Barbican is the Schema for the barbicans API
 type Barbican struct {
diff --git a/api/v1beta1/barbicanapi_types.go b/api/v1beta1/barbicanapi_types.go
@@ -96,6 +96,8 @@ type BarbicanAPIStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
+//+kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
 
 // BarbicanAPI is the Schema for the barbicanapis API
 type BarbicanAPI struct {
diff --git a/api/v1beta1/barbicankeystonelistener_types.go b/api/v1beta1/barbicankeystonelistener_types.go
@@ -76,6 +76,8 @@ type BarbicanKeystoneListenerStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
+//+kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
 
 // BarbicanKeystoneListener is the Schema for the barbicankeystonelistener API
 type BarbicanKeystoneListener struct {
diff --git a/api/v1beta1/barbicanworker_types.go b/api/v1beta1/barbicanworker_types.go
@@ -79,6 +79,8 @@ type BarbicanWorkerStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
+//+kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
 
 // BarbicanWorker is the Schema for the barbicanworkers API
 type BarbicanWorker struct {
diff --git a/config/crd/bases/barbican.openstack.org_barbicanapis.yaml b/config/crd/bases/barbican.openstack.org_barbicanapis.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbicanapi
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: BarbicanAPI is the Schema for the barbicanapis API
diff --git a/config/crd/bases/barbican.openstack.org_barbicankeystonelisteners.yaml b/config/crd/bases/barbican.openstack.org_barbicankeystonelisteners.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbicankeystonelistener
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: BarbicanKeystoneListener is the Schema for the barbicankeystonelistener
diff --git a/config/crd/bases/barbican.openstack.org_barbicans.yaml b/config/crd/bases/barbican.openstack.org_barbicans.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbican
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: Barbican is the Schema for the barbicans API
diff --git a/config/crd/bases/barbican.openstack.org_barbicanworkers.yaml b/config/crd/bases/barbican.openstack.org_barbicanworkers.yaml
@@ -15,7 +15,16 @@ spec:
     singular: barbicanworker
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - additionalPrinterColumns:
+    - description: Status
+      jsonPath: .status.conditions[0].status
+      name: Status
+      type: string
+    - description: Message
+      jsonPath: .status.conditions[0].message
+      name: Message
+      type: string
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: BarbicanWorker is the Schema for the barbicanworkers API
diff --git a/config/manifests/bases/barbican-operator.clusterserviceversion.yaml b/config/manifests/bases/barbican-operator.clusterserviceversion.yaml
@@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: "[]"
+    alm-examples: '[]'
     capabilities: Basic Install
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "true"
@@ -18,55 +18,55 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-      - description: BarbicanAPI is the Schema for the barbicanapis API
-        displayName: Barbican API
-        kind: BarbicanAPI
-        name: barbicanapis.barbican.openstack.org
-        specDescriptors:
-          - description: TLS - Parameters related to the TLS
-            displayName: TLS
-            path: tls
-        version: v1beta1
-      - description: Barbican is the Schema for the barbicans API
-        displayName: Barbican
-        kind: Barbican
-        name: barbicans.barbican.openstack.org
-        specDescriptors:
-          - description: TLS - Parameters related to the TLS
-            displayName: TLS
-            path: barbicanAPI.tls
-        version: v1beta1
-      - description: BarbicanWorker is the Schema for the barbicanworkers API
-        displayName: Barbican Worker
-        kind: BarbicanWorker
-        name: barbicanworkers.barbican.openstack.org
-        specDescriptors:
-          - description: TLS - Parameters related to the TLS
-            displayName: TLS
-            path: tls
-        version: v1beta1
+    - description: BarbicanAPI is the Schema for the barbicanapis API
+      displayName: Barbican API
+      kind: BarbicanAPI
+      name: barbicanapis.barbican.openstack.org
+      specDescriptors:
+      - description: TLS - Parameters related to the TLS
+        displayName: TLS
+        path: tls
+      version: v1beta1
+    - description: Barbican is the Schema for the barbicans API
+      displayName: Barbican
+      kind: Barbican
+      name: barbicans.barbican.openstack.org
+      specDescriptors:
+      - description: TLS - Parameters related to the TLS
+        displayName: TLS
+        path: barbicanAPI.tls
+      version: v1beta1
+    - description: BarbicanWorker is the Schema for the barbicanworkers API
+      displayName: Barbican Worker
+      kind: BarbicanWorker
+      name: barbicanworkers.barbican.openstack.org
+      specDescriptors:
+      - description: TLS - Parameters related to the TLS
+        displayName: TLS
+        path: tls
+      version: v1beta1
   description: Barbican Operator
   displayName: Barbican Operator
   install:
     spec:
       deployments: null
     strategy: ""
   installModes:
-    - supported: true
-      type: OwnNamespace
-    - supported: true
-      type: SingleNamespace
-    - supported: false
-      type: MultiNamespace
-    - supported: true
-      type: AllNamespaces
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
   keywords:
-    - OpenStack
-    - KeyManager
-    - Barbican
+  - OpenStack
+  - KeyManager
+  - Barbican
   links:
-    - name: Barbican Operator
-      url: https://github.com/openstack-k8s-operators/barbican-operator
+  - name: Barbican Operator
+    url: https://github.com/openstack-k8s-operators/barbican-operator
   maturity: beta
   provider:
     name: Red Hat Inc.
