Merge pull request #182 from jlarriba/fix_conf

Fix the controller creation of two different sets of config-data
openstack-k8s-operators · Sep 14, 2023 · 2540bab · 2540bab
2 parents 689a640 + 13a1d64
commit 2540bab
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go
@@ -499,7 +499,7 @@ func (r *CeilometerReconciler) generateServiceConfigMaps(
 			Name:               fmt.Sprintf("%s-scripts", ceilometer.ServiceName),
 			Namespace:          instance.Namespace,
 			Type:               util.TemplateTypeScripts,
-			InstanceType:       instance.Kind,
+			InstanceType:       "ceilometercentral",
 			AdditionalTemplate: map[string]string{"common.sh": "/common/common.sh"},
 			Labels:             cmLabels,
 		},
@@ -508,7 +508,7 @@ func (r *CeilometerReconciler) generateServiceConfigMaps(
 			Name:          fmt.Sprintf("%s-config-data", ceilometer.ServiceName),
 			Namespace:     instance.Namespace,
 			Type:          util.TemplateTypeConfig,
-			InstanceType:  instance.Kind,
+			InstanceType:  "ceilometercentral",
 			CustomData:    customData,
 			ConfigOptions: templateParameters,
 			Labels:        cmLabels,
@@ -553,7 +553,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfigMaps(
 			Name:               fmt.Sprintf("%s-scripts", ceilometer.ComputeServiceName),
 			Namespace:          instance.Namespace,
 			Type:               util.TemplateTypeScripts,
-			InstanceType:       instance.Kind,
+			InstanceType:       "ceilometercompute",
 			AdditionalTemplate: map[string]string{"common.sh": "/common/common.sh"},
 			Labels:             cmLabels,
 		},
@@ -562,7 +562,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfigMaps(
 			Name:          fmt.Sprintf("%s-config-data", ceilometer.ComputeServiceName),
 			Namespace:     instance.Namespace,
 			Type:          util.TemplateTypeConfig,
-			InstanceType:  instance.Kind,
+			InstanceType:  "ceilometercompute",
 			CustomData:    customData,
 			ConfigOptions: templateParameters,
 			Labels:        cmLabels,