X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FDAaaS%2Fmicroservices%2Fcollectd-operator%2Fpkg%2Fcontroller%2Fcollectdglobal%2Fcollectdglobal_controller.go;h=0d3e2bbf0a43a628f31f9a684c030ec49ae86702;hb=3d29ee771bf6f0f2c2117cc2908561e228c8123f;hp=c48c2f5ed031b91f4540307b35a9f435ca6c7a39;hpb=d59e778f2b97c96fe7f6c3945f4bb9c91ff01e74;p=demo.git

diff --git a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go
index c48c2f5e..0d3e2bbf 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go
@@ -12,10 +12,10 @@ import (
 
 	onapv1alpha1 "collectd-operator/pkg/apis/onap/v1alpha1"
 	collectdutils "collectd-operator/pkg/controller/utils"
+	dsutils "collectd-operator/pkg/controller/utils"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -74,7 +74,17 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 					var requests []reconcile.Request
 					cg, err := collectdutils.GetCollectdGlobal(rcp.client, a.Meta.GetNamespace())
 					if err != nil || cg == nil {
-						return nil
+						log.V(1).Info("No CollectdGlobal CR instance Exist")
+						cpList, err := collectdutils.GetCollectdPluginList(rcp.client, a.Meta.GetNamespace())
+						if err != nil || cpList == nil || cpList.Items == nil || len(cpList.Items) == 0 {
+							log.V(1).Info("No CollectdPlugin CR instance Exist")
+							return nil
+						}
+						for _, cp := range cpList.Items {
+							requests = append(requests, reconcile.Request{
+								NamespacedName: client.ObjectKey{Namespace: cp.Namespace, Name: cp.Name}})
+						}
+						return requests
 					}
 					requests = append(requests, reconcile.Request{
 						NamespacedName: client.ObjectKey{Namespace: cg.Namespace, Name: cg.Name}})
@@ -82,7 +92,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 				}
 				return nil
 			}),
-		})
+		}, predicate.GenerationChangedPredicate{})
 	if err != nil {
 		return err
 	}
@@ -139,7 +149,7 @@ func (r *ReconcileCollectdGlobal) Reconcile(request reconcile.Request) (reconcil
 		if err := r.addFinalizer(reqLogger, instance); err != nil {
 			return reconcile.Result{}, err
 		}
-		return reconcile.Result{}, nil
+		//return reconcile.Result{}, nil
 	}
 	// Handle the reconciliation for CollectdGlobal.
 	// At this stage the Status of the CollectdGlobal should NOT be ""
@@ -149,48 +159,41 @@ func (r *ReconcileCollectdGlobal) Reconcile(request reconcile.Request) (reconcil
 
 // handleCollectdGlobal regenerates the collectd conf on CR Create, Update, Delete events
 func (r *ReconcileCollectdGlobal) handleCollectdGlobal(reqLogger logr.Logger, cr *onapv1alpha1.CollectdGlobal, isDelete bool) error {
+	collectdutils.ReconcileLock.Lock()
+	defer collectdutils.ReconcileLock.Unlock()
 
-	rmap, err := collectdutils.FindResourceMapForCR(r.client, reqLogger, cr.Namespace)
-	if err != nil {
-		reqLogger.Info(":::: Skip current reconcile:::: Resources not found. Cache might be stale. Requeue")
-		return err
-	}
+	retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		cm, err := collectdutils.GetConfigMap(r.client, reqLogger, cr.Namespace)
+		if err != nil {
+			reqLogger.Info(":::: Skip current reconcile:::: ConfigMap not found. Cache might be stale. Requeue")
+			return err
+		}
 
-	cm := rmap.ConfigMap
-	reqLogger.V(1).Info("Found ResourceMap")
-	reqLogger.V(1).Info(":::: ConfigMap Info ::::", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
+		reqLogger.V(1).Info(":::: ConfigMap Info ::::", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
 
-	collectdConf, err := collectdutils.RebuildCollectdConf(r.client, cr.Namespace, isDelete, "")
-	if err != nil {
-		reqLogger.Error(err, "Skip reconcile: Rebuild conf failed")
-		return err
-	}
+		collectdConf, err := collectdutils.RebuildCollectdConf(r.client, cr.Namespace, isDelete, "")
+		if err != nil {
+			reqLogger.Error(err, "Skip reconcile: Rebuild conf failed")
+			return err
+		}
 
-	cm.SetAnnotations(map[string]string{
-		"daaas-random": collectdutils.ComputeSHA256([]byte(collectdConf)),
-	})
+		cm.SetAnnotations(map[string]string{
+			"daaas-random": collectdutils.ComputeSHA256([]byte(collectdConf)),
+		})
 
-	cm.Data["collectd.conf"] = collectdConf
-	retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		cm.Data["collectd.conf"] = collectdConf
 		// Update the ConfigMap with new Spec and reload DaemonSets
 		reqLogger.Info("Updating the ConfigMap", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
-		log.V(1).Info("ConfigMap Data", "Map: ", cm.Data)
-		err = r.client.Update(context.TODO(), cm)
-		if err != nil {
-			reqLogger.Error(err, "Update the ConfigMap failed", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name)
-			return err
+		updateErr := r.client.Update(context.TODO(), cm)
+		if updateErr != nil {
+			reqLogger.Error(updateErr, "Update ConfigMap failed")
+			return updateErr
 		}
-		return nil
-	})
-	if retryErr != nil {
-		panic(fmt.Errorf("Update failed: %v", retryErr))
-	}
 
-	retryErr = retry.RetryOnConflict(retry.DefaultRetry, func() error {
 		// Retrieve the latest version of Daemonset before attempting update
 		// RetryOnConflict uses exponential backoff to avoid exhausting the apiserver
 		// Select DaemonSets with label
-		dsList := &extensionsv1beta1.DaemonSetList{}
+		dsList := &appsv1.DaemonSetList{}
 		opts := &client.ListOptions{}
 		labelSelector, err := collectdutils.GetWatchLabels()
 		if err != nil {
@@ -213,15 +216,15 @@ func (r *ReconcileCollectdGlobal) handleCollectdGlobal(reqLogger logr.Logger, cr
 		ds.Spec.Template.SetAnnotations(map[string]string{
 			"daaas-random": collectdutils.ComputeSHA256([]byte(collectdConf)),
 		})
-		r.handleAdditonalConfigMap(reqLogger, cr, ds)
-		updateErr := r.client.Update(context.TODO(), ds)
+		r.handleTypesDB(reqLogger, cr, ds, isDelete)
+		updateErr = r.client.Update(context.TODO(), ds)
 		return updateErr
 	})
 	if retryErr != nil {
 		panic(fmt.Errorf("Update failed: %v", retryErr))
 	}
 
-	err = r.updateStatus(cr)
+	err := r.updateStatus(cr)
 	if err != nil {
 		reqLogger.Error(err, "Unable to update status")
 		return err
@@ -311,7 +314,12 @@ func (r *ReconcileCollectdGlobal) addFinalizer(reqLogger logr.Logger, cr *onapv1
 	return nil
 }
 
-func (r *ReconcileCollectdGlobal) handleAdditonalConfigMap(reqLogger logr.Logger, cr *onapv1alpha1.CollectdGlobal, ds *extensionsv1beta1.DaemonSet) error {
+func (r *ReconcileCollectdGlobal) handleTypesDB(reqLogger logr.Logger, cr *onapv1alpha1.CollectdGlobal, ds *appsv1.DaemonSet, isDelete bool) error {
+	if isDelete || cr.Spec.ConfigMap == "" {
+		dsutils.RemoveTypesDB(ds)
+		return nil
+	}
+
 	cm := &corev1.ConfigMap{}
 	key := types.NamespacedName{Namespace: cr.Namespace, Name: cr.Spec.ConfigMap}
 	err := r.client.Get(context.TODO(), key, cm)
@@ -319,6 +327,6 @@ func (r *ReconcileCollectdGlobal) handleAdditonalConfigMap(reqLogger logr.Logger
 		reqLogger.Info("Error getting TypesDB")
 		return nil
 	}
-	// TODO: Implement Types.DB mounting
+	dsutils.UpsertTypesDB(ds, cm, cr)
 	return nil
 }