feat: make affinity, nodeSelector and tolerations blocks optional in the kustomize

Signed-off-by: Robin LIORET <robin.lioret@darylsocialsoftware.com>

Author: Robin LIORET

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/helm_templater.go

@@ -190,9 +190,9 @@ func (t *HelmTemplater) templateDeploymentFields(yamlContent string) string {
 	yamlContent = t.templateVolumeMounts(yamlContent)
 	yamlContent = t.templateVolumes(yamlContent)
 	yamlContent = t.templateControllerManagerArgs(yamlContent)
-	yamlContent = t.templateBasicWithStatement(yamlContent, "nodeSelector", ".Values.manager.nodeSelector")
-	yamlContent = t.templateBasicWithStatement(yamlContent, "affinity", ".Values.manager.affinity")
-	yamlContent = t.templateBasicWithStatement(yamlContent, "tolerations", ".Values.manager.tolerations")
+	yamlContent = t.templateBasicWithStatement(yamlContent, "nodeSelector", "spec.template.spec", ".Values.manager.nodeSelector")
+	yamlContent = t.templateBasicWithStatement(yamlContent, "affinity", "spec.template.spec", ".Values.manager.affinity")
+	yamlContent = t.templateBasicWithStatement(yamlContent, "tolerations", "spec.template.spec", ".Values.manager.tolerations")
 
 	return yamlContent
 }
@@ -623,52 +623,89 @@ func (t *HelmTemplater) templateImageReference(yamlContent string) string {
 	return yamlContent
 }
 
-func (t *HelmTemplater) templateBasicWithStatement(yamlContent string, key string, valuePath string) string {
+func (t *HelmTemplater) templateBasicWithStatement(yamlContent string, key string, parentKey string, valuePath string) string {
+	fmt.Printf("========================\n")
+
+	lines := strings.Split(yamlContent, "\n")
 	yamlKey := fmt.Sprintf("%s:", key)
+
+	var start, end int
+	var indentLen int
 	if !strings.Contains(yamlContent, yamlKey) {
-		return yamlContent
-	}
-	lines := strings.Split(yamlContent, "\n")
-	for i := 0; i < len(lines); i++ {
-		if !strings.HasPrefix(strings.TrimSpace(lines[i]), key) {
-			continue
+		// Find parent block start if the key is missing
+		fmt.Printf("Looking for the parent key\n")
+		pKeyParts := strings.Split(parentKey, ".")
+		pKeyIdx := 0
+		pKeyInit := false
+		currIndent := 0
+		for i := 0; i < len(lines); i++ {
+			_, lineIndent := leadingWhitespace(lines[i])
+			if pKeyInit && lineIndent <= currIndent {
+				fmt.Printf("Parent key not found\n", start)
+				return yamlContent
+			}
+			if !strings.HasPrefix(strings.TrimSpace(lines[i]), pKeyParts[pKeyIdx]) {
+				continue
+			}
+
+			// Parent key part found
+			pKeyIdx++
+			pKeyInit = true
+			if pKeyIdx >= len(pKeyParts) {
+				start = i + 1
+				end = start
+				break
+			}
 		}
-		end := i + 1
-		trimmed := strings.TrimSpace(lines[i])
-		if len(trimmed) == len(yamlKey) {
-			_, indentLen := leadingWhitespace(lines[i])
-			for j := end; j < len(lines); j++ {
-				_, indentLenLine := leadingWhitespace(lines[j])
-				if indentLenLine <= indentLen {
-					end = j
-					break
+		_, indentLen = leadingWhitespace(lines[start])
+	} else {
+		// Find the existing block
+		fmt.Printf("Looking for the existing block\n")
+		for i := 0; i < len(lines); i++ {
+			if !strings.HasPrefix(strings.TrimSpace(lines[i]), key) {
+				continue
+			}
+			start = i
+			end = i + 1
+			trimmed := strings.TrimSpace(lines[i])
+			if len(trimmed) == len(yamlKey) {
+				_, indentLen := leadingWhitespace(lines[i])
+				for j := end; j < len(lines); j++ {
+					_, indentLenLine := leadingWhitespace(lines[j])
+					if indentLenLine <= indentLen {
+						end = j
+						break
+					}
 				}
 			}
 		}
+		_, indentLen = leadingWhitespace(lines[start])
+	}
 
-		indentStr, indentLen := leadingWhitespace(lines[i])
+	fmt.Printf("Start: %d\n", start)
+	fmt.Printf("End: %d\n", end)
 
-		var builder strings.Builder
-		builder.WriteString(indentStr)
-		builder.WriteString("{{- with ")
-		builder.WriteString(valuePath)
-		builder.WriteString(" }}\n")
-		builder.WriteString(indentStr)
-		builder.WriteString(yamlKey)
-		builder.WriteString(" {{ toYaml . | nindent ")
-		builder.WriteString(strconv.Itoa(indentLen + 2))
-		builder.WriteString(" }}\n")
-		builder.WriteString(indentStr)
-		builder.WriteString("{{- end }}\n")
+	indentStr := strings.Repeat(" ", indentLen)
 
-		newBlock := strings.TrimRight(builder.String(), "\n")
+	var builder strings.Builder
+	builder.WriteString(indentStr)
+	builder.WriteString("{{- with ")
+	builder.WriteString(valuePath)
+	builder.WriteString(" }}\n")
+	builder.WriteString(indentStr)
+	builder.WriteString(yamlKey)
+	builder.WriteString(" {{ toYaml . | nindent ")
+	builder.WriteString(strconv.Itoa(indentLen + 4))
+	builder.WriteString(" }}\n")
+	builder.WriteString(indentStr)
+	builder.WriteString("{{- end }}\n")
 
-		newLines := append([]string{}, lines[:i]...)
-		newLines = append(newLines, strings.Split(newBlock, "\n")...)
-		newLines = append(newLines, lines[end:]...)
-		return strings.Join(newLines, "\n")
-	}
-	return yamlContent
+	newBlock := strings.TrimRight(builder.String(), "\n")
+
+	newLines := append([]string{}, lines[:start]...)
+	newLines = append(newLines, strings.Split(newBlock, "\n")...)
+	newLines = append(newLines, lines[end:]...)
+	return strings.Join(newLines, "\n")
 }
 
 // makeWebhookAnnotationsConditional makes only cert-manager annotations conditional, not the entire webhook