[EPMDEDP-12184]: chore: Add printcolumn in CRs for better UX

Enrich kubectl get output for EDP CRs Signed-off-by: Sergiy Kulanov <sergiy_kulanov@epam.com> Change-Id: If3a794d697f16c52017a3726567777c2bee9983d
epam · Jul 4, 2023 · 1d896e0 · 1d896e0
1 parent 6de2d77
commit 1d896e0
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 2 deletions.
diff --git a/api/v1/codebase_types.go b/api/v1/codebase_types.go
@@ -224,8 +224,11 @@ type CodebaseStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName=cdbs
 // +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type",description="Codebase type"
 // +kubebuilder:printcolumn:name="Available",type="boolean",JSONPath=".status.available",description="Is resource available"
 // +kubebuilder:printcolumn:name="Result",type="string",JSONPath=".status.result",description="Result of last action"
+// +kubebuilder:printcolumn:name="Default Branch",type="string",JSONPath=".spec.defaultBranch",description="Default Branch"
+// +kubebuilder:printcolumn:name="GitWebUrl",type="string",JSONPath=".status.gitWebUrl",description="Repository Web URL"
 
 // Codebase is the Schema for the Codebases API.
 type Codebase struct {

diff --git a/api/v1/codebasebranch_types.go b/api/v1/codebasebranch_types.go
@@ -85,6 +85,8 @@ type CodebaseBranchStatus struct {
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Result",type="string",JSONPath=".status.result",description="Result of last action"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.status",description="The status of codebasebranch"
+// +kubebuilder:printcolumn:name="Codebase Name",type="string",JSONPath=".spec.codebaseName",description="Owner of object"
+// +kubebuilder:printcolumn:name="Release",type="boolean",JSONPath=".spec.release",description="Is a release branch"
 
 // CodebaseBranch is the Schema for the CodebaseBranches API.
 type CodebaseBranch struct {

diff --git a/api/v1/codebaseimagestream_types.go b/api/v1/codebaseimagestream_types.go
@@ -40,6 +40,7 @@ type CodebaseImageStreamStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:shortName=cbis
 // +kubebuilder:storageversion
+// +kubebuilder:printcolumn:name="Codebase Name",type="string",JSONPath=".spec.codebase",description="Owner of object"
 
 // CodebaseImageStream is the Schema for the CodebaseImageStreams API.
 type CodebaseImageStream struct {

diff --git a/api/v1/git_server_types.go b/api/v1/git_server_types.go
@@ -68,6 +68,8 @@ type GitServerStatus struct {
 // +kubebuilder:resource:shortName=gs
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Available",type="boolean",JSONPath=".status.available",description="Is resource available"
+// +kubebuilder:printcolumn:name="Host",type="string",JSONPath=".spec.gitHost",description="GitSever host"
+// +kubebuilder:printcolumn:name="Git Provider",type="string",JSONPath=".spec.gitProvider",description="Git Provider type"
 
 // GitServer is the Schema for the gitservers API.
 type GitServer struct {

diff --git a/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml b/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml
@@ -26,6 +26,14 @@ spec:
       jsonPath: .status.status
       name: Status
       type: string
+    - description: Owner of object
+      jsonPath: .spec.codebaseName
+      name: Codebase Name
+      type: string
+    - description: Is a release branch
+      jsonPath: .spec.release
+      name: Release
+      type: boolean
     name: v1
     schema:
       openAPIV3Schema:

diff --git a/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml b/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml
@@ -17,7 +17,12 @@ spec:
     singular: codebaseimagestream
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - description: Owner of object
+      jsonPath: .spec.codebase
+      name: Codebase Name
+      type: string
+    name: v1
     schema:
       openAPIV3Schema:
         description: CodebaseImageStream is the Schema for the CodebaseImageStreams

diff --git a/config/crd/bases/v2.edp.epam.com_codebases.yaml b/config/crd/bases/v2.edp.epam.com_codebases.yaml
@@ -18,6 +18,10 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - description: Codebase type
+      jsonPath: .spec.type
+      name: Type
+      type: string
     - description: Is resource available
       jsonPath: .status.available
       name: Available
@@ -26,6 +30,14 @@ spec:
       jsonPath: .status.result
       name: Result
       type: string
+    - description: Default Branch
+      jsonPath: .spec.defaultBranch
+      name: Default Branch
+      type: string
+    - description: Repository Web URL
+      jsonPath: .status.gitWebUrl
+      name: GitWebUrl
+      type: string
     name: v1
     schema:
       openAPIV3Schema:

diff --git a/config/crd/bases/v2.edp.epam.com_gitservers.yaml b/config/crd/bases/v2.edp.epam.com_gitservers.yaml
@@ -22,6 +22,14 @@ spec:
       jsonPath: .status.available
       name: Available
       type: boolean
+    - description: GitSever host
+      jsonPath: .spec.gitHost
+      name: Host
+      type: string
+    - description: Git Provider type
+      jsonPath: .spec.gitProvider
+      name: Git Provider
+      type: string
     name: v1
     schema:
       openAPIV3Schema:

diff --git a/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml b/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml
@@ -26,6 +26,14 @@ spec:
       jsonPath: .status.status
       name: Status
       type: string
+    - description: Owner of object
+      jsonPath: .spec.codebaseName
+      name: Codebase Name
+      type: string
+    - description: Is a release branch
+      jsonPath: .spec.release
+      name: Release
+      type: boolean
     name: v1
     schema:
       openAPIV3Schema:

diff --git a/deploy-templates/crds/v2.edp.epam.com_codebaseimagestreams.yaml b/deploy-templates/crds/v2.edp.epam.com_codebaseimagestreams.yaml
@@ -17,7 +17,12 @@ spec:
     singular: codebaseimagestream
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - description: Owner of object
+      jsonPath: .spec.codebase
+      name: Codebase Name
+      type: string
+    name: v1
     schema:
       openAPIV3Schema:
         description: CodebaseImageStream is the Schema for the CodebaseImageStreams

diff --git a/deploy-templates/crds/v2.edp.epam.com_codebases.yaml b/deploy-templates/crds/v2.edp.epam.com_codebases.yaml
@@ -18,6 +18,10 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - description: Codebase type
+      jsonPath: .spec.type
+      name: Type
+      type: string
     - description: Is resource available
       jsonPath: .status.available
       name: Available
@@ -26,6 +30,14 @@ spec:
       jsonPath: .status.result
       name: Result
       type: string
+    - description: Default Branch
+      jsonPath: .spec.defaultBranch
+      name: Default Branch
+      type: string
+    - description: Repository Web URL
+      jsonPath: .status.gitWebUrl
+      name: GitWebUrl
+      type: string
     name: v1
     schema:
       openAPIV3Schema:

diff --git a/deploy-templates/crds/v2.edp.epam.com_gitservers.yaml b/deploy-templates/crds/v2.edp.epam.com_gitservers.yaml
@@ -22,6 +22,14 @@ spec:
       jsonPath: .status.available
       name: Available
       type: boolean
+    - description: GitSever host
+      jsonPath: .spec.gitHost
+      name: Host
+      type: string
+    - description: Git Provider type
+      jsonPath: .spec.gitProvider
+      name: Git Provider
+      type: string
     name: v1
     schema:
       openAPIV3Schema: