Merge pull request #385 from Abirdcfly/main

feat: add printcolumn for cpl and sub
kubebb · Oct 27, 2023 · 6796675 · 6796675
2 parents 2b04f6a + f11a63b
commit 6796675
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/api/v1alpha1/componentplan_types.go b/api/v1alpha1/componentplan_types.go
@@ -85,6 +85,8 @@ type Resource struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:scope=Namespaced,shortName=cpl;cpls
+//+kubebuilder:printcolumn:name="cpl-name",type=string,JSONPath=`.spec.name`
+//+kubebuilder:printcolumn:name="cp-name",type=string,JSONPath=`.spec.component.name`
 
 // ComponentPlan is the Schema for the componentplans API
 type ComponentPlan struct {

diff --git a/api/v1alpha1/subscription_types.go b/api/v1alpha1/subscription_types.go
@@ -93,6 +93,8 @@ type RepositoryHealth struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:scope=Namespaced,shortName=sub;subs
+//+kubebuilder:printcolumn:name="sub-name",type=string,JSONPath=`.spec.name`
+//+kubebuilder:printcolumn:name="cp-name",type=string,JSONPath=`.spec.component.name`
 
 // Subscription is the Schema for the subscriptions API
 type Subscription struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.kubebb.k8s.com.cn_componentplans.yaml b/config/crd/bases/core.kubebb.k8s.com.cn_componentplans.yaml
@@ -18,7 +18,14 @@ spec:
     singular: componentplan
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.name
+      name: cpl-name
+      type: string
+    - jsonPath: .spec.component.name
+      name: cp-name
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ComponentPlan is the Schema for the componentplans API

diff --git a/config/crd/bases/core.kubebb.k8s.com.cn_subscriptions.yaml b/config/crd/bases/core.kubebb.k8s.com.cn_subscriptions.yaml
@@ -18,7 +18,14 @@ spec:
     singular: subscription
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.name
+      name: sub-name
+      type: string
+    - jsonPath: .spec.component.name
+      name: cp-name
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Subscription is the Schema for the subscriptions API