Fix the Collectd operator panic issue

Fixed the panic issue as the daemonset was used instead of
DaemonsetList. Improved the logging to get data from configmap.
Filters used to query ConfigMap was wrong.

Issue-ID: OPTFRA-461
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I14807f7b254ccc0636b5cef6d58b4b6cc0c0e375

1 files changed, 4 insertions, 4 deletions

diff --git a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
index fd35c6f1..5298258b 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
@@ -136,14 +136,14 @@ func (r *ReconcileCollectdPlugin) Reconcile(request reconcile.Request) (reconcil
 	if err := controllerutil.SetControllerReference(instance, cm, r.scheme); err != nil {
 		return reconcile.Result{}, err
 	}
-	// Set CollectdConf instance as the owner and controller
+	// Set CollectdPlugin instance as the owner and controller
 	if err := controllerutil.SetControllerReference(instance, ds, r.scheme); err != nil {
 		return reconcile.Result{}, err
 	}
 
 	// Update the ConfigMap with new Spec and reload DaemonSets
 	reqLogger.Info("Updating the ConfigMap", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
-	log.Info("Map: ", cm.Data)
+	log.Info("ConfigMap Data", "Map: ", cm.Data)
 	err = r.client.Update(context.TODO(), cm)
 	if err != nil {
 		return reconcile.Result{}, err
@@ -180,14 +180,14 @@ func findResourceMapForCR(r *ReconcileCollectdPlugin, cr *onapv1alpha1.CollectdP
 	}
 
 	// Select DaemonSets with label app=collectd
-	dsList := &extensionsv1beta1.DaemonSet{}
+	dsList := &extensionsv1beta1.DaemonSetList{}
 	err = r.client.List(context.TODO(), opts, dsList)
 	if err != nil {
 		return rmap, err
 	}
 
 	rmap.configMap = &cmList.Items[0]
-	rmap.daemonSet = dsList
+	rmap.daemonSet = &dsList.Items[0]
 	return rmap, err
 }