add kubectl printcolumn

Signed-off-by: frezes <[email protected]>
WizTelemetry · Jan 9, 2024 · 5ff9dee · 5ff9dee
1 parent e40242b
commit 5ff9dee
Show file tree

Hide file tree

Showing 11 changed files with 190 additions and 32 deletions.
diff --git a/config/crd/bases/monitoring.whizard.io_compactors.yaml b/config/crd/bases/monitoring.whizard.io_compactors.yaml
@@ -14,7 +14,19 @@ spec:
     singular: compactor
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - description: The storage for service
+      jsonPath: .spec.disableDownsampling
+      name: DisableDownsampling
+      type: boolean
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Compactor is the Schema for the Compactor API
@@ -1427,6 +1439,25 @@ spec:
                       More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              retention:
+                description: Retention configs how long to retain samples
+                properties:
+                  retention1h:
+                    description: Retention1h specifies how long to retain samples
+                      of 1h resolution in bucket
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  retention5m:
+                    description: Retention5m specifies how long to retain samples
+                      of 5m resolution in bucket
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  retentionRaw:
+                    description: RetentionRaw specifies how long to retain raw samples
+                      in bucket
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                type: object
               secrets:
                 description: Secrets is a list of Secrets in the same namespace as
                   the component object, which shall be mounted into the Prometheus

diff --git a/config/crd/bases/monitoring.whizard.io_gateways.yaml b/config/crd/bases/monitoring.whizard.io_gateways.yaml
@@ -14,7 +14,19 @@ spec:
     singular: gateway
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.Node
+      name: Replicas
+      type: integer
+    - description: The nodePort of Gateway service
+      jsonPath: .spec.nodePort
+      name: NodePort
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Gateway is the Schema for the monitoring gateway API

diff --git a/config/crd/bases/monitoring.whizard.io_ingesters.yaml b/config/crd/bases/monitoring.whizard.io_ingesters.yaml
@@ -14,7 +14,19 @@ spec:
     singular: ingester
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - description: How long to retain raw samples on local storage.
+      jsonPath: .spec.localTsdbRetention
+      name: LocalTsdbRetention
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Ingester is the Schema for the Ingester API

diff --git a/config/crd/bases/monitoring.whizard.io_queries.yaml b/config/crd/bases/monitoring.whizard.io_queries.yaml
@@ -14,7 +14,15 @@ spec:
     singular: query
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Query is the Schema for the monitoring query API

diff --git a/config/crd/bases/monitoring.whizard.io_queryfrontends.yaml b/config/crd/bases/monitoring.whizard.io_queryfrontends.yaml
@@ -14,7 +14,15 @@ spec:
     singular: queryfrontend
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: QueryFrontend is the Schema for the monitoring queryfrontend

diff --git a/config/crd/bases/monitoring.whizard.io_routers.yaml b/config/crd/bases/monitoring.whizard.io_routers.yaml
@@ -14,7 +14,19 @@ spec:
     singular: router
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - description: How many times to replicate incoming write requests
+      jsonPath: .spec.replicationFactor
+      name: ReplicationFactor
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Router is the Schema for the monitoring router API

diff --git a/config/crd/bases/monitoring.whizard.io_rulers.yaml b/config/crd/bases/monitoring.whizard.io_rulers.yaml
@@ -14,7 +14,15 @@ spec:
     singular: ruler
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Ruler is the Schema for the Ruler API

diff --git a/config/crd/bases/monitoring.whizard.io_services.yaml b/config/crd/bases/monitoring.whizard.io_services.yaml
@@ -14,7 +14,15 @@ spec:
     singular: service
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The storage for service
+      jsonPath: .spec.storage.name
+      name: Storage
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Service is the Schema for the monitoring service API
@@ -1504,6 +1512,25 @@ spec:
                           Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                         type: object
                     type: object
+                  retention:
+                    description: Retention configs how long to retain samples
+                    properties:
+                      retention1h:
+                        description: Retention1h specifies how long to retain samples
+                          of 1h resolution in bucket
+                        pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                        type: string
+                      retention5m:
+                        description: Retention5m specifies how long to retain samples
+                          of 5m resolution in bucket
+                        pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                        type: string
+                      retentionRaw:
+                        description: RetentionRaw specifies how long to retain raw
+                          samples in bucket
+                        pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                        type: string
+                    type: object
                   secrets:
                     description: Secrets is a list of Secrets in the same namespace
                       as the component object, which shall be mounted into the Prometheus
@@ -4460,8 +4487,8 @@ spec:
                     default: 3h
                     description: "DefaultIngesterRetentionPeriod Whizard default ingester
                       retention period when it has no tenant. \n Default: \"3h\""
-                    format: int64
-                    type: integer
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
                   defaultTenantsPerIngester:
                     default: 3
                     description: "DefaultTenantsPerIngester Whizard default tenant

diff --git a/config/crd/bases/monitoring.whizard.io_stores.yaml b/config/crd/bases/monitoring.whizard.io_stores.yaml
@@ -14,7 +14,15 @@ spec:
     singular: store
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Store is the Schema for the Store API

diff --git a/pkg/api/monitoring/v1alpha1/service_types.go b/pkg/api/monitoring/v1alpha1/service_types.go
@@ -20,8 +20,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"time"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -73,7 +71,7 @@ type IngesterTemplateSpec struct {
 	//
 	// Default: "3h"
 	// +kubebuilder:default:="3h"
-	DefaultIngesterRetentionPeriod time.Duration `json:"defaultIngesterRetentionPeriod,omitempty"`
+	DefaultIngesterRetentionPeriod Duration `json:"defaultIngesterRetentionPeriod,omitempty"`
 }
 
 type CompactorTemplateSpec struct {
@@ -119,9 +117,12 @@ type ServiceStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Storage",type="string",JSONPath=".spec.storage.name",description="The storage for service"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Service is the Schema for the monitoring service API
 type Service struct {

diff --git a/pkg/api/monitoring/v1alpha1/types.go b/pkg/api/monitoring/v1alpha1/types.go
@@ -159,9 +159,13 @@ type GatewayStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="NodePort",type="integer",JSONPath=".spec.nodePort",description="The nodePort of Gateway service"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Gateway is the Schema for the monitoring gateway API
 type Gateway struct {
@@ -252,9 +256,12 @@ type QueryStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Query is the Schema for the monitoring query API
 type Query struct {
@@ -290,9 +297,13 @@ type RouterStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="ReplicationFactor",type="integer",JSONPath=".spec.replicationFactor",description="How many times to replicate incoming write requests"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Router is the Schema for the monitoring router API
 type Router struct {
@@ -350,9 +361,12 @@ type QueryFrontendStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // QueryFrontend is the Schema for the monitoring queryfrontend API
 type QueryFrontend struct {
@@ -479,9 +493,12 @@ type StoreStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Store is the Schema for the Store API
 type Store struct {
@@ -507,6 +524,9 @@ type CompactorSpec struct {
 	// DisableDownsampling specifies whether to disable downsampling
 	DisableDownsampling *bool `json:"disableDownsampling,omitempty"`
 
+	// Retention configs how long to retain samples
+	Retention *Retention `json:"retention,omitempty"`
+
 	// DataVolume specifies how volume shall be used
 	DataVolume *KubernetesVolume `json:"dataVolume,omitempty"`
 
@@ -520,9 +540,13 @@ type CompactorStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="DisableDownsampling",type="boolean",JSONPath=".spec.disableDownsampling",description="The storage for service"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Compactor is the Schema for the Compactor API
 type Compactor struct {
@@ -577,9 +601,13 @@ type IngesterTenantStatus struct {
 	Obsolete bool `json:"obsolete"`
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="LocalTsdbRetention",type="string",JSONPath=".spec.localTsdbRetention",description="How long to retain raw samples on local storage."
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Ingester is the Schema for the Ingester API
 type Ingester struct {
@@ -649,9 +677,12 @@ type RulerStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
 // +genclient
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired replicas"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:subresource:status
 
 // Ruler is the Schema for the Ruler API
 type Ruler struct {