Merge pull request #244 from troy0820/troy0820/fix-printer-column-out…

…puts fix printer columns
getporter · Aug 9, 2023 · c62b916 · c62b916
2 parents 4232163 + a67c5c2
commit c62b916
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/api/v1/installation_types.go b/api/v1/installation_types.go
@@ -113,11 +113,10 @@ type InstallationStatus struct {
 // +kubebuilder:subresource:status
 
 // Installation is the Schema for the installations API
-// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".metadata.Namespace"
-// +kubebuilder:printcolumn:name="Porter Namespace",type="string",JSONPath=".spec.Namespace"
-// +kubebuilder:printcolumn:name="Name",type="string",JSONPath=".spec.Name"
-// +kubebuilder:printcolumn:name="Last Action",type="string",JSONPath=".status.PorterResourceStatus.Action"
-// +kubebuilder:printcolumn:name="Last Status",type="string",JSONPath=".status.PorterResourceStatus.Phase"
+// +kubebuilder:printcolumn:name="Porter Name",type="string",JSONPath=".spec.name"
+// +kubebuilder:printcolumn:name="Porter Namespace",type="string",JSONPath=".spec.namespace"
+// +kubebuilder:printcolumn:name="Last Action",type="string",JSONPath=".status.action.name"
+// +kubebuilder:printcolumn:name="Last Status",type="string",JSONPath=".status.phase"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type Installation struct {
 	metav1.TypeMeta   `json:",inline"`

diff --git a/config/crd/bases/getporter.org_installations.yaml b/config/crd/bases/getporter.org_installations.yaml
@@ -16,19 +16,16 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .metadata.Namespace
-      name: Namespace
+    - jsonPath: .spec.name
+      name: Porter Name
       type: string
-    - jsonPath: .spec.Namespace
+    - jsonPath: .spec.namespace
       name: Porter Namespace
       type: string
-    - jsonPath: .spec.Name
-      name: Name
-      type: string
-    - jsonPath: .status.PorterResourceStatus.Action
+    - jsonPath: .status.action.name
       name: Last Action
       type: string
-    - jsonPath: .status.PorterResourceStatus.Phase
+    - jsonPath: .status.phase
       name: Last Status
       type: string
     - jsonPath: .metadata.creationTimestamp