Further fixes for config delete operation

The issue was related with insufficient handlijg of
different versions of config vs their delete operation
handled by the plugin.

Issue-ID: MULTICLOUD-1332
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I90d896720fa89ebd66cb3290cdd9401272f5e3fd

3 files changed, 101 insertions, 60 deletions

diff --git a/src/k8splugin/plugins/generic/plugin.go b/src/k8splugin/plugins/generic/plugin.go
index f71c436c..5815b74f 100644
--- a/src/k8splugin/plugins/generic/plugin.go
+++ b/src/k8splugin/plugins/generic/plugin.go
@@ -22,6 +22,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/client-go/kubernetes"
+
 	//appsv1beta1 "k8s.io/api/apps/v1beta1"
 	//appsv1beta2 "k8s.io/api/apps/v1beta2"
 	batchv1 "k8s.io/api/batch/v1"
@@ -340,58 +341,58 @@ func (g genericPlugin) Create(yamlFilePath string, namespace string, client plug
 
 // Update deployment object in a specific Kubernetes cluster
 func (g genericPlugin) Update(yamlFilePath string, namespace string, client plugin.KubernetesConnector) (string, 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.DecodeYAML(yamlFilePath, 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")
-        }
-
-        //Add the tracking label to all resources created here
-        labels := unstruct.GetLabels()
-        //Check if labels exist for this object
-        if labels == nil {
-                labels = map[string]string{}
-        }
-        labels[config.GetConfiguration().KubernetesLabelName] = client.GetInstanceID()
-        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.
-        plugin.TagPodsIfPresent(unstruct, client.GetInstanceID())
-
-        gvr := mapping.Resource
-        var updatedObj *unstructured.Unstructured
-
-        switch mapping.Scope.Name() {
-        case meta.RESTScopeNameNamespace:
-                updatedObj, err = dynClient.Resource(gvr).Namespace(namespace).Update(context.TODO(), unstruct, metav1.UpdateOptions{})
-        case meta.RESTScopeNameRoot:
-                updatedObj, err = dynClient.Resource(gvr).Update(context.TODO(), unstruct, metav1.UpdateOptions{})
-        default:
-                return "", pkgerrors.New("Got an unknown RESTSCopeName for mapping: " + gvk.String())
-        }
-
-        if err != nil {
-                return "", pkgerrors.Wrap(err, "Update object error")
-        }
-
-        return updatedObj.GetName(), 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.DecodeYAML(yamlFilePath, 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")
+	}
+
+	//Add the tracking label to all resources created here
+	labels := unstruct.GetLabels()
+	//Check if labels exist for this object
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	labels[config.GetConfiguration().KubernetesLabelName] = client.GetInstanceID()
+	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.
+	plugin.TagPodsIfPresent(unstruct, client.GetInstanceID())
+
+	gvr := mapping.Resource
+	var updatedObj *unstructured.Unstructured
+
+	switch mapping.Scope.Name() {
+	case meta.RESTScopeNameNamespace:
+		updatedObj, err = dynClient.Resource(gvr).Namespace(namespace).Update(context.TODO(), unstruct, metav1.UpdateOptions{})
+	case meta.RESTScopeNameRoot:
+		updatedObj, err = dynClient.Resource(gvr).Update(context.TODO(), unstruct, metav1.UpdateOptions{})
+	default:
+		return "", pkgerrors.New("Got an unknown RESTSCopeName for mapping: " + gvk.String())
+	}
+
+	if err != nil {
+		return "", pkgerrors.Wrap(err, "Update object error")
+	}
+
+	return updatedObj.GetName(), nil
 }
 
 // Get an existing resource hosted in a specific Kubernetes cluster
@@ -425,7 +426,7 @@ func (g genericPlugin) Get(resource helm.KubernetesResource,
 	}
 
 	if err != nil {
-		return "", pkgerrors.Wrap(err, "Delete object error")
+		return "", pkgerrors.Wrap(err, "Get object error")
 	}
 
 	return unstruct.GetName(), nil
diff --git a/src/k8splugin/plugins/namespace/plugin.go b/src/k8splugin/plugins/namespace/plugin.go
index 8732442e..6c6d1f6c 100644
--- a/src/k8splugin/plugins/namespace/plugin.go
+++ b/src/k8splugin/plugins/namespace/plugin.go
@@ -21,10 +21,10 @@ import (
 
 	pkgerrors "github.com/pkg/errors"
 	coreV1 "k8s.io/api/core/v1"
-	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/api/meta"
+	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
@@ -60,7 +60,12 @@ func (p namespacePlugin) Create(yamlFilePath string, namespace string, client pl
 			Name: namespace,
 		},
 	}
-	_, err := client.GetStandardClient().CoreV1().Namespaces().Create(context.TODO(), namespaceObj, metaV1.CreateOptions{})
+	existingNs, err := client.GetStandardClient().CoreV1().Namespaces().Get(context.TODO(), namespace, metaV1.GetOptions{})
+	if err == nil && len(existingNs.ManagedFields) > 0 && existingNs.ManagedFields[0].Manager == "k8plugin" {
+		log.Printf("Namespace (%s) already ensured by plugin. Skip", namespace)
+		return namespace, nil
+	}
+	_, err = client.GetStandardClient().CoreV1().Namespaces().Create(context.TODO(), namespaceObj, metaV1.CreateOptions{})
 	if err != nil {
 		return "", pkgerrors.Wrap(err, "Create Namespace error")
 	}
@@ -128,5 +133,5 @@ func (p namespacePlugin) List(gvk schema.GroupVersionKind, namespace string, cli
 
 func (p namespacePlugin) Update(yamlFilePath string, namespace string, client plugin.KubernetesConnector) (string, error) {
 
-   return "", nil
+	return namespace, nil
 }
diff --git a/src/k8splugin/plugins/service/plugin.go b/src/k8splugin/plugins/service/plugin.go
index aa5c685c..52dd4591 100644
--- a/src/k8splugin/plugins/service/plugin.go
+++ b/src/k8splugin/plugins/service/plugin.go
@@ -21,10 +21,10 @@ import (
 
 	pkgerrors "github.com/pkg/errors"
 	coreV1 "k8s.io/api/core/v1"
-	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/api/meta"
+	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
@@ -156,8 +156,43 @@ func (p servicePlugin) Get(resource helm.KubernetesResource, namespace string, c
 	return service.Name, nil
 }
 
+// Update a service object in a specific Kubernetes cluster
 func (p servicePlugin) Update(yamlFilePath string, namespace string, client plugin.KubernetesConnector) (string, error) {
+	if namespace == "" {
+		namespace = "default"
+	}
 
-        return "", nil
+	obj, err := utils.DecodeYAML(yamlFilePath, nil)
+	if err != nil {
+		return "", pkgerrors.Wrap(err, "Decode service object error")
+	}
 
+	service, ok := obj.(*coreV1.Service)
+	if !ok {
+		return "", pkgerrors.New("Decoded object contains another resource different than Service")
+	}
+	service.Namespace = namespace
+
+	existingService, err := client.GetStandardClient().CoreV1().Services(namespace).Get(context.TODO(), service.Name, metaV1.GetOptions{})
+	if err == nil {
+		service.ResourceVersion = existingService.ResourceVersion
+		service.Spec.ClusterIP = existingService.Spec.ClusterIP
+	} else {
+		return p.Create(yamlFilePath, namespace, client)
+	}
+	labels := service.GetLabels()
+	//Check if labels exist for this object
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	labels[config.GetConfiguration().KubernetesLabelName] = client.GetInstanceID()
+	service.SetLabels(labels)
+
+	_, err = client.GetStandardClient().CoreV1().Services(namespace).Update(context.TODO(), service, metaV1.UpdateOptions{})
+
+	if err != nil {
+		return "", pkgerrors.Wrap(err, "Update object error")
+	}
+
+	return service.Name, nil
 }