Namespace fix (#87)

* Namespace fix
* Configmap generator variable fix

Author: ahma

pkg/controller/plugin/plugin_controller.go

@@ -91,7 +91,7 @@ func (r *ReconcilePlugin) Reconcile(request reconcile.Request) (reconcile.Result
 	// Fetch the Plugin instance
 	instanceList := &loggingv1alpha1.PluginList{}
 
-	err := r.client.List(context.TODO(), client.InNamespace(request.Namespace), instanceList)
+	err := r.client.List(context.TODO(), client.MatchingLabels(map[string]string{}), instanceList)
 	if err != nil {
 		return reconcile.Result{}, err
 	}

pkg/resources/plugins/configmap.go

@@ -18,6 +18,8 @@ package plugins
 
 import (
 	"bytes"
+	"context"
+	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"text/template"
 
 	"github.com/Masterminds/sprig"
@@ -30,6 +32,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+var log = logf.Log.WithName("plugins.configmap")
+
 func generateFluentdConfig(plugin *loggingv1alpha1.Plugin, client client.Client) (string, string) {
 	var finalConfig string
 	// Generate filters
@@ -102,9 +106,28 @@ func (r *Reconciler) appConfigMap() runtime.Object {
 		}
 		appConfigData[name] = data
 	}
+	pluginConfigMapNamespace := r.Namespace
+	cmLog := log.WithValues("pluginConfigMapNamespace", pluginConfigMapNamespace)
+	fluentdList := loggingv1alpha1.FluentdList{}
+	err := r.Client.List(context.TODO(), client.MatchingLabels(map[string]string{}), &fluentdList)
+	if err != nil {
+		cmLog.Error(err, "Reconciler query failed.")
+	}
 
+	if len(fluentdList.Items) > 0 {
+		cmLog = log.WithValues("pluginConfigMapNamespace", pluginConfigMapNamespace, "FluentdNamespace", fluentdList.Items[0].Namespace)
+		cmLog.Info("Check Fluentd Namespace")
+		if pluginConfigMapNamespace != fluentdList.Items[0].Namespace {
+			pluginConfigMapNamespace = fluentdList.Items[0].Namespace
+			cmLog = log.WithValues("pluginConfigMapNamespace", pluginConfigMapNamespace)
+			cmLog.Info("Plugin ConfigMap Namespace Updated")
+
+		}
+	} else {
+		log.Info("The is no Fluentd resource available")
+	}
 	return &corev1.ConfigMap{
-		ObjectMeta: templates.PluginsObjectMeta(appConfigMapName, util.MergeLabels(map[string]string{}, labelSelector), r.Namespace),
+		ObjectMeta: templates.PluginsObjectMeta(appConfigMapName, util.MergeLabels(map[string]string{}, labelSelector), pluginConfigMapNamespace),
 		Data:       appConfigData,
 	}
 }

pkg/resources/plugins/init.go

@@ -49,7 +49,11 @@ func GetDefaultValues(name string) (map[string]string, error) {
 	if !ok {
 		err = fmt.Errorf("plugin %q not found", name)
 	}
-	return value.DefaultValues, err
+	newMap := make(map[string]string)
+	for k, v := range value.DefaultValues {
+		newMap[k] = v
+	}
+	return newMap, err
 }
 
 // GetTemplate get template string by name