Merge "[MULTICLOUD] Move multicloud k8s to use strimzi kafka user template"

[oom.git] / kubernetes / holmes / components / holmes-rule-mgmt / templates / deployment.yaml

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index f3e9ce5..8b0cd84 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -32,7 +32,10 @@ spec:
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
-      initContainers: {{- include "common.certInitializer.initContainer" . | nindent 6 }}
+      initContainers:
+      {{- if not .Values.global.postgres.localCluster }}
+      {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
+      {{- end }}
       - name: {{ include "common.name" . }}-env-config
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -62,7 +65,7 @@ spec:
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         ports: {{ include "common.containerPorts" . | nindent 8  }}
-        volumeMounts: {{- include "common.certInitializer.volumeMount" . | nindent 8 }}
+        volumeMounts:
         - name: {{ include "common.fullname" . }}-env-config
           mountPath: /opt/hrmconfig
         - name: {{ include "common.fullname" . }}-rule-config
@@ -93,8 +96,12 @@ spec:
           value: consul-server.{{ include "common.namespace" . }}
         - name: CONFIG_BINDING_SERVICE
           value: config-binding-service
-        - name: msb_hostname
-          value: "msb-iag.onap"
+        - name: MSB_IAG_SERVICE_PROTOCOL
+          value: {{ .Values.global.msbProtocol }}
+        - name: MSB_IAG_SERVICE_HOST
+          value: {{ .Values.global.msbServiceName }}.{{ include "common.namespace" . }}
+        - name: MSB_IAG_SERVICE_PORT
+          value: {{ .Values.global.msbPort | quote}}
         - name: POD_IP
           valueFrom:
             fieldRef:
@@ -113,7 +120,7 @@ spec:
         - name: DB_PORT
           value: "{{ .Values.config.pgConfig.dbPort }}"
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:  {{ include "common.certInitializer.volumes" . | nindent 6 }}
+      volumes:
       - name: {{ include "common.fullname" . }}-general-config
         configMap:
           defaultMode: 422