platform-api: fix placement of tolerations and nodeSelector

Author: tuxpiper

charts/platform-api/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: ushahidi-platform-api
-version: 0.0.1-alpha.34
+version: 0.0.1-alpha.35
 icon: https://github.ushahidi.org/helm-charts/icon.png

charts/platform-api/templates/api-worker.yml

@@ -295,14 +295,6 @@ spec:
           requests:
             cpu: {{ .Values.api.requests.cpu }}
             memory: {{ .Values.api.requests.memory }}
-        {{- if .Values.api.tolerations }}
-        tolerations:
-{{ toYaml .Values.api.tolerations | indent 10 }}
-        {{- end }}
-        {{- if .Values.api.nodeSelector }}
-        nodeSelector:
-{{ toYaml .Values.api.nodeSelector | indent 10 }}
-        {{- end }}
       {{- if or (.Values.config.dotenv) (.Values.config.dotenv_secret) (.Values.config.passport_keys_secret) }}
       volumes:
       {{- if .Values.config.dotenv  }}
@@ -327,6 +319,14 @@ spec:
       {{- end }}
       {{- end }}
       terminationGracePeriodSeconds: 15
+      {{- if .Values.api.tolerations }}
+      tolerations:
+{{ toYaml .Values.api.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.api.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.api.nodeSelector | indent 8 }}
+      {{- end }}
 
 ---
 apiVersion: v1