fix according to review

Signed-off-by: RealAnna <[email protected]>

Author: RealAnna

examples/operator/templates/deployment.yaml

@@ -114,4 +114,7 @@ spec:
         name: manager-config
       - name: secret-volume
         secret:
-          secretName: {{ include "operator.fullname" . }}-secret-ca
+          secretName: {{ include "operator.fullname" . }}-secret-ca
+{{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- include "tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" $) | nindent 8 }}
+{{- end }}

pkg/processor/constraints/constraint.go

@@ -25,9 +25,6 @@ const tolerationsExpression = "{{- if .Values.tolerations }}\n" +
 // already has one defined.
 func ProcessSpecMap(name string, specMap map[string]interface{}, values *helmify.Values, defaultEmpty bool) string {
 
-	mapConstraint(name, specMap, topology, values)
-	mapConstraint(name, specMap, tolerations, values)
-	mapConstraint(name, specMap, nodeSelector, values)
 	spec, err := yamlformat.Marshal(specMap, 6)
 	if err != nil {
 		return ""
@@ -40,18 +37,31 @@ func ProcessSpecMap(name string, specMap map[string]interface{}, values *helmify
 		return spec + topologyExpression + nodeSelectorExpression + tolerationsExpression
 	}
 
-	return spec
-}
+	if specMap[topology] != nil {
+		(*values)[name].(map[string]interface{})[topology] = specMap[topology].(interface{})
+		delete(specMap, topology)
+		spec += topologyExpression
+	}
 
-func mapConstraintWithEmpty(name string, specMap map[string]interface{}, constraint string, override interface{}, values *helmify.Values) {
-	if specMap[constraint] == nil {
-		(*values)[name].(map[string]interface{})[constraint] = override
+	if specMap[tolerations] != nil {
+		(*values)[name].(map[string]interface{})[tolerations] = specMap[tolerations].(interface{})
+		delete(specMap, tolerations)
+		spec += tolerationsExpression
 	}
-	delete(specMap, topology)
+	if specMap[nodeSelector] != nil {
+		(*values)[name].(map[string]interface{})[nodeSelector] = specMap[nodeSelector].(interface{})
+		delete(specMap, nodeSelector)
+		spec += nodeSelectorExpression
+	}
+
+	return spec
 }
 
-func mapConstraint(name string, specMap map[string]interface{}, constraint string, values *helmify.Values) {
+func mapConstraintWithEmpty(name string, specMap map[string]interface{}, constraint string, override interface{}, values *helmify.Values) {
 	if specMap[constraint] != nil {
 		(*values)[name].(map[string]interface{})[constraint] = specMap[constraint].(interface{})
+	} else {
+		(*values)[name].(map[string]interface{})[constraint] = override
 	}
+	delete(specMap, constraint)
 }