fix duplicate topologySpreadConstraints

arttor · Mar 13, 2023 · db73ef4 · db73ef4
1 parent 0294e6b
commit db73ef4
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 174 deletions.
diff --git a/examples/app/templates/deployment.yaml b/examples/app/templates/deployment.yaml
@@ -81,6 +81,7 @@ spec:
         - containerPort: 8443
           name: https
         resources: {}
+      nodeSelector: {{- toYaml .Values.myapp.nodeSelector | nindent 8 }}
       securityContext:
         runAsNonRoot: true
       terminationGracePeriodSeconds: 10

diff --git a/examples/app/values.yaml b/examples/app/values.yaml
@@ -53,6 +53,9 @@ myapp:
       requests:
         cpu: 100m
         memory: 20Mi
+  nodeSelector:
+    region: east
+    type: user-node
   proxySidecar:
     image:
       repository: gcr.io/kubebuilder/kube-rbac-proxy

diff --git a/examples/operator/templates/deployment.yaml b/examples/operator/templates/deployment.yaml
@@ -100,6 +100,7 @@ spec:
           name: secret-volume
       imagePullSecrets:
       - name: {{ include "operator.fullname" . }}-secret-registry-credentials
+      nodeSelector: {{- toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
       securityContext:
         runAsNonRoot: true
       serviceAccountName: {{ include "operator.fullname" . }}-controller-manager
@@ -114,7 +115,4 @@ spec:
         name: manager-config
       - name: secret-volume
         secret:
-          secretName: {{ include "operator.fullname" . }}-secret-ca
-{{- if .Values.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" $) | nindent 8 }}
-{{- end }}
+          secretName: {{ include "operator.fullname" . }}-secret-ca
diff --git a/examples/operator/values.yaml b/examples/operator/values.yaml
@@ -20,11 +20,10 @@ controllerManager:
       requests:
         cpu: 100m
         memory: 20Mi
+  nodeSelector:
+    region: east
+    type: user-node
   replicas: 1
-  topologySpreadConstraints:
-  - maxSkew: 1
-    topologyKey: kubernetes.io/hostname
-    whenUnsatisfiable: DoNotSchedule
 kubernetesClusterDomain: cluster.local
 managerConfig:
   controllerManagerConfigYaml:

diff --git a/pkg/helm/init.go b/pkg/helm/init.go
@@ -99,19 +99,6 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
-
-{{/*
-Renders a value that contains template.
-Usage:
-{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
-*/}}
-{{- define "tplvalues.render" -}}
-    {{- if typeIs "string" .value }}
-        {{- tpl .value .context }}
-    {{- else }}
-        {{- tpl (.value | toYaml) .context }}
-    {{- end }}
-{{- end -}}
 `
 
 const defaultChartfile = `apiVersion: v2

diff --git a/pkg/processor/constraints/constraint.go b/pkg/processor/constraints/constraint.go
diff --git a/pkg/processor/constraints/constraint_test.go b/pkg/processor/constraints/constraint_test.go
diff --git a/pkg/processor/deployment/deployment.go b/pkg/processor/deployment/deployment.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/arttor/helmify/pkg/cluster"
 	"github.com/arttor/helmify/pkg/processor"
-	"github.com/arttor/helmify/pkg/processor/constraints"
 	"github.com/arttor/helmify/pkg/processor/imagePullSecrets"
 
 	"github.com/arttor/helmify/pkg/helmify"
@@ -51,7 +50,6 @@ const selectorTempl = `%[1]s
 const imagePullPolicyTemplate = "{{ .Values.%[1]s.%[2]s.imagePullPolicy }}"
 const envValue = "{{ .Values.%[1]s.%[2]s.%[3]s.%[4]s }}"
 
-
 // New creates processor for k8s Deployment resource.
 func New() helmify.Processor {
 	return &deployment{}
@@ -165,7 +163,22 @@ func (d deployment) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstr
 		imagePullSecrets.ProcessSpecMap(specMap, &values)
 	}
 
-	spec := constraints.ProcessSpecMap(nameCamel, specMap, &values, appMeta.Config().GenerateDefaults)
+	// process nodeSelector if presented:
+	if len(depl.Spec.Template.Spec.NodeSelector) != 0 {
+		err = unstructured.SetNestedField(specMap, fmt.Sprintf(`{{- toYaml .Values.%s.nodeSelector | nindent 8 }}`, nameCamel), "nodeSelector")
+		if err != nil {
+			return true, nil, err
+		}
+		err = unstructured.SetNestedStringMap(values, depl.Spec.Template.Spec.NodeSelector, nameCamel, "nodeSelector")
+		if err != nil {
+			return true, nil, err
+		}
+	}
+
+	spec, err := yamlformat.Marshal(specMap, 6)
+	if err != nil {
+		return true, nil, err
+	}
 	spec = strings.ReplaceAll(spec, "'", "")
 
 	return true, &result{

diff --git a/test_data/k8s-operator-kustomize.output b/test_data/k8s-operator-kustomize.output
@@ -667,6 +667,9 @@ spec:
           allowPrivilegeEscalation: false
       securityContext:
         runAsNonRoot: true
+      nodeSelector:
+        region: east
+        type: user-node
       serviceAccountName: my-operator-controller-manager
       terminationGracePeriodSeconds: 10
       volumes:

diff --git a/test_data/sample-app.yaml b/test_data/sample-app.yaml
@@ -79,6 +79,9 @@ spec:
               name: https
       securityContext:
         runAsNonRoot: true
+      nodeSelector:
+        region: east
+        type: user-node
       terminationGracePeriodSeconds: 10
       volumes:
         - configMap: