Fix customServiceConfig bug <Jira: OSPRH-10696>

Author: mumesan

controllers/ironic_controller.go

@@ -218,6 +218,52 @@ func (r *IronicReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *IronicReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	// watch for configmap where the CM owner label AND the CR.Spec.ManagingCrName label matches
+	configMapFn := func(ctx context.Context, o client.Object) []reconcile.Request {
+		Log := r.GetLogger(ctx)
+
+		result := []reconcile.Request{}
+
+		// get all API CRs
+		apis := &ironicv1.IronicInspectorList{}
+		listOpts := []client.ListOption{
+			client.InNamespace(o.GetNamespace()),
+		}
+		if err := r.Client.List(
+			ctx,
+			apis,
+			listOpts...); err != nil {
+
+			Log.Error(err, "Unable to retrieve API CRs %v")
+			return nil
+		}
+
+		label := o.GetLabels()
+		// TODO: Just trying to verify that the CM is owned by this CR's managing CR
+		if l, ok := label[labels.GetOwnerNameLabelSelector(
+			labels.GetGroupLabel(ironic.ServiceName))]; ok {
+			for _, cr := range apis.Items {
+				// return reconcil event for the CR where the CM owner label
+				// AND the parentIronicName matches
+				if l == ironicv1.GetOwningIronicName(&cr) {
+					// return namespace and Name of CR
+					name := client.ObjectKey{
+						Namespace: o.GetNamespace(),
+						Name:      cr.Name,
+					}
+					Log.Info(fmt.Sprintf(
+						"ConfigMap object %s and CR %s marked with label: %s",
+						o.GetName(), cr.Name, l))
+					result = append(
+						result, reconcile.Request{NamespacedName: name})
+				}
+			}
+		}
+		if len(result) > 0 {
+			return result
+		}
+		return nil
+	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&ironicv1.Ironic{}).
 		Owns(&ironicv1.IronicConductor{}).
@@ -228,10 +274,12 @@ func (r *IronicReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&mariadbv1.MariaDBAccount{}).
 		Owns(&batchv1.Job{}).
 		Owns(&corev1.Secret{}).
-		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.ServiceAccount{}).
 		Owns(&rbacv1.Role{}).
 		Owns(&rbacv1.RoleBinding{}).
+		Watches(
+			&corev1.ConfigMap{},
+			handler.EnqueueRequestsFromMapFunc(configMapFn)).
 		Watches(&keystonev1.KeystoneAPI{},
 			handler.EnqueueRequestsFromMapFunc(r.findObjectForSrc),
 			builder.WithPredicates(keystonev1.KeystoneAPIStatusChangedPredicate)).
@@ -935,8 +983,8 @@ func (r *IronicReconciler) generateServiceConfigMaps(
 	// all other files get placed into /etc/ironic to allow overwrite of e.g. policy.json
 	// TODO: make sure custom.conf can not be overwritten
 	customData := map[string]string{
-		common.CustomServiceConfigFileName: instance.Spec.CustomServiceConfig,
-		"my.cnf":                           db.GetDatabaseClientConfig(tlsCfg), //(mschuppert) for now just get the default my.cnf
+		"01-ironic-custom.conf": instance.Spec.CustomServiceConfig,
+		"my.cnf":                db.GetDatabaseClientConfig(tlsCfg), //(mschuppert) for now just get the default my.cnf
 
 	}
 	for key, data := range instance.Spec.DefaultConfigOverwrite {

pkg/ironicapi/volumes.go

@@ -1,21 +1,24 @@
 package ironicapi
 
 import (
+	"fmt"
+	"strings"
+
 	"github.com/openstack-k8s-operators/ironic-operator/pkg/ironic"
 	corev1 "k8s.io/api/core/v1"
 )
 
 // GetVolumes -
 func GetVolumes(name string) []corev1.Volume {
 	var config0640AccessMode int32 = 0640
-
+	parentName := strings.Replace(name, "-api", "", 1)
 	apiVolumes := []corev1.Volume{
 		{
 			Name: "config-data-custom",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
 					DefaultMode: &config0640AccessMode,
-					SecretName:  name + "-config-data",
+					SecretName:  fmt.Sprintf("%s-config-data", parentName),
 				},
 			},
 		},

pkg/ironicconductor/volumes.go

@@ -2,6 +2,7 @@ package ironicconductor
 
 import (
 	"fmt"
+	"strings"
 
 	ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
 	"github.com/openstack-k8s-operators/ironic-operator/pkg/ironic"
@@ -11,13 +12,15 @@ import (
 // GetVolumes -
 func GetVolumes(instance *ironicv1.IronicConductor) []corev1.Volume {
 	var config0640AccessMode int32 = 0640
+	parentName := strings.Replace(instance.Name, "-conductor", "", 1)
+
 	conductorVolumes := []corev1.Volume{
 		{
 			Name: "config-data-custom",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
 					DefaultMode: &config0640AccessMode,
-					SecretName:  fmt.Sprintf("%s-config-data", instance.Name),
+					SecretName:  fmt.Sprintf("%s-config-data", parentName),
 				},
 			},
 		},

templates/common/bin/common.sh

@@ -44,7 +44,7 @@ function common_ironic_config {
     export CUSTOMCONF=${CustomConf:-""}
 
     SVC_CFG=/etc/ironic/ironic.conf
-    SVC_CFG_MERGED=/var/lib/config-data/merged/ironic.conf
+    SVC_CFG_MERGED=/var/lib/config-data/merged/01-ironic-custom.conf
 
     # Copy default service config from container image as base
     cp -a ${SVC_CFG} ${SVC_CFG_MERGED}

templates/ironicapi/config/ironic-api-config.json

@@ -13,6 +13,12 @@
             "owner": "ironic",
             "perm": "0600"
         },
+        {
+            "source": "/var/lib/config-data/merged/01-ironic-custom.conf",
+            "dest": "/etc/ironic/ironic.conf.d/01-ironic-custom.conf",
+            "owner": "ironic",
+            "perm": "0600"
+        },
         {
             "source": "/var/lib/config-data/merged/ironic-api-httpd.conf",
             "dest": "/etc/httpd/conf/httpd.conf",

templates/ironicconductor/config/ironic-conductor-config.json

@@ -13,6 +13,12 @@
             "owner": "ironic",
             "perm": "0600"
         },
+        {
+            "source": "/var/lib/config-data/merged/01-ironic-custom.conf",
+            "dest": "/etc/ironic/ironic.conf.d/01-ironic-custom.conf",
+            "owner": "ironic",
+            "perm": "0600"
+        },
         {
             "source": "/var/lib/config-data/merged/my.cnf",
             "dest": "/etc/my.cnf",