Remove "template" from telemetry CRD

openstack-k8s-operators · Nov 21, 2023 · d564042 · d564042
1 parent 468549c
commit d564042
Show file tree

Hide file tree

Showing 8 changed files with 718 additions and 772 deletions.
diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
diff --git a/api/v1beta1/telemetry_types.go b/api/v1beta1/telemetry_types.go
@@ -70,7 +70,7 @@ type CeilometerSection struct {
 	// +kubebuilder:validation:Optional
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
 	// Template - Overrides to use when creating the OpenStack Ceilometer service
-	Template CeilometerSpec `json:"template,omitempty"`
+	CeilometerSpec `json:",inline"`
 }
 
 // AutoscalingSection defines the desired state of the autoscaling service
@@ -84,7 +84,7 @@ type AutoscalingSection struct {
 	// +kubebuilder:validation:Optional
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
 	// Template - Overrides to use when creating the OpenStack autoscaling service
-	Template AutoscalingSpec `json:"template,omitempty"`
+	AutoscalingSpec `json:",inline"`
 }
 
 // TelemetryStatus defines the observed state of Telemetry

diff --git a/api/v1beta1/telemetry_webhook.go b/api/v1beta1/telemetry_webhook.go
@@ -72,35 +72,35 @@ func (r *Telemetry) Default() {
 
 // Default - set defaults for this Telemetry spec
 func (spec *TelemetrySpec) Default() {
-	if spec.Ceilometer.Template.CentralImage == "" {
-		spec.Ceilometer.Template.CentralImage = telemetryDefaults.CentralContainerImageURL
+	if spec.Ceilometer.CeilometerSpec.CentralImage == "" {
+		spec.Ceilometer.CeilometerSpec.CentralImage = telemetryDefaults.CentralContainerImageURL
 	}
-	if spec.Ceilometer.Template.ComputeImage == "" {
-		spec.Ceilometer.Template.ComputeImage = telemetryDefaults.ComputeContainerImageURL
+	if spec.Ceilometer.CeilometerSpec.ComputeImage == "" {
+		spec.Ceilometer.CeilometerSpec.ComputeImage = telemetryDefaults.ComputeContainerImageURL
 	}
-	if spec.Ceilometer.Template.IpmiImage == "" {
-		spec.Ceilometer.Template.IpmiImage = telemetryDefaults.IpmiContainerImageURL
+	if spec.Ceilometer.CeilometerSpec.IpmiImage == "" {
+		spec.Ceilometer.CeilometerSpec.IpmiImage = telemetryDefaults.IpmiContainerImageURL
 	}
-	if spec.Ceilometer.Template.NotificationImage == "" {
-		spec.Ceilometer.Template.NotificationImage = telemetryDefaults.NotificationContainerImageURL
+	if spec.Ceilometer.CeilometerSpec.NotificationImage == "" {
+		spec.Ceilometer.CeilometerSpec.NotificationImage = telemetryDefaults.NotificationContainerImageURL
 	}
-	if spec.Ceilometer.Template.SgCoreImage == "" {
-		spec.Ceilometer.Template.SgCoreImage = telemetryDefaults.SgCoreContainerImageURL
+	if spec.Ceilometer.CeilometerSpec.SgCoreImage == "" {
+		spec.Ceilometer.CeilometerSpec.SgCoreImage = telemetryDefaults.SgCoreContainerImageURL
 	}
-	if spec.Ceilometer.Template.NodeExporterImage == "" {
-		spec.Ceilometer.Template.NodeExporterImage = telemetryDefaults.NodeExporterContainerImageURL
+	if spec.Ceilometer.CeilometerSpec.NodeExporterImage == "" {
+		spec.Ceilometer.CeilometerSpec.NodeExporterImage = telemetryDefaults.NodeExporterContainerImageURL
 	}
-	if spec.Autoscaling.Template.Aodh.APIImage == "" {
-		spec.Autoscaling.Template.Aodh.APIImage = telemetryDefaults.AodhAPIContainerImageURL
+	if spec.Autoscaling.AutoscalingSpec.Aodh.APIImage == "" {
+		spec.Autoscaling.AutoscalingSpec.Aodh.APIImage = telemetryDefaults.AodhAPIContainerImageURL
 	}
-	if spec.Autoscaling.Template.Aodh.EvaluatorImage == "" {
-		spec.Autoscaling.Template.Aodh.EvaluatorImage = telemetryDefaults.AodhEvaluatorContainerImageURL
+	if spec.Autoscaling.AutoscalingSpec.Aodh.EvaluatorImage == "" {
+		spec.Autoscaling.AutoscalingSpec.Aodh.EvaluatorImage = telemetryDefaults.AodhEvaluatorContainerImageURL
 	}
-	if spec.Autoscaling.Template.Aodh.NotifierImage == "" {
-		spec.Autoscaling.Template.Aodh.NotifierImage = telemetryDefaults.AodhNotifierContainerImageURL
+	if spec.Autoscaling.AutoscalingSpec.Aodh.NotifierImage == "" {
+		spec.Autoscaling.AutoscalingSpec.Aodh.NotifierImage = telemetryDefaults.AodhNotifierContainerImageURL
 	}
-	if spec.Autoscaling.Template.Aodh.ListenerImage == "" {
-		spec.Autoscaling.Template.Aodh.ListenerImage = telemetryDefaults.AodhListenerContainerImageURL
+	if spec.Autoscaling.AutoscalingSpec.Aodh.ListenerImage == "" {
+		spec.Autoscaling.AutoscalingSpec.Aodh.ListenerImage = telemetryDefaults.AodhListenerContainerImageURL
 	}
 
 }

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