Add TelemetrySpecCore struct

This version of the struct (called "core") is meant to
be used via the OpenStackControlplane. It is the same
as TelemetrySpec only it is missing the containerImages.

The Default() function for webhooks has been split accordingly.

Also removes AodhInitContainerImageURL which is unused.

Jira: OSPRH-4835

Author: dprince

Diff for: api/v1beta1/autoscaling_types.go

@@ -20,8 +20,8 @@ import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 )
 
 const (
@@ -37,9 +37,25 @@ const (
 	DbSyncHash = "dbsync"
 )
 
-
 // Aodh defines the aodh component spec
 type Aodh struct {
+	AodhCore `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	APIImage string `json:"apiImage"`
+
+	// +kubebuilder:validation:Required
+	EvaluatorImage string `json:"evaluatorImage"`
+
+	// +kubebuilder:validation:Required
+	NotifierImage string `json:"notifierImage"`
+
+	// +kubebuilder:validation:Required
+	ListenerImage string `json:"listenerImage"`
+}
+
+// Aodh defines the aodh component spec
+type AodhCore struct {
 	// RabbitMQ instance name
 	// Needed to request a transportURL that is created and used in Aodh
 	// +kubebuilder:default=rabbitmq
@@ -97,18 +113,6 @@ type Aodh struct {
 	// +kubebuilder:default=memcached
 	// Memcached instance name.
 	MemcachedInstance string `json:"memcachedInstance"`
-
-	// +kubebuilder:validation:Required
-	APIImage string `json:"apiImage"`
-
-	// +kubebuilder:validation:Required
-	EvaluatorImage string `json:"evaluatorImage"`
-
-	// +kubebuilder:validation:Required
-	NotifierImage string `json:"notifierImage"`
-
-	// +kubebuilder:validation:Required
-	ListenerImage string `json:"listenerImage"`
 }
 
 // APIOverrideSpec to override the generated manifest of several child resources.
@@ -119,6 +123,22 @@ type APIOverrideSpec struct {
 
 // AutoscalingSpec defines the desired state of Autoscaling
 type AutoscalingSpec struct {
+	AutoscalingSpecBase `json:",inline"`
+
+	// Aodh spec
+	Aodh Aodh `json:"aodh,omitempty"`
+}
+
+// AutoscalingSpecCore defines the desired state of Autoscaling (this version is used by the OpenStackControlplane no image parameters)
+type AutoscalingSpecCore struct {
+	AutoscalingSpecBase `json:",inline"`
+
+	// Aodh spec
+	Aodh AodhCore `json:"aodh,omitempty"`
+}
+
+// AutoscalingSpecBase -
+type AutoscalingSpecBase struct {
 	// Host of user deployed prometheus
 	// +kubebuilder:validation:Optional
 	PrometheusHost string `json:"prometheusHost,omitempty"`
@@ -129,9 +149,6 @@ type AutoscalingSpec struct {
 	// +kubebuilder:validation:Optional
 	PrometheusPort int32 `json:"prometheusPort,omitempty"`
 
-	// Aodh spec
-	Aodh Aodh `json:"aodh,omitempty"`
-
 	// Heat instance name.
 	// +kubebuilder:default=heat
 	HeatInstance string `json:"heatInstance"`

Diff for: api/v1beta1/ceilometer_types.go

@@ -38,6 +38,26 @@ const (
 
 // CeilometerSpec defines the desired state of Ceilometer
 type CeilometerSpec struct {
+	CeilometerSpecCore `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	CentralImage string `json:"centralImage"`
+
+	// +kubebuilder:validation:Required
+	NotificationImage string `json:"notificationImage"`
+
+	// +kubebuilder:validation:Required
+	SgCoreImage string `json:"sgCoreImage"`
+
+	// +kubebuilder:validation:Required
+	ComputeImage string `json:"computeImage"`
+
+	// +kubebuilder:validation:Required
+	IpmiImage string `json:"ipmiImage"`
+}
+
+// CeilometerSpecCore defines the desired state of Ceilometer. This version is used by the OpenStackControlplane (no image parameters)
+type CeilometerSpecCore struct {
 	// RabbitMQ instance name
 	// Needed to request a transportURL that is created and used in Telemetry
 	// +kubebuilder:default=rabbitmq
@@ -69,21 +89,6 @@ type CeilometerSpec struct {
 
 	// NetworkAttachmentDefinitions list of network attachment definitions the service pod gets attached to
 	NetworkAttachmentDefinitions []string `json:"networkAttachmentDefinitions,omitempty"`
-
-	// +kubebuilder:validation:Required
-	CentralImage string `json:"centralImage"`
-
-	// +kubebuilder:validation:Required
-	NotificationImage string `json:"notificationImage"`
-
-	// +kubebuilder:validation:Required
-	SgCoreImage string `json:"sgCoreImage"`
-
-	// +kubebuilder:validation:Required
-	ComputeImage string `json:"computeImage"`
-
-	// +kubebuilder:validation:Required
-	IpmiImage string `json:"ipmiImage"`
 }
 
 // CeilometerStatus defines the observed state of Ceilometer

Diff for: api/v1beta1/telemetry_types.go

@@ -45,14 +45,32 @@ type PasswordsSelector struct {
 
 // TelemetrySpec defines the desired state of Telemetry
 type TelemetrySpec struct {
+	TelemetrySpecBase `json:",inline"`
+
 	// +kubebuilder:validation:Optional
 	// Autoscaling - Parameters related to the autoscaling service
 	Autoscaling AutoscalingSection `json:"autoscaling,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	// Ceilometer - Parameters related to the ceilometer service
 	Ceilometer CeilometerSection `json:"ceilometer,omitempty"`
+}
+
+// TelemetrySpecCore defines the desired state of Telemetry. This version has no image parameters and is used by OpenStackControlplane
+type TelemetrySpecCore struct {
+	TelemetrySpecBase `json:",inline"`
 
+	// +kubebuilder:validation:Optional
+	// Autoscaling - Parameters related to the autoscaling service
+	Autoscaling AutoscalingSectionCore `json:"autoscaling,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// Ceilometer - Parameters related to the ceilometer service
+	Ceilometer CeilometerSectionCore `json:"ceilometer,omitempty"`
+}
+
+// TelemetrySpecBase -
+type TelemetrySpecBase struct {
 	// +kubebuilder:validation:Optional
 	// MetricStorage - Parameters related to the metricStorage
 	MetricStorage MetricStorageSection `json:"metricStorage,omitempty"`
@@ -76,6 +94,20 @@ type CeilometerSection struct {
 	CeilometerSpec `json:",inline"`
 }
 
+// CeilometerSectionCore defines the desired state of the ceilometer service
+type CeilometerSectionCore struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=true
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
+	// Enabled - Whether OpenStack Ceilometer service should be deployed and managed
+	Enabled bool `json:"enabled"`
+
+	// +kubebuilder:validation:Optional
+	//+operator-sdk:csv:customresourcedefinitions:type=spec
+	// Template - Overrides to use when creating the OpenStack Ceilometer service
+	CeilometerSpecCore `json:",inline"`
+}
+
 // AutoscalingSection defines the desired state of the autoscaling service
 type AutoscalingSection struct {
 	// +kubebuilder:validation:Optional
@@ -90,6 +122,20 @@ type AutoscalingSection struct {
 	AutoscalingSpec `json:",inline"`
 }
 
+// AutoscalingSectionCore defines the desired state of the autoscaling service
+type AutoscalingSectionCore struct {
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=false
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
+	// Enabled - Whether OpenStack autoscaling service should be deployed and managed
+	Enabled bool `json:"enabled"`
+
+	// +kubebuilder:validation:Optional
+	//+operator-sdk:csv:customresourcedefinitions:type=spec
+	// Template - Overrides to use when creating the OpenStack autoscaling service
+	AutoscalingSpecCore `json:",inline"`
+}
+
 // MetricStorageSection defines the desired state of the MetricStorage
 type MetricStorageSection struct {
 	// +kubebuilder:validation:Optional
@@ -161,19 +207,17 @@ func init() {
 func SetupDefaultsTelemetry() {
 	// Acquire environmental defaults and initialize Telemetry defaults with them
 	telemetryDefaults := TelemetryDefaults{
-		CentralContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT", CeilometerCentralContainerImage),
-		ComputeContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", CeilometerComputeContainerImage),
-		IpmiContainerImageURL:          util.GetEnvVar("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", CeilometerIpmiContainerImage),
-		NotificationContainerImageURL:  util.GetEnvVar("RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT", CeilometerNotificationContainerImage),
-		SgCoreContainerImageURL:        util.GetEnvVar("RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT", CeilometerSgCoreContainerImage),
+		CentralContainerImageURL:      util.GetEnvVar("RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT", CeilometerCentralContainerImage),
+		ComputeContainerImageURL:      util.GetEnvVar("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", CeilometerComputeContainerImage),
+		IpmiContainerImageURL:         util.GetEnvVar("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", CeilometerIpmiContainerImage),
+		NotificationContainerImageURL: util.GetEnvVar("RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT", CeilometerNotificationContainerImage),
+		SgCoreContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT", CeilometerSgCoreContainerImage),
 
 		// Autoscaling
 		AodhAPIContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT", AodhAPIContainerImage),
 		AodhEvaluatorContainerImageURL: util.GetEnvVar("RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT", AodhEvaluatorContainerImage),
 		AodhNotifierContainerImageURL:  util.GetEnvVar("RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT", AodhNotifierContainerImage),
 		AodhListenerContainerImageURL:  util.GetEnvVar("RELATED_IMAGE_AODH_LISTENER_IMAGE_URL_DEFAULT", AodhListenerContainerImage),
-		AodhInitContainerImageURL:      util.GetEnvVar("RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT", AodhAPIContainerImage),
-
 	}
 
 	SetupTelemetryDefaults(telemetryDefaults)

Diff for: api/v1beta1/telemetry_webhook.go

@@ -38,7 +38,6 @@ type TelemetryDefaults struct {
 	AodhEvaluatorContainerImageURL string
 	AodhNotifierContainerImageURL  string
 	AodhListenerContainerImageURL  string
-	AodhInitContainerImageURL      string
 }
 
 var telemetryDefaults TelemetryDefaults
@@ -101,6 +100,11 @@ func (spec *TelemetrySpec) Default() {
 	}
 }
 
+// Default - set defaults for this Telemetry spec core
+func (spec *TelemetrySpecCore) Default() {
+	// nothing here yet
+}
+
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 //+kubebuilder:webhook:path=/validate-telemetry-openstack-org-v1beta1-telemetry,mutating=false,failurePolicy=fail,sideEffects=None,groups=telemetry.openstack.org,resources=telemetries,verbs=create;update,versions=v1beta1,name=vtelemetry.kb.io,admissionReviewVersions=v1