Collectd Operator - Added TypesDB feature support

[demo.git] / vnfs / DAaaS / microservices / collectd-operator / pkg / controller / collectdplugin / collectdplugin_controller.go

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 4ce32eb..98d770a 100644 (file)
--- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
@@ -7,9 +7,10 @@ import (
        "strings"
 
        "github.com/go-logr/logr"
+       "github.com/operator-framework/operator-sdk/pkg/predicate"
 
-       onapv1alpha1 "demo/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1"
-       collectdutils "demo/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils"
+       onapv1alpha1 "collectd-operator/pkg/apis/onap/v1alpha1"
+       collectdutils "collectd-operator/pkg/controller/utils"
 
        appsv1 "k8s.io/api/apps/v1"
        corev1 "k8s.io/api/core/v1"
@@ -28,7 +29,6 @@ import (
 
 var log = logf.Log.WithName("controller_collectdplugin")
 
-
 // Add creates a new CollectdPlugin Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager) error {
@@ -51,7 +51,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 
        // Watch for changes to primary resource CollectdPlugin
        log.V(1).Info("Add watcher for primary resource CollectdPlugin")
-       err = c.Watch(&source.Kind{Type: &onapv1alpha1.CollectdPlugin{}}, &handler.EnqueueRequestForObject{})
+       err = c.Watch(&source.Kind{Type: &onapv1alpha1.CollectdPlugin{}}, &handler.EnqueueRequestForObject{}, predicate.GenerationChangedPredicate{})
        if err != nil {
                return err
        }
@@ -60,7 +60,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
        err = c.Watch(
                &source.Kind{Type: &appsv1.DaemonSet{}},
                &handler.EnqueueRequestsFromMapFunc{
-                       ToRequests: handler.ToRequestsFunc(func (a handler.MapObject) []reconcile.Request {
+                       ToRequests: handler.ToRequestsFunc(func(a handler.MapObject) []reconcile.Request {
                                labelSelector, err := collectdutils.GetWatchLabels()
                                labels := strings.Split(labelSelector, "=")
                                if err != nil {
@@ -68,7 +68,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
                                }
                                rcp := r.(*ReconcileCollectdPlugin)
                                // Select the Daemonset with labelSelector (Defautl  is app=collectd)
-                               if a.Meta.GetLabels()[labels[0]] == labels[1]  {
+                               if a.Meta.GetLabels()[labels[0]] == labels[1] {
                                        var requests []reconcile.Request
                                        cpList, err := collectdutils.GetCollectdPluginList(rcp.client, a.Meta.GetNamespace())
                                        if err != nil {
@@ -90,7 +90,6 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
        return nil
 }
 
-
 // blank assignment to verify that ReconcileCollectdPlugin implements reconcile.Reconciler
 var _ reconcile.Reconciler = &ReconcileCollectdPlugin{}
 
@@ -102,7 +101,6 @@ type ReconcileCollectdPlugin struct {
        scheme *runtime.Scheme
 }
 
-
 // Reconcile reads that state of the cluster for a CollectdPlugin object and makes changes based on the state read
 // and what is in the CollectdPlugin.Spec
 // TODO(user): Modify this Reconcile function to implement your Controller logic.  This example creates