feat(controller): add affinity

Author: duanhongyi

.drone/drone.yml

@@ -118,7 +118,7 @@ steps:
   commands:
   - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/controller/values.yaml
-  - helm package charts/controller --version ${DRONE_TAG:-v1.0.0}
+  - helm package -u charts/controller --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@controller-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:
     CHARTMUSEUM_USERNAME:

charts/controller/Chart.yaml

@@ -1,7 +1,12 @@
 name: controller
 home: https://github.com/drycc/controller
-version: v1.0.0
+apiVersion: v2
+dependencies:
+  - name: common
+    repository: https://charts.drycc.cc/stable
+    version: 1.x.x
 description: Drycc Workflow Controller (API).
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com
+version: v1.0.0

charts/controller/templates/_helpers.tpl

@@ -180,7 +180,6 @@ env:
 {{- end }}
 {{- end }}
 
-
 {{/* Generate controller deployment limits */}}
 {{- define "controller.limits" -}}
 {{- if or (.Values.limitsCpu) (.Values.limitsMemory) }}

charts/controller/templates/controller-celery.yaml

@@ -21,6 +21,7 @@ spec:
       labels:
         app: drycc-controller-celery
     spec:
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-controller-celery")) | indent 6 }}
       serviceAccount: drycc-controller
       initContainers:
       - name: drycc-controller-init

charts/controller/templates/controller-deployment.yaml

@@ -21,6 +21,7 @@ spec:
       labels:
         app: drycc-controller
     spec:
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-controller")) | indent 6 }}
       serviceAccount: drycc-controller
       initContainers:
       - name: drycc-controller-init

charts/controller/templates/controller-webhook-deloyment.yaml

@@ -12,6 +12,7 @@ spec:
       labels:
         component: drycc-controller-webhook
     spec:
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-controller-webhook")) | indent 6 }}
       initContainers:
       - name: drycc-controller-init
         image: docker.io/drycc/python-dev:latest

rootfs/scheduler/resources/pod.py

@@ -96,6 +96,37 @@ def state(self, pod):
 
         return states.get(pod_state, pod_state)
 
+    @classmethod
+    def affinity(cls, name):
+        return {
+            "podAntiAffinity": {
+                "preferredDuringSchedulingIgnoredDuringExecution": [
+                    {
+                        "weight": 100,
+                        "podAffinityTerm": {
+                            "labelSelector": {
+                                "matchExpressions": [
+                                    {"key": "app", "operator": "In", "values": [name, ]}
+                                ]
+                            },
+                            "topologyKey": "topology.kubernetes.io/zone",
+                        }
+                    },
+                    {
+                        "weight": 90,
+                        "podAffinityTerm": {
+                            "labelSelector": {
+                                "matchExpressions": [
+                                    {"key": "app", "operator": "In", "values": [name, ]}
+                                ]
+                            },
+                            "topologyKey": "kubernetes.io/hostname",
+                        }
+                    }
+                ]
+            }
+        }
+
     def manifest(self, namespace, name, image, **kwargs):
         app_type = kwargs.get('app_type')
         volumes = kwargs.get('volumes')
@@ -118,7 +149,9 @@ def manifest(self, namespace, name, image, **kwargs):
               'labels': labels,
               'annotations': kwargs.get('annotations', {}),
             },
-            'spec': {}
+            'spec': {
+                "affinity": self.affinity(name)
+            }
         }
         # pod manifest spec
         spec = manifest['spec']