Adds composite app status update and query

This patch provides the basic framework for supporting
monitoring of composite application resources in clusters.

1. Updates to the monitor files for use with v2.
2. Invokes the Watcher process per cluster/app when the
   app is instantiated.
3. Adds a ResourceBundleState CR resource to the cluster/app
   so that monitor will be able to update status to it.
4. Watcher updates appropriate appcontext status object
   when updates are made in clusters by monitor
5. Update appcontext library to define a status handle
   and object at the app/cluster level
6. Labels resources with an appropriate tracking label
   to coordinate with the ResourceBundleState CR

Issue-ID: MULTICLOUD-1042
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: If007c1fd86ca7a65bb941d1776cfd2d3afed766b

1 files changed, 46 insertions, 45 deletions

diff --git a/src/rsync/pkg/resource/resource.go b/src/rsync/pkg/resource/resource.go
index 8b45c341..2877e2a3 100644
--- a/src/rsync/pkg/resource/resource.go
+++ b/src/rsync/pkg/resource/resource.go
@@ -20,16 +20,15 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	utils "github.com/onap/multicloud-k8s/src/rsync/pkg/internal"
-	"github.com/onap/multicloud-k8s/src/rsync/pkg/internal/config"
 	"github.com/onap/multicloud-k8s/src/rsync/pkg/connector"
+	utils "github.com/onap/multicloud-k8s/src/rsync/pkg/internal"
 )
 
 type Resource struct {
 }
 
 // Create deployment object in a specific Kubernetes cluster
-func (r Resource) Create(data string, namespace string, client connector.KubernetesConnector) (string, error) {
+func (r Resource) Create(data string, namespace string, label string, client connector.KubernetesConnector) (string, error) {
 	if namespace == "" {
 		namespace = "default"
 	}
@@ -57,13 +56,15 @@ func (r Resource) Create(data string, namespace string, client connector.Kuberne
 	if labels == nil {
 		labels = map[string]string{}
 	}
-	labels[config.GetConfiguration().KubernetesLabelName] = client.GetInstanceID()
+	//labels[config.GetConfiguration().KubernetesLabelName] = client.GetInstanceID()
+	labels["emco/deployment-id"] = label
 	unstruct.SetLabels(labels)
 
 	// This checks if the resource we are creating has a podSpec in it
 	// Eg: Deployment, StatefulSet, Job etc..
 	// If a PodSpec is found, the label will be added to it too.
-	connector.TagPodsIfPresent(unstruct, client.GetInstanceID())
+	//connector.TagPodsIfPresent(unstruct, client.GetInstanceID())
+	connector.TagPodsIfPresent(unstruct, label)
 
 	gvr := mapping.Resource
 	var createdObj *unstructured.Unstructured
@@ -86,44 +87,44 @@ func (r Resource) Create(data string, namespace string, client connector.Kuberne
 
 // Delete an existing resource hosted in a specific Kubernetes cluster
 func (r Resource) Delete(data string, resname string, namespace string, client connector.KubernetesConnector) error {
-        if namespace == "" {
-                namespace = "default"
-        }
-
-        //Decode the yaml file to create a runtime.Object
-        unstruct := &unstructured.Unstructured{}
-        //Ignore the returned obj as we expect the data in unstruct
-        _, err := utils.DecodeYAMLData(data, unstruct)
-        if err != nil {
-                return pkgerrors.Wrap(err, "Decode deployment object error")
-        }
-
-        dynClient := client.GetDynamicClient()
-        mapper := client.GetMapper()
-
-        gvk := unstruct.GroupVersionKind()
-        mapping, err := mapper.RESTMapping(schema.GroupKind{Group: gvk.Group, Kind: gvk.Kind}, gvk.Version)
-        if err != nil {
-                return pkgerrors.Wrap(err, "Mapping kind to resource error")
-        }
-
-        gvr := mapping.Resource
-        deletePolicy := metav1.DeletePropagationForeground
-        opts := &metav1.DeleteOptions{
-                PropagationPolicy: &deletePolicy,
-        }
-
-        switch mapping.Scope.Name() {
-        case meta.RESTScopeNameNamespace:
-                err = dynClient.Resource(gvr).Namespace(namespace).Delete(resname, opts)
-        case meta.RESTScopeNameRoot:
-                err = dynClient.Resource(gvr).Delete(resname, opts)
-        default:
-                return pkgerrors.New("Got an unknown RESTSCopeName for mappin")
-        }
-
-        if err != nil {
-                return pkgerrors.Wrap(err, "Delete object error")
-        }
-        return nil
+	if namespace == "" {
+		namespace = "default"
+	}
+
+	//Decode the yaml file to create a runtime.Object
+	unstruct := &unstructured.Unstructured{}
+	//Ignore the returned obj as we expect the data in unstruct
+	_, err := utils.DecodeYAMLData(data, unstruct)
+	if err != nil {
+		return pkgerrors.Wrap(err, "Decode deployment object error")
+	}
+
+	dynClient := client.GetDynamicClient()
+	mapper := client.GetMapper()
+
+	gvk := unstruct.GroupVersionKind()
+	mapping, err := mapper.RESTMapping(schema.GroupKind{Group: gvk.Group, Kind: gvk.Kind}, gvk.Version)
+	if err != nil {
+		return pkgerrors.Wrap(err, "Mapping kind to resource error")
+	}
+
+	gvr := mapping.Resource
+	deletePolicy := metav1.DeletePropagationForeground
+	opts := &metav1.DeleteOptions{
+		PropagationPolicy: &deletePolicy,
+	}
+
+	switch mapping.Scope.Name() {
+	case meta.RESTScopeNameNamespace:
+		err = dynClient.Resource(gvr).Namespace(namespace).Delete(resname, opts)
+	case meta.RESTScopeNameRoot:
+		err = dynClient.Resource(gvr).Delete(resname, opts)
+	default:
+		return pkgerrors.New("Got an unknown RESTSCopeName for mappin")
+	}
+
+	if err != nil {
+		return pkgerrors.Wrap(err, "Delete object error")
+	}
+	return nil
 }