add image and storage to display when get obclsuter resource using ku…

…bectl -o wide (#639)
oceanbase · Nov 18, 2024 · 627024a · 627024a
1 parent 120fcfe
commit 627024a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/api/v1alpha1/obcluster_types.go b/api/v1alpha1/obcluster_types.go
@@ -60,8 +60,10 @@ type OBClusterStatus struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.status"
-//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+kubebuilder:printcolumn:name="ClusterName",type="string",JSONPath=".spec.clusterName"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+//+kubebuilder:printcolumn:name="Image",type="string",JSONPath=".spec.observer.image",priority=1
+//+kubebuilder:printcolumn:name="Storage",type="string",JSONPath=".spec.observer.storage",priority=1
 //+kubebuilder:printcolumn:name="Tasks",type="string",JSONPath=".status.operationContext.tasks",priority=1
 //+kubebuilder:printcolumn:name="Task",type="string",JSONPath=".status.operationContext.task",priority=1
 

diff --git a/config/crd/bases/oceanbase.oceanbase.com_obclusters.yaml b/config/crd/bases/oceanbase.oceanbase.com_obclusters.yaml
@@ -18,11 +18,19 @@ spec:
     - jsonPath: .status.status
       name: Status
       type: string
+    - jsonPath: .spec.clusterName
+      name: ClusterName
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    - jsonPath: .spec.clusterName
-      name: ClusterName
+    - jsonPath: .spec.observer.image
+      name: Image
+      priority: 1
+      type: string
+    - jsonPath: .spec.observer.storage
+      name: Storage
+      priority: 1
       type: string
     - jsonPath: .status.operationContext.tasks
       name: Tasks

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -6792,11 +6792,19 @@ spec:
     - jsonPath: .status.status
       name: Status
       type: string
+    - jsonPath: .spec.clusterName
+      name: ClusterName
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    - jsonPath: .spec.clusterName
-      name: ClusterName
+    - jsonPath: .spec.observer.image
+      name: Image
+      priority: 1
+      type: string
+    - jsonPath: .spec.observer.storage
+      name: Storage
+      priority: 1
       type: string
     - jsonPath: .status.operationContext.tasks
       name: Tasks