Merge pull request #437 from fao89/heatsecrets

Add missing CustomConfigSecretsFileName to service config-data
openstack-k8s-operators · Oct 11, 2024 · 937d484 · 937d484
2 parents 66099e9 + f590a2c
commit 937d484
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/controllers/heatapi_controller.go b/controllers/heatapi_controller.go
@@ -883,6 +883,7 @@ func (r *HeatAPIReconciler) generateServiceSecrets(
 	}
 	customData[heat.DefaultsConfigFileName] = string(heatSecret.Data[heat.DefaultsConfigFileName])
 	customData[heat.CustomConfigFileName] = string(heatSecret.Data[heat.CustomConfigFileName])
+	customData[heat.CustomConfigSecretsFileName] = string(heatSecret.Data[heat.CustomConfigSecretsFileName])
 
 	customSecrets := ""
 	for _, secretName := range instance.Spec.CustomServiceConfigSecrets {

diff --git a/controllers/heatcfnapi_controller.go b/controllers/heatcfnapi_controller.go
@@ -880,6 +880,7 @@ func (r *HeatCfnAPIReconciler) generateServiceSecrets(
 	}
 	customData[heat.DefaultsConfigFileName] = string(heatSecret.Data[heat.DefaultsConfigFileName])
 	customData[heat.CustomConfigFileName] = string(heatSecret.Data[heat.CustomConfigFileName])
+	customData[heat.CustomConfigSecretsFileName] = string(heatSecret.Data[heat.CustomConfigSecretsFileName])
 
 	customSecrets := ""
 	for _, secretName := range instance.Spec.CustomServiceConfigSecrets {

diff --git a/controllers/heatengine_controller.go b/controllers/heatengine_controller.go
@@ -592,6 +592,7 @@ func (r *HeatEngineReconciler) generateServiceSecrets(
 	}
 	customData[heat.DefaultsConfigFileName] = string(heatSecret.Data[heat.DefaultsConfigFileName])
 	customData[heat.CustomConfigFileName] = string(heatSecret.Data[heat.CustomConfigFileName])
+	customData[heat.CustomConfigSecretsFileName] = string(heatSecret.Data[heat.CustomConfigSecretsFileName])
 
 	customSecrets := ""
 	for _, secretName := range instance.Spec.CustomServiceConfigSecrets {