refactor: Embed GrafanaCommonStatus into all crds

grafana · Nov 20, 2024 · 80e3ac8 · 80e3ac8
1 parent afe0801
commit 80e3ac8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 110 deletions.
diff --git a/api/v1beta1/grafana_types.go b/api/v1beta1/grafana_types.go
@@ -131,6 +131,8 @@ type GrafanaPreferences struct {
 
 // GrafanaStatus defines the observed state of Grafana
 type GrafanaStatus struct {
+	GrafanaCommonStatus `json:",inline"`
+
 	Stage       OperatorStageName      `json:"stage,omitempty"`
 	StageStatus OperatorStageStatus    `json:"stageStatus,omitempty"`
 	LastMessage string                 `json:"lastMessage,omitempty"`

diff --git a/api/v1beta1/grafanaalertrulegroup_types.go b/api/v1beta1/grafanaalertrulegroup_types.go
@@ -129,11 +129,6 @@ type AlertQuery struct {
 	RelativeTimeRange *models.RelativeTimeRange `json:"relativeTimeRange,omitempty"`
 }
 
-// GrafanaAlertRuleGroupStatus defines the observed state of GrafanaAlertRuleGroup
-type GrafanaAlertRuleGroupStatus struct {
-	Conditions []metav1.Condition `json:"conditions"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
@@ -143,8 +138,8 @@ type GrafanaAlertRuleGroup struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   GrafanaAlertRuleGroupSpec   `json:"spec,omitempty"`
-	Status GrafanaAlertRuleGroupStatus `json:"status,omitempty"`
+	Spec   GrafanaAlertRuleGroupSpec `json:"spec,omitempty"`
+	Status GrafanaCommonStatus       `json:"status,omitempty"`
 }
 
 // GroupName returns the name of alert rule group.

diff --git a/api/v1beta1/grafanacontactpoint_types.go b/api/v1beta1/grafanacontactpoint_types.go
@@ -61,13 +61,6 @@ type GrafanaContactPointSpec struct {
 	AllowCrossNamespaceImport *bool `json:"allowCrossNamespaceImport,omitempty"`
 }
 
-// GrafanaContactPointStatus defines the observed state of GrafanaContactPoint
-type GrafanaContactPointStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-	Conditions []metav1.Condition `json:"conditions"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
@@ -77,8 +70,8 @@ type GrafanaContactPoint struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   GrafanaContactPointSpec   `json:"spec,omitempty"`
-	Status GrafanaContactPointStatus `json:"status,omitempty"`
+	Spec   GrafanaContactPointSpec `json:"spec,omitempty"`
+	Status GrafanaCommonStatus     `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1beta1/grafanadashboard_types.go b/api/v1beta1/grafanadashboard_types.go
@@ -180,6 +180,8 @@ type GrafanaComDashboardReference struct {
 
 // GrafanaDashboardStatus defines the observed state of GrafanaDashboard
 type GrafanaDashboardStatus struct {
+	GrafanaCommonStatus `json:",inline"`
+
 	ContentCache     []byte      `json:"contentCache,omitempty"`
 	ContentTimestamp metav1.Time `json:"contentTimestamp,omitempty"`
 	ContentUrl       string      `json:"contentUrl,omitempty"`
@@ -189,8 +191,6 @@ type GrafanaDashboardStatus struct {
 	// Last time the dashboard was resynced
 	LastResync metav1.Time `json:"lastResync,omitempty"`
 	UID        string      `json:"uid,omitempty"`
-
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1beta1/grafanadatasource_types.go b/api/v1beta1/grafanadatasource_types.go
@@ -95,6 +95,8 @@ type GrafanaDatasourceSpec struct {
 
 // GrafanaDatasourceStatus defines the observed state of GrafanaDatasource
 type GrafanaDatasourceStatus struct {
+	GrafanaCommonStatus `json:",inline"`
+
 	Hash        string `json:"hash,omitempty"`
 	LastMessage string `json:"lastMessage,omitempty"`
 	// The datasource instanceSelector can't find matching grafana instances

diff --git a/api/v1beta1/grafanafolder_types.go b/api/v1beta1/grafanafolder_types.go
@@ -72,14 +72,13 @@ type GrafanaFolderSpec struct {
 
 // GrafanaFolderStatus defines the observed state of GrafanaFolder
 type GrafanaFolderStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+	GrafanaCommonStatus `json:",inline"`
+
 	Hash string `json:"hash,omitempty"`
 	// The folder instanceSelector can't find matching grafana instances
 	NoMatchingInstances bool `json:"NoMatchingInstances,omitempty"`
 	// Last time the folder was resynced
-	LastResync metav1.Time        `json:"lastResync,omitempty"`
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	LastResync metav1.Time `json:"lastResync,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1beta1/grafananotificationpolicy_types.go b/api/v1beta1/grafananotificationpolicy_types.go
@@ -135,11 +135,6 @@ func (r *Route) ToModelRoute() *models.Route {
 	return out
 }
 
-// GrafanaNotificationPolicyStatus defines the observed state of GrafanaNotificationPolicy
-type GrafanaNotificationPolicyStatus struct {
-	Conditions []metav1.Condition `json:"conditions"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
@@ -149,8 +144,8 @@ type GrafanaNotificationPolicy struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   GrafanaNotificationPolicySpec   `json:"spec,omitempty"`
-	Status GrafanaNotificationPolicyStatus `json:"status,omitempty"`
+	Spec   GrafanaNotificationPolicySpec `json:"spec,omitempty"`
+	Status GrafanaCommonStatus           `json:"status,omitempty"`
 }
 
 func (np *GrafanaNotificationPolicy) NamespacedResource() string {

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go