Mount config-data-custom

Signed-off-by: Fabricio Aguiar <[email protected]>
openstack-k8s-operators · Oct 9, 2024 · 6e27b4c · 6e27b4c
1 parent 9bd221e
commit 6e27b4c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 83 deletions.
diff --git a/controllers/heatapi_controller.go b/controllers/heatapi_controller.go
@@ -54,7 +54,6 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 )
 
 // HeatAPIReconciler reconciles a Heat object
@@ -849,21 +848,11 @@ func (r *HeatAPIReconciler) generateServiceSecrets(
 
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(heat.ServiceName), map[string]string{})
 
-	db, err := mariadbv1.GetDatabaseByNameAndAccount(ctx, h, heat.DatabaseCRName, instance.Spec.DatabaseAccount, instance.Namespace)
-	if err != nil {
-		return err
-	}
-	var tlsCfg *tls.Service
-	if instance.Spec.TLS.Ca.CaBundleSecretName != "" {
-		tlsCfg = &tls.Service{}
-	}
-
 	// customData hold any customization for the service.
 	// custom.conf is going to /etc/heat/heat.conf.d
 	// TODO: make sure custom.conf can not be overwritten
 	customData := map[string]string{
 		heat.CustomServiceConfigFileName: instance.Spec.CustomServiceConfig,
-		"my.cnf":                         db.GetDatabaseClientConfig(tlsCfg), //(mschuppert) for now just get the default my.cnf
 	}
 
 	for key, data := range instance.Spec.DefaultConfigOverwrite {

diff --git a/controllers/heatcfnapi_controller.go b/controllers/heatcfnapi_controller.go
@@ -54,7 +54,6 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 )
 
 // HeatCfnAPIReconciler reconciles a Heat object
@@ -846,21 +845,11 @@ func (r *HeatCfnAPIReconciler) generateServiceSecrets(
 
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(heat.CfnServiceName), map[string]string{})
 
-	db, err := mariadbv1.GetDatabaseByNameAndAccount(ctx, h, heat.DatabaseCRName, instance.Spec.DatabaseAccount, instance.Namespace)
-	if err != nil {
-		return err
-	}
-	var tlsCfg *tls.Service
-	if instance.Spec.TLS.Ca.CaBundleSecretName != "" {
-		tlsCfg = &tls.Service{}
-	}
-
 	// customData hold any customization for the service.
 	// custom.conf is going to /etc/heat/heat.conf.d
 	// TODO: make sure custom.conf can not be overwritten
 	customData := map[string]string{
 		heat.CustomServiceConfigFileName: instance.Spec.CustomServiceConfig,
-		"my.cnf":                         db.GetDatabaseClientConfig(tlsCfg), //(mschuppert) for now just get the default my.cnf
 	}
 
 	for key, data := range instance.Spec.DefaultConfigOverwrite {

diff --git a/controllers/heatengine_controller.go b/controllers/heatengine_controller.go
@@ -50,7 +50,6 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 )
 
 // HeatEngineReconciler reconciles a Heat object
@@ -558,21 +557,11 @@ func (r *HeatEngineReconciler) generateServiceSecrets(
 
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(heat.ServiceName), map[string]string{})
 
-	db, err := mariadbv1.GetDatabaseByNameAndAccount(ctx, h, heat.DatabaseCRName, instance.Spec.DatabaseAccount, instance.Namespace)
-	if err != nil {
-		return err
-	}
-	var tlsCfg *tls.Service
-	if instance.Spec.TLS.CaBundleSecretName != "" {
-		tlsCfg = &tls.Service{}
-	}
-
 	// customData hold any customization for the service.
 	// custom.conf is going to /etc/heat/heat.conf.d
 	// TODO: make sure custom.conf can not be overwritten
 	customData := map[string]string{
 		heat.CustomServiceConfigFileName: instance.Spec.CustomServiceConfig,
-		"my.cnf":                         db.GetDatabaseClientConfig(tlsCfg), //(mschuppert) for now just get the default my.cnf
 	}
 
 	for key, data := range instance.Spec.DefaultConfigOverwrite {

diff --git a/pkg/heat/volumes.go b/pkg/heat/volumes.go
@@ -33,12 +33,6 @@ func GetVolumes(name string) []corev1.Volume {
 				},
 			},
 		},
-		{
-			Name: "config-data-merged",
-			VolumeSource: corev1.VolumeSource{
-				EmptyDir: &corev1.EmptyDirVolumeSource{Medium: ""},
-			},
-		},
 	}
 }
 

diff --git a/pkg/heatapi/volumes.go b/pkg/heatapi/volumes.go
@@ -7,13 +7,15 @@ import (
 
 // getVolumes -
 func getVolumes(parentName string, name string) []corev1.Volume {
+	var config0644AccessMode int32 = 0644
 
 	volumes := []corev1.Volume{
 		{
 			Name: "config-data-custom",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: name + "-config-data",
+					DefaultMode: &config0644AccessMode,
+					SecretName:  name + "-config-data",
 				},
 			},
 		},
@@ -32,6 +34,11 @@ func getVolumeMounts() []corev1.VolumeMount {
 			SubPath:   "heat-api-config.json",
 			ReadOnly:  true,
 		},
+		{
+			Name:      "config-data-custom",
+			MountPath: "/etc/heat/heat.conf.d",
+			ReadOnly:  true,
+		},
 	}
 
 	return append(heat.GetVolumeMounts(), volumeMounts...)

diff --git a/pkg/heatcfnapi/volumes.go b/pkg/heatcfnapi/volumes.go
@@ -7,13 +7,15 @@ import (
 
 // getVolumes -
 func getVolumes(parentName string, name string) []corev1.Volume {
+	var config0644AccessMode int32 = 0644
 
 	volumes := []corev1.Volume{
 		{
 			Name: "config-data-custom",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: name + "-config-data",
+					DefaultMode: &config0644AccessMode,
+					SecretName:  name + "-config-data",
 				},
 			},
 		},
@@ -32,6 +34,11 @@ func getVolumeMounts() []corev1.VolumeMount {
 			SubPath:   "heat-cfnapi-config.json",
 			ReadOnly:  true,
 		},
+		{
+			Name:      "config-data-custom",
+			MountPath: "/etc/heat/heat.conf.d",
+			ReadOnly:  true,
+		},
 	}
 
 	return append(heat.GetVolumeMounts(), volumeMounts...)

diff --git a/pkg/heatengine/volumes.go b/pkg/heatengine/volumes.go
@@ -7,13 +7,15 @@ import (
 
 // getVolumes -
 func getVolumes(parentName string, name string) []corev1.Volume {
+	var config0644AccessMode int32 = 0644
 
 	volumes := []corev1.Volume{
 		{
 			Name: "config-data-custom",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: name + "-config-data",
+					DefaultMode: &config0644AccessMode,
+					SecretName:  name + "-config-data",
 				},
 			},
 		},
@@ -32,6 +34,11 @@ func getVolumeMounts() []corev1.VolumeMount {
 			SubPath:   "heat-engine-config.json",
 			ReadOnly:  true,
 		},
+		{
+			Name:      "config-data-custom",
+			MountPath: "/etc/heat/heat.conf.d",
+			ReadOnly:  true,
+		},
 	}
 
 	return append(heat.GetVolumeMounts(), volumeMounts...)

diff --git a/templates/heat/config/heat-api-config.json b/templates/heat/config/heat-api-config.json
@@ -1,13 +1,6 @@
 {
   "command": "/usr/sbin/httpd -DFOREGROUND",
   "config_files": [
-    {
-      "source": "/var/lib/config-data/default/0*.conf",
-      "dest": "/etc/heat/heat.conf.d/",
-      "merge": false,
-      "preserve_properties": true,
-      "perm": "0644"
-    },
     {
       "source": "/var/lib/config-data/default/heat-api-httpd.conf",
       "dest": "/etc/httpd/conf/httpd.conf",
@@ -39,11 +32,6 @@
     }
   ],
   "permissions": [
-    {
-      "path": "/etc/heat/heat.conf.d",
-      "owner": "heat:heat",
-      "recurse": true
-    },
     {
       "path": "/etc/httpd/",
       "owner": "apache:apache",

diff --git a/templates/heat/config/heat-cfnapi-config.json b/templates/heat/config/heat-cfnapi-config.json
@@ -1,13 +1,6 @@
 {
   "command": "/usr/sbin/httpd -DFOREGROUND",
   "config_files": [
-    {
-      "source": "/var/lib/config-data/default/0*.conf",
-      "dest": "/etc/heat/heat.conf.d/",
-      "merge": false,
-      "preserve_properties": true,
-      "perm": "0644"
-    },
     {
       "source": "/var/lib/config-data/default/heat-cfnapi-httpd.conf",
       "dest": "/etc/httpd/conf/httpd.conf",
@@ -39,11 +32,6 @@
     }
   ],
   "permissions": [
-    {
-      "path": "/etc/heat/heat.conf.d",
-      "owner": "heat:heat",
-      "recurse": true
-    },
     {
       "path": "/etc/httpd/",
       "owner": "apache:apache",

diff --git a/templates/heat/config/heat-engine-config.json b/templates/heat/config/heat-engine-config.json
@@ -1,19 +1,3 @@
 {
-  "command": "/usr/bin/heat-engine --config-dir /etc/heat/heat.conf.d",
-  "config_files": [
-    {
-      "source": "/var/lib/config-data/default/0*.conf",
-      "dest": "/etc/heat/heat.conf.d/",
-      "merge": false,
-      "preserve_properties": true,
-      "perm": "0644"
-    }
-  ],
-  "permissions": [
-    {
-      "path": "/etc/heat/heat.conf.d",
-      "owner": "heat:heat",
-      "recurse": true
-    }
-  ]
+  "command": "/usr/bin/heat-engine --config-dir /etc/heat/heat.conf.d"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,12 +33,6 @@ func GetVolumes(name string) []corev1.Volume { @@
     				},
     			},
     		},
-    		{
-    			Name: "config-data-merged",
-    			VolumeSource: corev1.VolumeSource{
-    				EmptyDir: &corev1.EmptyDirVolumeSource{Medium: ""},
-    			},
-    		},
     	}
     }
@@ Expand Down @@