X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=blobdiff_plain;f=smo-install%2Foran_oom%2Fdmaapmediatorservice%2Ftemplates%2Fstatefulset.yaml;fp=smo-install%2Foran_oom%2Fdmaapmediatorservice%2Ftemplates%2Fstatefulset.yaml;h=e3211e241c66bdee5ea1b6121282b4aca8b0164d;hp=c8df0349b6b63338789714387b0eba56332088c0;hb=918108f729c368db61fe904024129f21269e19b7;hpb=c9ace66e2b4635918c4c4c473dfc7bcbeb41b7ae

diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
index c8df0349..e3211e24 100644
--- a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
+++ b/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
@@ -1,82 +1,59 @@
-################################################################################
-#   Copyright (c) 2021 Nordix Foundation.                                      #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
-  name: {{ include "common.name.dmaapmediatorservice" . }}
-  namespace: {{ include "common.namespace.nonrtric" . }}
-  generation: 1
-  labels:
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    deployment.kubernetes.io/revision: '1'
-spec:
-  serviceName: {{ include "common.name.dmaapmediatorservice" . }}
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}
-        release: {{ .Release.Name }}
-    spec:
-      hostname: {{ include "common.name.dmaapmediatorservice" . }}
-      containers:
-      - name: {{ include "common.container.dmaapmediatorservice" . }}
-        image: {{ .Values.dmaapmediatorservice.image.registry }}/{{ .Values.dmaapmediatorservice.image.name }}:{{ .Values.dmaapmediatorservice.image.tag }}
-        imagePullPolicy: {{ .Values.dmaapmediatorservice.imagePullPolicy }}
-        ports:
-        - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }}
-          protocol: TCP
-        - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
-          protocol: TCP
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
-          initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.dmaapmediatorservice.service.targetPort2 }}
-          initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}
-        volumeMounts:
-        - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data
-          mountPath: /configs/type_config.json
-          subPath: type_config.json
-
-        env:
-          - name: INFO_PRODUCER_HOST
-            value: https://{{ include "common.name.dmaapmediatorservice" . }}
-          - name: INFO_PRODUCER_PORT
-            value: "{{ .Values.dmaapmediatorservice.service.internalPort2 }}"
-          - name: INFO_COORD_ADDR
-            value: https://informationservice:9083
-          - name: DMAAP_MR_ADDR
-            value: http://message-router.onap:3904
-          - name: LOG_LEVEL
-            value: Info
-      volumes:
-        - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data
-          configMap:
-            name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+kind: StatefulSet
+apiVersion: apps/v1
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+spec:
+  serviceName: {{ include "common.name" . }}
+  replicas: 1
+  selector: {{- include "common.selectors" . | nindent 4 }}
+  template:
+    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+    spec:
+      hostname: {{ include "common.name" . }}
+      {{- if .Values.dmaapTopicInit.enabled }}
+      initContainers: {{- include "dmaapTopic.initContainer" . | nindent 6 }}
+      {{- end }}
+      containers:
+      - name: {{ include "common.containername" . }}
+        image: {{ .Values.image.registry }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
+        ports: {{- include "common.containerPorts" . | nindent 8 }}
+        {{- /* Only the info producer port is active */ -}}
+        {{- include "common.tcpsocketProbes" (dict "port" ((first .Values.service.ports).internalPort_tls) "dot" .) | nindent 8 }}
+        volumeMounts:
+        - name: {{ include "common.name" . }}-dmaapmediator-data
+          mountPath: /configs/type_config.json
+          subPath: type_config.json
+        env:
+          - name: INFO_PRODUCER_HOST
+            value: "{{ default (print "https://" ( include "common.name" . )) .Values.infoProducerHost }}"
+          - name: INFO_PRODUCER_PORT
+            value: "{{ default (first .Values.service.ports).internalPort_tls .Values.infoProducerPort }}"
+          - name: INFO_COORD_ADDR
+            value: "{{ .Values.infoCoordinatorAddr }}"
+          - name: DMAAP_MR_ADDR
+            value: "{{ .Values.dmaapMrAddr }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.logLevel }}"
+      volumes:
+        - name: {{ include "common.name" . }}-dmaapmediator-data
+          configMap:
+            name: {{ include "common.name" . }}-type-configmap
+        {{- if .Values.dmaapTopicInit.enabled -}}
+        {{- include "dmaapTopic.initVolume" . | nindent 8 }}
+        {{- end }}