Fix issue with concurrent CR creation

The collectd operator is going into deadlock when concurrent update
operations happen within the same controller trying to update the
resource. Fixed this by adding Mutex.

Deleted the old build_image.sh which is replaced by new script which
builds and pushes from inside a builder docker container. This helps in
tackling the dependency issues for image build.

Updated the README for build image script usage.

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

2 files changed, 27 insertions, 39 deletions

diff --git a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/collectdutils.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/collectdutils.go
index 95604835..6a85103c 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/collectdutils.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/collectdutils.go
@@ -72,14 +72,28 @@ func GetWatchLabels() (string, error) {
 	return labelSelector, nil
 }
 
-// FindResourceMapForCR returns the configMap, collectd Daemonset and list of Collectd Plugins
-func FindResourceMapForCR(rc client.Client, reqLogger logr.Logger, ns string) (*ResourceMap, error) {
+// GetCollectdPluginList returns the list of CollectdPlugin instances in the namespace ns
+func GetCollectdPluginList(rc client.Client, ns string) (*onapv1alpha1.CollectdPluginList, error) {
+	// Get all collectd plugins in the current namespace to rebuild conf.
+	collectdPlugins := &onapv1alpha1.CollectdPluginList{}
+	cpOpts := &client.ListOptions{}
+	cpOpts.InNamespace(ns)
+	err := rc.List(context.TODO(), cpOpts, collectdPlugins)
+	if err != nil {
+		return nil, err
+	}
+	return collectdPlugins, nil
+}
+
+// GetConfigMap returns the GetConfigMap in the namespace ns
+func GetConfigMap(rc client.Client, reqLogger logr.Logger, ns string) (*corev1.ConfigMap, error) {
 	lock.Lock()
 	defer lock.Unlock()
+
+	reqLogger.Info("Get ConfigMap for collectd.conf")
+	// Get all collectd plugins in the current namespace to rebuild conf.
 	cmList := &corev1.ConfigMapList{}
 	opts := &client.ListOptions{}
-	rmap := &ResourceMap{}
-
 	// Select ConfigMaps with label
 	labelSelector, err := GetWatchLabels()
 	if err != nil {
@@ -90,41 +104,15 @@ func FindResourceMapForCR(rc client.Client, reqLogger logr.Logger, ns string) (*
 
 	err = rc.List(context.TODO(), opts, cmList)
 	if err != nil {
-		return rmap, err
+		return nil, err
 	}
 
 	if cmList.Items == nil || len(cmList.Items) == 0 {
-		return rmap, errors.NewNotFound(corev1.Resource("configmap"), "ConfigMap")
-	}
-
-	// Select DaemonSets with label
-	dsList := &appsv1.DaemonSetList{}
-	err = rc.List(context.TODO(), opts, dsList)
-	if err != nil {
-		return rmap, err
+		return nil, errors.NewNotFound(corev1.Resource("configmap"), "ConfigMap")
 	}
 
-	if dsList.Items == nil || len(dsList.Items) == 0 {
-		return rmap, errors.NewNotFound(corev1.Resource("daemonset"), "DaemonSet")
-	}
-
-	rmap.ConfigMap = &cmList.Items[0]
-	rmap.DaemonSet = &dsList.Items[0]
-
-	return rmap, err
-}
-
-// GetCollectdPluginList returns the list of CollectdPlugin instances in the namespace ns
-func GetCollectdPluginList(rc client.Client, ns string) (*onapv1alpha1.CollectdPluginList, error) {
-	// Get all collectd plugins in the current namespace to rebuild conf.
-	collectdPlugins := &onapv1alpha1.CollectdPluginList{}
-	cpOpts := &client.ListOptions{}
-	cpOpts.InNamespace(ns)
-	err := rc.List(context.TODO(), cpOpts, collectdPlugins)
-	if err != nil {
-		return nil, err
-	}
-	return collectdPlugins, nil
+	cm := &cmList.Items[0]
+	return cm, nil
 }
 
 // GetCollectdGlobal returns the CollectdGlobal instance in the namespace ns
diff --git a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/dsutils.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/dsutils.go
index d52a68ce..c5a44c44 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/dsutils.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/utils/dsutils.go
@@ -2,8 +2,8 @@ package utils
 
 import (
 	"path/filepath"
-	"strings"
 	"strconv"
+	"strings"
 
 	onapv1alpha1 "collectd-operator/pkg/apis/onap/v1alpha1"
 
@@ -26,7 +26,7 @@ const (
 // RemoveTypesDB - removes TypesDB volumes and volume mounts from collectd pods.
 func RemoveTypesDB(ds *appsv1.DaemonSet) {
 	vols := &ds.Spec.Template.Spec.Volumes
-	for i:=0; i < len(*vols); i++ {
+	for i := 0; i < len(*vols); i++ {
 		if (*vols)[i].Name == typesDB {
 			*vols = append((*vols)[:i], (*vols)[i+1:]...)
 			i--
@@ -37,7 +37,7 @@ func RemoveTypesDB(ds *appsv1.DaemonSet) {
 	for j, container := range *containers {
 		if container.Name == collectdContainerName {
 			vms := &(*containers)[j].VolumeMounts
-			for i:=0; i < len(*vms); i++ {
+			for i := 0; i < len(*vms); i++ {
 				if (*vms)[i].Name == typesDB {
 					*vms = append((*vms)[:i], (*vms)[i+1:]...)
 					i--
@@ -81,7 +81,7 @@ func UpsertTypesDB(ds *appsv1.DaemonSet, cm *corev1.ConfigMap, cr *onapv1alpha1.
 	for j, container := range *containers {
 		if container.Name == collectdContainerName {
 			vms := &(*containers)[j].VolumeMounts
-			for i:=0; i < len(*vms); i++ {
+			for i := 0; i < len(*vms); i++ {
 				// Update case (Equivalent to remove and add)
 				if (*vms)[i].Name == typesDB {
 					*vms = append((*vms)[:i], (*vms)[i+1:]...)
@@ -104,7 +104,7 @@ func findMountInfo(cr *onapv1alpha1.CollectdGlobal) *[]corev1.VolumeMount {
 		s := strings.Fields(globalOpt)
 		log.V(1).Info(":::::s:::::", "s:", s)
 		if s != nil && len(s) != 0 && s[0] == "TypesDB" {
-			path,_ := strconv.Unquote(s[1])
+			path, _ := strconv.Unquote(s[1])
 			_, file := filepath.Split(path)
 			log.V(1).Info(":::::file:::::", "s[1]:", path, "file:", file)
 			vm := corev1.VolumeMount{Name: typesDB, MountPath: path, SubPath: file}