Upgraded Daemonset apiversion to apps/v1

[demo.git] / vnfs / DAaaS / microservices / collectd-operator / pkg / controller / collectdglobal / collectdglobal_controller.go

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 701580b..0c4064e 100644 (file)
--- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go
@@ -10,12 +10,12 @@ import (
        "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"
+       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"
@@ -190,7 +190,7 @@ func (r *ReconcileCollectdGlobal) handleCollectdGlobal(reqLogger logr.Logger, cr
                // 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,7 +213,7 @@ 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)
+               r.handleTypesDB(reqLogger, cr, ds, isDelete)
                updateErr := r.client.Update(context.TODO(), ds)
                return updateErr
        })
@@ -311,7 +311,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 +324,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
 }