X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmodeling%2Fcomponents%2Fmodeling-etsicatalog%2Ftemplates%2Fdeployment.yaml;h=fbe3e0ca07e60aa57252f441eb32cd626031772a;hb=refs%2Fheads%2Fmaster;hp=64cd89479961da46921e48ffef7edfd9185d8ee5;hpb=c03c938fb9d9ffac940797574a11f95b95f262fc;p=oom.git

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
index 64cd894799..fbe3e0ca07 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
@@ -42,8 +42,8 @@ spec:
         - /app/ready.py
         args:
 {{- if .Values.global.mariadbGalera.localCluster }}
-        - --container-name
-        - {{ index .Values "mariadb-galera" "nameOverride" }}
+        - --service-name
+        - {{ index .Values "mariadb-galera" "service" "name" }}
 {{- else }}
         - --job-name
         - {{ include "common.release" . }}-etsicatalog-db-config-job
@@ -57,8 +57,15 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-job-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "500Mi"
+          requests:
+            cpu: "3m"
+            memory: "20Mi"
       {{ if .Values.config.msb_enabled }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for.msb ) | indent 6 | trim }}
+      {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
       {{ end }}
       - command:
         - /bin/sh
@@ -126,9 +133,6 @@ spec:
           volumeMounts:
           - name: {{ include "common.fullname" . }}-etsicatalog
             mountPath: /service/modeling/etsicatalog/static
-          - name: {{ include "common.fullname" . }}-localtime
-            mountPath: /etc/localtime
-            readOnly: true
           - name: {{ include "common.fullname" . }}-logs
             mountPath: {{ .Values.log.path }}
           - name: {{ include "common.fullname" . }}-logconfig
@@ -155,9 +159,6 @@ spec:
         {{- else }}
           emptyDir: {}
         {{- end }}
-        - name: {{ include "common.fullname" . }}-localtime
-          hostPath:
-            path: /etc/localtime
         - name:  {{ include "common.fullname" . }}-logs
           emptyDir: {}
         - name: {{ include "common.fullname" . }}-logconfig
@@ -165,5 +166,4 @@ spec:
             name : {{ include "common.fullname" . }}-logging-configmap
 
         {{ include "common.log.volumes" . | nindent 8 }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}