Reintroduce placeholder label (#74)

Author: tardieu

PORTING.md

@@ -18,25 +18,17 @@ to:
 apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 ```
-Second add a namespace label to wrapped resources and pod specs. Concretely,
-replace every instance of:
+Second add a label to pod specs:
 ```yaml
-  labels:
-    appwrapper.mcad.ibm.com: my-appwrapper-name
-```
-with:
-```yaml
-  labels:
-    appwrapper.mcad.ibm.com/namespace: my-appwrapper-namespace
-    appwrapper.mcad.ibm.com: my-appwrapper-name
+appwrapper.mcad.ibm.com: placeholder
 ```
+The label value is not important.
 
 Here is a complete example:
 ```yaml
 apiVersion: workload.codeflare.dev/v1beta1 # new apiVersion
 kind: AppWrapper
 metadata:
-  namespace: default
   name: appwrapper-sample
 spec:
   priority: 5
@@ -57,18 +49,13 @@ spec:
         metadata:
           namespace: default
           name: sample-job
-          labels:
-            appwrapper.mcad.ibm.com/namespace: default # new namespace label
-            appwrapper.mcad.ibm.com: appwrapper-sample
         spec:
           parallelism: 1
           completions: 1
           template:
             metadata:
-              namespace: default
               labels:
-                appwrapper.mcad.ibm.com/namespace: default # new namespace label
-                appwrapper.mcad.ibm.com: appwrapper-sample
+                appwrapper.mcad.ibm.com: placeholder # pod spec label
             spec:
               restartPolicy: Never
               containers:

internal/controller/resource_manager.go

@@ -42,26 +42,30 @@ type PodCounts struct {
 	Succeeded int
 }
 
-// Add labels to metadata for subresources
+// Fix labels in maps
 func fixMap(appWrapper *mcadv1beta1.AppWrapper, m map[string]interface{}) {
-	// inject metadata in templates
-	if template, ok := m["template"].(map[string]interface{}); ok {
-		if _, ok := template["spec"]; ok {
-			if _, ok := template["metadata"]; !ok {
-				template["metadata"] = map[string]interface{}{}
+	// inject placeholder in pod specs
+	if spec, ok := m["spec"].(map[string]interface{}); ok {
+		if _, ok := spec["containers"]; ok {
+			metadata, ok := m["metadata"].(map[string]interface{})
+			if !ok {
+				metadata = map[string]interface{}{}
+				m["metadata"] = metadata
 			}
+			labels, ok := metadata["labels"].(map[string]interface{})
+			if !ok {
+				labels = map[string]interface{}{}
+				metadata["labels"] = labels
+			}
+			labels[nameLabel] = "placeholder"
 		}
 	}
-	// inject labels in metadata
-	if metadata, ok := m["metadata"].(map[string]interface{}); ok {
-		if _, ok := metadata["labels"]; !ok {
-			metadata["labels"] = map[string]interface{}{}
-		}
-	}
-	// inject appwrapper labels
+	// replace placeholder with actual labels
 	if labels, ok := m["labels"].(map[string]interface{}); ok {
-		labels[namespaceLabel] = appWrapper.Namespace
-		labels[nameLabel] = appWrapper.Name
+		if _, ok := labels[nameLabel]; ok {
+			labels[namespaceLabel] = appWrapper.Namespace
+			labels[nameLabel] = appWrapper.Name
+		}
 	}
 	// visit submaps and arrays
 	for _, v := range m {
@@ -74,7 +78,7 @@ func fixMap(appWrapper *mcadv1beta1.AppWrapper, m map[string]interface{}) {
 	}
 }
 
-// Add labels to metadata for subresources
+// Fix labels in arrays
 func fixArray(appWrapper *mcadv1beta1.AppWrapper, a []interface{}) {
 	// visit submaps and arrays
 	for _, v := range a {