[COMMON] Harmonize resource settings

[oom.git] / kubernetes / sdc / components / sdc-wfd-be / templates / job.yaml

diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index 4184063..de90704 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -18,14 +18,7 @@
 {{ if .Values.initJob.enabled }}
 apiVersion: batch/v1
 kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}-workflow-init
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}-job
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
   backoffLimit: 20
   template:
@@ -43,7 +36,7 @@ spec:
           - /app/ready.py
           args:
           - --job-name
-          - {{ include "common.release" . }}-sdc-cs-config-cassandra
+          - {{ include "common.release" . }}-sdc-cs
           - "-t"
           - "20"
           env:
@@ -54,11 +47,11 @@ spec:
                 fieldPath: metadata.namespace
           resources:
             limits:
-              cpu: 100m
-              memory: 100Mi
+              cpu: "100m"
+              memory: "0.5Gi"
             requests:
-              cpu: 3m
-              memory: 20Mi
+              cpu: "3m"
+              memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-job
         image:
@@ -72,6 +65,9 @@ spec:
         - /bin/sh
         - -c
         {{- end }}
+        volumeMounts:
+          - name: {{ include "common.fullname" . }}-cqlshrc
+            mountPath: /home/sdc/.cassandra
         env:
           - name: CS_HOST
             value: "{{ .Values.global.sdc_cassandra.serviceName }}"
@@ -85,6 +81,11 @@ spec:
             valueFrom: {secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: sdc_password}}
         resources: {{ include "common.resources" . | nindent 10 }}
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
+      volumes:
+        - name: {{ include "common.fullname" . }}-cqlshrc
+          configMap:
+            name: {{ include "common.release" . }}-sdc-cqlshrc
       imagePullSecrets:
         - name: "{{ include "common.namespace" . }}-docker-registry-key"
 {{ end }}