Addressing issues related to multiple apps with same name and different kinds

Fixes: #1409
Fixes: #1410

Author: devdattakulkarni

mutating-webhook/versions.txt

@@ -33,3 +33,4 @@
 3.0.19
 3.0.20
 3.1.0
+3.1.1

mutating-webhook/webhook.go

@@ -1482,6 +1482,40 @@ func handleCustomAPIs(ar *v1.AdmissionReview, httpMethod string) *v1.AdmissionRe
 					},
 				}
 			}
+			nsAnnotations := nsObj.Annotations
+			releaseNameAnnotation := ""
+   			if nsAnnotations != nil {
+        			fmt.Printf("Annotations of namespace %s:\n", crname)
+        			for key, value := range nsAnnotations {
+            				fmt.Printf("%s: %s\n", key, value)
+					if key == "meta.helm.sh/release-name" {
+						releaseNameAnnotation = value
+					}
+        			}
+				if releaseNameAnnotation != "" {
+					releaseNameAnnotation = strings.Replace(releaseNameAnnotation, `"`,"",-1)
+					releaseNameAnnotation = strings.Replace(releaseNameAnnotation, `\`, "",-1)
+					fmt.Printf("Release name annotation:%s\n", releaseNameAnnotation)
+					prts := strings.Split(releaseNameAnnotation, "-")
+					kindInRelease := ""
+        				if len(prts) > 0 {
+                				kindInRelease = prts[0]
+						fmt.Printf("Kind in release:%s\n", kindInRelease)
+						fmt.Printf("Kind in Rescomp:%s\n", kind)
+						if strings.ToLower(kindInRelease) != strings.ToLower(kind) {
+			                                msg := fmt.Sprintf("App with name %s already exists for Kind %s. Use different app name.\n", crname, kindInRelease)
+                        			        return &v1.AdmissionResponse{
+                                        				Result: &metav1.Status{
+                                                			Message: msg,
+                                        			},
+                                			}
+						}
+        				}
+				}
+    			} else {
+        			fmt.Println("No annotations found.")
+    			}
+
 		}
 
 		lengthCheck := kind + "-" + crname

platform-operator/helm-pod/main.go

@@ -339,15 +339,12 @@ func deleteCRDInstances(request *restful.Request, response *restful.Response) {
 			if helmreleaseNS != "" && helmrelease != "" {
 				// Do in the background as 'helm delete' and deleting NS are time consuming actions
 				go func() {
-					deleteHelmRelease(helmreleaseNS, helmrelease)
-
+					op := deleteHelmRelease(helmreleaseNS, helmrelease)
 					fmt.Printf("Helm release deleted...\n")
-					fmt.Printf("Deleting the namespace...\n")
 
-					// The namespace created to deploy the Helm chart
-					// needs to be deleted only if the helmreleaseNS does not match namespace.
-					// For managed app use-case, namespace and helmreleaseNS will be same.
-					if helmreleaseNS != namespace {
+					// Delete the Namespace only if there is no error.
+					if !strings.Contains(strings.ToLower(op), "error") {
+						fmt.Printf("Deleting the namespace...\n")
 						namespaceDeleteCmd := "./root/kubectl delete ns " + helmreleaseNS
 						cmdRunnerPod := getKubePlusPod()
 						_, op := executeExecCall(cmdRunnerPod, namespaceDeleteCmd)
@@ -382,15 +379,15 @@ func deleteCRDInstances(request *restful.Request, response *restful.Response) {
 	//sync.mutex.Unlock()
 }
 
-func deleteHelmRelease(helmreleaseNS, helmrelease string) bool {
+func deleteHelmRelease(helmreleaseNS, helmrelease string) string {
 	//fmt.Printf("Helm release:%s\n", helmrelease)
 	cmd := "helm delete " + helmrelease + " -n " + helmreleaseNS
 	fmt.Printf("Helm delete cmd:%s\n", cmd)
 	var output string
 	cmdRunnerPod := getKubePlusPod()
-	ok, output := executeExecCall(cmdRunnerPod, cmd)
+	_, output = executeExecCall(cmdRunnerPod, cmd)
 	fmt.Printf("Helm delete o/p:%v\n", output)
-	return ok
+	return output
 }
 
 func updateCRDInstances(request *restful.Request, response *restful.Response) {

platform-operator/helm-pod/versions.txt

@@ -38,3 +38,4 @@
 3.0.22
 3.0.23
 3.1.0
+3.1.1