chore(builder): fine management affinity

Author: duanhongyi

charts/builder/Chart.yaml

@@ -9,4 +9,4 @@ description: Git server and application builder for Drycc Workflow.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com
-version: v1.0.0
+version: v1.1.0

charts/builder/templates/_helpers.tpl

@@ -78,9 +78,9 @@ env:
     secretKeyRef:
       name: registry-secret
       key: password
-{{- if (.Values.builder_pod_node_selector) }}
+{{- if (.Values.builderPodNodeSelector) }}
 - name: BUILDER_POD_NODE_SELECTOR
-  value: {{.Values.builder_pod_node_selector}}
+  value: {{.Values.builderPodNodeSelector}}
 {{- end }}
 {{- end }}
 

charts/builder/templates/builder-deployment.yaml

@@ -21,7 +21,10 @@ spec:
       labels:
         app: drycc-builder
     spec:
-      {{- include "common.affinities.pods.soft" (dict "key" "app" "values" (list "drycc-builder")) | indent 6 }}
+      affinity:
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset.type "key" .Values.podAffinityPreset.key "values" .Values.podAffinityPreset.values ) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset.type "key" .Values.podAntiAffinityPreset.key "values" .Values.podAntiAffinityPreset.values ) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values ) | nindent 10 }}
       serviceAccount: drycc-builder
       initContainers:
       - name: drycc-builder-init

charts/builder/values.yaml

@@ -11,7 +11,26 @@ service:
   nodePort: ""
 # limitsCpu: "100m"
 # limitsMemory: "50Mi"
-# builder_pod_node_selector: "disk:ssd"
+
+nodeAffinityPreset:
+  key: "drycc.cc/node"
+  type: "soft"
+  values:
+  - "true"
+
+podAffinityPreset:
+  key: "security"
+  type: ""
+  values:
+  - "drycc-security"
+
+podAntiAffinityPreset:
+  key: "app"
+  type: "soft"
+  values:
+  - "drycc-builder"
+
+# builderPodNodeSelector: "drycc.cc/node:true"
 
 # When the TTL controller cleans up the Job. default: 6h
 # see: https://kubernetes.io/docs/concepts/workloads/controllers/job/#ttl-mechanism-for-finished-jobs