X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fholmes%2Fcomponents%2Fholmes-rule-mgmt%2Ftemplates%2Fdeployment.yaml;h=e71187c55701bb319484b6942c4ad1275e232729;hb=refs%2Fheads%2Fmaster;hp=8b0cd8406a4276897ef7a0e5b58127ccc1acdd79;hpb=4a5c1bdbe1198a88f96d04c00fee9e2cf2ec1a07;p=oom.git

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index 8b0cd8406a..e71187c557 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -33,8 +33,10 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
-      {{- if not .Values.global.postgres.localCluster }}
-      {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
+      {{- if .Values.global.postgres.localCluster }}
+      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }}
+      {{ else }}
+      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }}
       {{- end }}
       - name: {{ include "common.name" . }}-env-config
         image: {{ include "repositoryGenerator.image.envsubst" . }}
@@ -55,6 +57,8 @@ spec:
           value: {{ .Values.config.pgConfig.dbHost }}
         - name: DB_PORT
           value: "{{ .Values.config.pgConfig.dbPort }}"
+        - name: NAMESPACE
+          value: {{ include "common.namespace" . }}
         volumeMounts:
         - mountPath: /hrmconfig
           name: {{ include "common.fullname" . }}-general-config
@@ -64,6 +68,7 @@ spec:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources: {{ include "common.resources" . | nindent 10 }}
         ports: {{ include "common.containerPorts" . | nindent 8  }}
         volumeMounts:
         - name: {{ include "common.fullname" . }}-env-config
@@ -132,5 +137,4 @@ spec:
       - name: {{ include "common.fullname" . }}-env-config
         emptyDir:
           medium: Memory
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}