feat: update clusterscans and customchecks short names

undistro · Aug 19, 2023 · a2bded8 · a2bded8
1 parent 30bf280
commit a2bded8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/api/zora/v1alpha1/clusterscan_types.go b/api/zora/v1alpha1/clusterscan_types.go
@@ -233,7 +233,7 @@ type PluginScanStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:resource:shortName="cscan"
+//+kubebuilder:resource:shortName={scan,scans}
 //+kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".spec.clusterRef.name",priority=0
 //+kubebuilder:printcolumn:name="Schedule",type="string",JSONPath=".spec.schedule",priority=0
 //+kubebuilder:printcolumn:name="Suspend",type="boolean",JSONPath=".status.suspend",priority=0
@@ -243,8 +243,8 @@ type PluginScanStatus struct {
 //+kubebuilder:printcolumn:name="Last Successful",type="date",JSONPath=".status.lastSuccessfulTime",priority=0
 //+kubebuilder:printcolumn:name="Issues",type="integer",JSONPath=".status.totalIssues",priority=0
 //+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",priority=0
-//+kubebuilder:printcolumn:name="SaaS",type="string",JSONPath=".status.conditions[?(@.type==\"SaaS\")].reason",priority=0
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",priority=0
+//+kubebuilder:printcolumn:name="SaaS",type="string",JSONPath=".status.conditions[?(@.type==\"SaaS\")].reason",priority=1
 //+kubebuilder:printcolumn:name="Next Schedule",type="string",JSONPath=".status.nextScheduleTime",priority=1
 
 // ClusterScan is the Schema for the clusterscans API

diff --git a/api/zora/v1alpha1/customcheck_types.go b/api/zora/v1alpha1/customcheck_types.go
@@ -58,7 +58,7 @@ type CustomCheckStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:resource:shortName="checks"
+//+kubebuilder:resource:shortName={check,checks}
 //+kubebuilder:printcolumn:name="Message",type="string",JSONPath=".spec.message",priority=0
 //+kubebuilder:printcolumn:name="Severity",type="string",JSONPath=".spec.severity",priority=0
 //+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",priority=0

diff --git a/charts/zora/crds/zora.undistro.io_clusterscans.yaml b/charts/zora/crds/zora.undistro.io_clusterscans.yaml
@@ -27,7 +27,8 @@ spec:
     listKind: ClusterScanList
     plural: clusterscans
     shortNames:
-    - cscan
+    - scan
+    - scans
     singular: clusterscan
   scope: Namespaced
   versions:
@@ -59,12 +60,13 @@ spec:
     - jsonPath: .status.conditions[?(@.type=="Ready")].status
       name: Ready
       type: string
-    - jsonPath: .status.conditions[?(@.type=="SaaS")].reason
-      name: SaaS
-      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - jsonPath: .status.conditions[?(@.type=="SaaS")].reason
+      name: SaaS
+      priority: 1
+      type: string
     - jsonPath: .status.nextScheduleTime
       name: Next Schedule
       priority: 1

diff --git a/charts/zora/crds/zora.undistro.io_customchecks.yaml b/charts/zora/crds/zora.undistro.io_customchecks.yaml
@@ -27,6 +27,7 @@ spec:
     listKind: CustomCheckList
     plural: customchecks
     shortNames:
+    - check
     - checks
     singular: customcheck
   scope: Namespaced

diff --git a/config/crd/bases/zora.undistro.io_clusterscans.yaml b/config/crd/bases/zora.undistro.io_clusterscans.yaml
@@ -13,7 +13,8 @@ spec:
     listKind: ClusterScanList
     plural: clusterscans
     shortNames:
-    - cscan
+    - scan
+    - scans
     singular: clusterscan
   scope: Namespaced
   versions:
@@ -45,12 +46,13 @@ spec:
     - jsonPath: .status.conditions[?(@.type=="Ready")].status
       name: Ready
       type: string
-    - jsonPath: .status.conditions[?(@.type=="SaaS")].reason
-      name: SaaS
-      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - jsonPath: .status.conditions[?(@.type=="SaaS")].reason
+      name: SaaS
+      priority: 1
+      type: string
     - jsonPath: .status.nextScheduleTime
       name: Next Schedule
       priority: 1

diff --git a/config/crd/bases/zora.undistro.io_customchecks.yaml b/config/crd/bases/zora.undistro.io_customchecks.yaml
@@ -13,6 +13,7 @@ spec:
     listKind: CustomCheckList
     plural: customchecks
     shortNames:
+    - check
     - checks
     singular: customcheck
   scope: Namespaced