X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Ftemplates%2Fsdnrdb-init-job.yaml;h=2c31411f877e6ca24c5f3a71825a02de7f0b7d1c;hb=bd0d31acc349a67c01de0595d152b8448b5311d1;hp=4b2f773f061e90e59edbaf87c655a2d4a6a3f72a;hpb=4e1f84c35b578d9c86898d324041c572305ff125;p=oom.git

diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index 4b2f773f06..2c31411f87 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -28,9 +28,9 @@ spec:
         - /app/ready.py
         args:
         {{- if .Values.config.sdnr.mariadb.enabled }}
-        - --container-name
-        - {{ include "common.mariadbService" . }}
-        {{- else -}}
+        - --app-name
+        - {{ include "common.mariadbAppName" . }}
+        {{- else }}
         - --container-name
         - {{.Values.elasticsearch.nameOverride}}-elasticsearch
         - --container-name
@@ -46,6 +46,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "500Mi"
+          requests:
+            cpu: "3m"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}-sdnrdb-init-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
@@ -56,7 +63,7 @@ spec:
           - |
             {{- if .Values.config.sdnr.mariadb.enabled }}
             "{{ .Values.config.binDir }}/createSdnrDb.sh";
-            {{- end -}}
+            {{- end }}
             sleep 90; "{{ .Values.config.binDir }}/startODL.sh"
         env:
           - name: SDNC_AAF_ENABLED
@@ -85,12 +92,12 @@ spec:
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnrdb-secret" "key" "login") | indent 12 }}
           - name: SDNRDBPASSWORD
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnrdb-secret" "key" "password") | indent 12 }}
-        {{- else -}}
+          {{- else }}
           - name: SDNRDBURL
             value: "http://{{ .Values.elasticsearch.service.name | default "sdnrdb"}}.{{.Release.Namespace}}:{{.Values.elasticsearch.service.port | default "9200"}}"
           - name: SDNRDBPARAMETER
             value: "-k"
-        {{- end }}
+          {{- end }}
         {{- if .Values.config.sdnr.mariadb.enabled }}
         volumeMounts:
           - mountPath: {{ .Values.config.binDir }}/createSdnrDb.sh
@@ -138,7 +145,5 @@ spec:
           name: {{ include "common.fullname" . }}-properties
           defaultMode: 0644
       restartPolicy: Never
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
-
+      {{- include "common.imagePullSecrets" . | nindent 6 }}
 {{ end -}}