Merge pull request #330 from Deydra71/aodh-apioverride

Update autoscaling to use service override

Author: openshift-merge-bot[bot]

api/bases/telemetry.openstack.org_autoscalings.yaml

@@ -124,7 +124,8 @@ type AodhCore struct {
 // APIOverrideSpec to override the generated manifest of several child resources.
 type APIOverrideSpec struct {
 	// Override configuration for the Service created to serve traffic to the cluster.
-	Service *service.RoutedOverrideSpec `json:"service,omitempty"`
+	// The key must be the endpoint type (public, internal)
+	Service map[service.Endpoint]service.RoutedOverrideSpec `json:"service,omitempty"`
 }
 
 // AutoscalingSpec defines the desired state of Autoscaling

api/bases/telemetry.openstack.org_telemetries.yaml

@@ -329,17 +329,21 @@ func (r *AutoscalingReconciler) reconcileNormalAodh(
 
 	apiEndpoints := make(map[string]string)
 
+	if instance.Spec.Aodh.Override.Service == nil {
+		instance.Spec.Aodh.Override.Service = make(map[service.Endpoint]service.RoutedOverrideSpec)
+	}
+
 	for endpointType, data := range aodhEndpoints {
 		endpointTypeStr := string(endpointType)
 		endpointName := autoscaling.ServiceName + "-" + endpointTypeStr
-		svcOverride := instance.Spec.Aodh.Override.Service
-		if svcOverride == nil {
-			svcOverride = &service.RoutedOverrideSpec{}
-		}
+
+		svcOverride := instance.Spec.Aodh.Override.Service[endpointType]
 		if svcOverride.EmbeddedLabelsAnnotations == nil {
 			svcOverride.EmbeddedLabelsAnnotations = &service.EmbeddedLabelsAnnotations{}
 		}
 
+		instance.Spec.Aodh.Override.Service[endpointType] = svcOverride
+
 		exportLabels := util.MergeStringMaps(
 			serviceLabels,
 			map[string]string{