Annotate CRD structs with categories

grafana · Aug 26, 2024 · b6f9cff · b6f9cff
1 parent c3a0c18
commit b6f9cff
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 0 deletions.
diff --git a/api/v1beta1/grafana_types.go b/api/v1beta1/grafana_types.go
@@ -53,6 +53,7 @@ type OperatorReconcileVars struct {
 }
 
 // GrafanaSpec defines the desired state of Grafana
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaSpec struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// Config defines how your grafana ini file should looks like.

diff --git a/api/v1beta1/grafanaalertrulegroup_types.go b/api/v1beta1/grafanaalertrulegroup_types.go
@@ -128,6 +128,7 @@ type GrafanaAlertRuleGroupStatus struct {
 //+kubebuilder:subresource:status
 
 // GrafanaAlertRuleGroup is the Schema for the grafanaalertrulegroups API
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaAlertRuleGroup struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1beta1/grafanacontactpoint_types.go b/api/v1beta1/grafanacontactpoint_types.go
@@ -63,6 +63,7 @@ type GrafanaContactPointStatus struct {
 //+kubebuilder:subresource:status
 
 // GrafanaContactPoint is the Schema for the grafanacontactpoints API
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaContactPoint struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1beta1/grafanadashboard_types.go b/api/v1beta1/grafanadashboard_types.go
@@ -51,6 +51,7 @@ type GrafanaDashboardDatasource struct {
 // GrafanaDashboardSpec defines the desired state of GrafanaDashboard
 // +kubebuilder:validation:XValidation:rule="(has(self.folderUID) && !(has(self.folderRef))) || (has(self.folderRef) && !(has(self.folderUID))) || !(has(self.folderRef) && (has(self.folderUID)))", message="Only one of folderUID or folderRef can be declared at the same time"
 // +kubebuilder:validation:XValidation:rule="(has(self.folder) && !(has(self.folderRef) || has(self.folderUID))) || !(has(self.folder))", message="folder field cannot be set when folderUID or folderRef is already declared"
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaDashboardSpec struct {
 	// dashboard json
 	// +optional

diff --git a/api/v1beta1/grafanadatasource_types.go b/api/v1beta1/grafanadatasource_types.go
@@ -119,6 +119,7 @@ type GrafanaDatasourceStatus struct {
 // +kubebuilder:printcolumn:name="No matching instances",type="boolean",JSONPath=".status.NoMatchingInstances",description=""
 // +kubebuilder:printcolumn:name="Last resync",type="date",format="date-time",JSONPath=".status.lastResync",description=""
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaDatasource struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1beta1/grafanafolder_types.go b/api/v1beta1/grafanafolder_types.go
@@ -81,6 +81,7 @@ type GrafanaFolderStatus struct {
 // GrafanaFolder is the Schema for the grafanafolders API
 // +kubebuilder:printcolumn:name="No matching instances",type="boolean",JSONPath=".status.NoMatchingInstances",description=""
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaFolder struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1beta1/grafananotificationpolicy_types.go b/api/v1beta1/grafananotificationpolicy_types.go
@@ -138,6 +138,7 @@ type GrafanaNotificationPolicyStatus struct {
 //+kubebuilder:subresource:status
 
 // GrafanaNotificationPolicy is the Schema for the GrafanaNotificationPolicy API
+// +kubebuilder:resource:categories={grafanacrs,grafana-operator}
 type GrafanaNotificationPolicy struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/config/crd/bases/grafana.integreatly.org_grafanaalertrulegroups.yaml b/config/crd/bases/grafana.integreatly.org_grafanaalertrulegroups.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaAlertRuleGroup
     listKind: GrafanaAlertRuleGroupList
     plural: grafanaalertrulegroups

diff --git a/config/crd/bases/grafana.integreatly.org_grafanacontactpoints.yaml b/config/crd/bases/grafana.integreatly.org_grafanacontactpoints.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaContactPoint
     listKind: GrafanaContactPointList
     plural: grafanacontactpoints

diff --git a/config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml b/config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaDatasource
     listKind: GrafanaDatasourceList
     plural: grafanadatasources

diff --git a/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml b/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaFolder
     listKind: GrafanaFolderList
     plural: grafanafolders

diff --git a/config/crd/bases/grafana.integreatly.org_grafananotificationpolicies.yaml b/config/crd/bases/grafana.integreatly.org_grafananotificationpolicies.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaNotificationPolicy
     listKind: GrafanaNotificationPolicyList
     plural: grafananotificationpolicies

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaAlertRuleGroup
     listKind: GrafanaAlertRuleGroupList
     plural: grafanaalertrulegroups

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaContactPoint
     listKind: GrafanaContactPointList
     plural: grafanacontactpoints

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaDatasource
     listKind: GrafanaDatasourceList
     plural: grafanadatasources

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaFolder
     listKind: GrafanaFolderList
     plural: grafanafolders

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafananotificationpolicies.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafananotificationpolicies.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaNotificationPolicy
     listKind: GrafanaNotificationPolicyList
     plural: grafananotificationpolicies

diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml
@@ -7,6 +7,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaAlertRuleGroup
     listKind: GrafanaAlertRuleGroupList
     plural: grafanaalertrulegroups
@@ -316,6 +319,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaContactPoint
     listKind: GrafanaContactPointList
     plural: grafanacontactpoints
@@ -984,6 +990,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaDatasource
     listKind: GrafanaDatasourceList
     plural: grafanadatasources
@@ -1237,6 +1246,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaFolder
     listKind: GrafanaFolderList
     plural: grafanafolders
@@ -1457,6 +1469,9 @@ metadata:
 spec:
   group: grafana.integreatly.org
   names:
+    categories:
+    - grafanacrs
+    - grafana-operator
     kind: GrafanaNotificationPolicy
     listKind: GrafanaNotificationPolicyList
     plural: grafananotificationpolicies