Merge pull request #60 from cloudkite-io/add-tolerations

Add tolerations, nodeSelector, and affinity to workloads

Author: adeniyistephen

standard-app/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: standard-app
 description: A Helm chart library by Cloudkite
 type: application
-version: 0.9.5
+version: 0.9.6
 maintainters:
   - email: [email protected]
     name: cloudkite

standard-app/example.values.yaml

@@ -318,6 +318,21 @@ apps:
           capabilities:
             drop:
               - ALL
+    nodeSelector:
+      node-label: "my-node-pool" # Optional, if not specified it defaults to the default node selector for the cluster
+    tolerations:
+      - key: purpose
+        operator: Equal
+        value: run-example-app-1a-node
+        effect: NoSchedule
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: cloud.google.com/gke-preemptible
+              operator: DoesNotExist
+
 
   example-app-2:
     serviceAccount: cloudkite
@@ -500,6 +515,20 @@ jobs:
             items:
               - key: env
                 path: .env
+    nodeSelector:
+      node-label: "my-node-pool" # Optional, if not specified it defaults to the default node selector for the cluster
+    tolerations:
+      - key: purpose
+        operator: Equal
+        value: run-example-app-1a-node
+        effect: NoSchedule
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: cloud.google.com/gke-preemptible
+              operator: DoesNotExist
 
 cronjobs:
   cronjobexample-1:
@@ -538,7 +567,20 @@ cronjobs:
             DATE=$(date +%d_%m)
     #'{{ .Files.Get "scripts/test_script.sh" | nindent 4 }}' we are currently working on making configMap script data workable from a repo that's not standard library, for now you can use it like this.
 
-
+    nodeSelector:
+      node-label: "my-node-pool" # Optional, if not specified it defaults to the default node selector for the cluster
+    tolerations:
+      - key: purpose
+        operator: Equal
+        value: run-example-app-1a-node
+        effect: NoSchedule
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: cloud.google.com/gke-preemptible
+              operator: DoesNotExist
     initContainers:
       exampleinitcontainer-1:
         image: google/cloud-sdk

standard-app/templates/workloads/cronjob.yaml

@@ -49,6 +49,18 @@ spec:
               operator: Equal
               value: "true"
           {{- end }}
+          {{- if $cronjobConfig.affinity }}
+          affinity:
+            {{- toYaml $cronjobConfig.affinity | nindent 12 }}
+          {{- end }}
+          {{- if $cronjobConfig.tolerations }}
+          tolerations:
+            {{- toYaml $cronjobConfig.tolerations | nindent 12 }}
+          {{- end }}
+          {{- if $cronjobConfig.nodeSelector }}
+          nodeSelector:
+            {{- toYaml $cronjobConfig.nodeSelector | nindent 12 }}
+          {{- end }}
           {{- if $cronjobConfig.serviceAccount }}
           serviceAccountName: {{ $cronjobConfig.serviceAccount }}
           {{- end }}

standard-app/templates/workloads/deployment.yaml

@@ -56,6 +56,18 @@ spec:
           operator: Equal
           value: "true"
       {{- end }}
+      {{- if $appConfig.affinity }}
+      affinity:
+        {{- toYaml $appConfig.affinity | nindent 8 }}
+      {{- end }}
+      {{- if $appConfig.tolerations }}
+      tolerations:
+        {{- toYaml $appConfig.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if $appConfig.nodeSelector }}
+      nodeSelector:
+        {{- toYaml $appConfig.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- if $appConfig.podSecurityContext }}
       securityContext:
         {{- toYaml $appConfig.podSecurityContext | nindent 8 }}

standard-app/templates/workloads/job.yaml

@@ -39,6 +39,18 @@ spec:
           operator: Equal
           value: "true"
       {{- end }}
+      {{- if $jobConfig.affinity }}
+      affinity:
+        {{- toYaml $jobConfig.affinity | nindent 8 }}
+      {{- end }}
+      {{- if $jobConfig.tolerations }}
+      tolerations:
+        {{- toYaml $jobConfig.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if $jobConfig.nodeSelector }}
+      nodeSelector:
+        {{- toYaml $jobConfig.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- if $jobConfig.serviceAccount }}
       serviceAccountName: {{ $jobConfig.serviceAccount }}
       {{- end }}