Merge mysqld status into ceilometer status

vyzigold · vyzigold · commit 88acf5858e5d · 2024-12-05T19:12:16.000-05:00
diff --git a/api/bases/telemetry.openstack.org_ceilometers.yaml b/api/bases/telemetry.openstack.org_ceilometers.yaml
@@ -293,70 +293,20 @@ spec:
                   type: string
                 description: Map of hashes to track e.g. job status
                 type: object
-              mysqldExporterStatus:
-                description: MysqldExporterStatus defines the observed state of mysqld_exporter
-                properties:
-                  conditions:
-                    description: Conditions
-                    items:
-                      description: Condition defines an observation of a API resource
-                        operational state.
-                      properties:
-                        lastTransitionTime:
-                          description: Last time the condition transitioned from one
-                            status to another. This should be when the underlying
-                            condition changed. If that is not known, then using the
-                            time when the API field changed is acceptable.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A human readable message indicating details
-                            about the transition.
-                          type: string
-                        reason:
-                          description: The reason for the condition's last transition
-                            in CamelCase.
-                          type: string
-                        severity:
-                          description: Severity provides a classification of Reason
-                            code, so the current situation is immediately understandable
-                            and could act accordingly. It is meant for situations
-                            where Status=False and it should be indicated if it is
-                            just informational, warning (next reconciliation might
-                            fix it) or an error (e.g. DB create issue and no actions
-                            to automatically resolve the issue can/should be done).
-                            For conditions where Status=Unknown or Status=True the
-                            Severity should be SeverityNone.
-                          type: string
-                        status:
-                          description: Status of the condition, one of True, False,
-                            Unknown.
-                          type: string
-                        type:
-                          description: Type of condition in CamelCase.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  exportedGaleras:
-                    description: List of galera CRs, which are being exported with
-                      mysqld_exporter
-                    items:
-                      type: string
-                    type: array
-                  hash:
-                    additionalProperties:
-                      type: string
-                    description: Map of hashes to track e.g. job status
-                    type: object
-                  readyCount:
-                    description: ReadyCount of mysqld_exporter instances
-                    format: int32
-                    type: integer
+              mysqldExporterExportedGaleras:
+                description: List of galera CRs, which are being exported with mysqld_exporter
+                items:
+                  type: string
+                type: array
+              mysqldExporterHash:
+                additionalProperties:
+                  type: string
+                description: Map of hashes to track e.g. job status
                 type: object
+              mysqldExporterReadyCount:
+                description: ReadyCount of mysqld_exporter instances
+                format: int32
+                type: integer
               networks:
                 description: Networks in addtion to the cluster network, the service
                   is attached to
diff --git a/api/v1beta1/ceilometer_types.go b/api/v1beta1/ceilometer_types.go
@@ -168,7 +168,14 @@ type CeilometerStatus struct {
 	// the openstack-operator in the top-level CR (e.g. the ContainerImage)
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
-	MysqldExporterStatus MysqldExporterStatus `json:"mysqldExporterStatus,omitempty"`
+	// ReadyCount of mysqld_exporter instances
+	MysqldExporterReadyCount int32 `json:"mysqldExporterReadyCount,omitempty"`
+
+	// Map of hashes to track e.g. job status
+	MysqldExporterHash map[string]string `json:"mysqldExporterHash,omitempty"`
+
+	// List of galera CRs, which are being exported with mysqld_exporter
+	MysqldExporterExportedGaleras []string `json:"mysqldExporterExportedGaleras,omitempty"`
 }
 
 // KSMStatus defines the observed state of kube-state-metrics
@@ -189,21 +196,6 @@ type KSMStatus struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
 
-// MysqldExporterStatus defines the observed state of mysqld_exporter
-type MysqldExporterStatus struct {
-	// ReadyCount of mysqld_exporter instances
-	ReadyCount int32 `json:"readyCount,omitempty"`
-
-	// Map of hashes to track e.g. job status
-	Hash map[string]string `json:"hash,omitempty"`
-
-	// Conditions
-	Conditions condition.Conditions `json:"conditions,omitempty" optional:"true"`
-
-	// List of galera CRs, which are being exported with mysqld_exporter
-	ExportedGaleras []string `json:"exportedGaleras,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
diff --git a/api/v1beta1/conditions.go b/api/v1beta1/conditions.go
@@ -58,6 +58,17 @@ const (
 
 	// KSMReadyCondition Status=True condition which indicates if the KSM is configured and operational
 	KSMReadyCondition condition.Type = "KSMReady"
+
+	// MysqldExporter conditions
+	MysqldExporterDBReadyCondition condition.Type = "MysqldExporterDBReady"
+
+	MysqldExporterDeploymentReadyCondition condition.Type = "MysqldExporterDeploymentReady"
+
+	MysqldExporterMariaDBAccountReadyCondition condition.Type = "MysqldExporterMariaDBAccountReady"
+
+	MysqldExporterServiceConfigReadyCondition condition.Type = "MysqldExporterServiceConfigReady"
+
+	MysqldExporterTLSInputReadyCondition condition.Type = "MysqldExporterTLSInputReady"
 )
 
 // Telemetry Reasons used by API objects.
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/telemetry.openstack.org_ceilometers.yaml b/config/crd/bases/telemetry.openstack.org_ceilometers.yaml
@@ -293,70 +293,20 @@ spec:
                   type: string
                 description: Map of hashes to track e.g. job status
                 type: object
-              mysqldExporterStatus:
-                description: MysqldExporterStatus defines the observed state of mysqld_exporter
-                properties:
-                  conditions:
-                    description: Conditions
-                    items:
-                      description: Condition defines an observation of a API resource
-                        operational state.
-                      properties:
-                        lastTransitionTime:
-                          description: Last time the condition transitioned from one
-                            status to another. This should be when the underlying
-                            condition changed. If that is not known, then using the
-                            time when the API field changed is acceptable.
-                          format: date-time
-                          type: string
-                        message:
-                          description: A human readable message indicating details
-                            about the transition.
-                          type: string
-                        reason:
-                          description: The reason for the condition's last transition
-                            in CamelCase.
-                          type: string
-                        severity:
-                          description: Severity provides a classification of Reason
-                            code, so the current situation is immediately understandable
-                            and could act accordingly. It is meant for situations
-                            where Status=False and it should be indicated if it is
-                            just informational, warning (next reconciliation might
-                            fix it) or an error (e.g. DB create issue and no actions
-                            to automatically resolve the issue can/should be done).
-                            For conditions where Status=Unknown or Status=True the
-                            Severity should be SeverityNone.
-                          type: string
-                        status:
-                          description: Status of the condition, one of True, False,
-                            Unknown.
-                          type: string
-                        type:
-                          description: Type of condition in CamelCase.
-                          type: string
-                      required:
-                      - lastTransitionTime
-                      - status
-                      - type
-                      type: object
-                    type: array
-                  exportedGaleras:
-                    description: List of galera CRs, which are being exported with
-                      mysqld_exporter
-                    items:
-                      type: string
-                    type: array
-                  hash:
-                    additionalProperties:
-                      type: string
-                    description: Map of hashes to track e.g. job status
-                    type: object
-                  readyCount:
-                    description: ReadyCount of mysqld_exporter instances
-                    format: int32
-                    type: integer
+              mysqldExporterExportedGaleras:
+                description: List of galera CRs, which are being exported with mysqld_exporter
+                items:
+                  type: string
+                type: array
+              mysqldExporterHash:
+                additionalProperties:
+                  type: string
+                description: Map of hashes to track e.g. job status
                 type: object
+              mysqldExporterReadyCount:
+                description: ReadyCount of mysqld_exporter instances
+                format: int32
+                type: integer
               networks:
                 description: Networks in addtion to the cluster network, the service
                   is attached to
diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go
