Improve oran_oom helm charts

[it/dep.git] / smo-install / oran_oom / dmaapmediatorservice / templates / statefulset.yaml

diff --git a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml b/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
index c8df034..e3211e2 100644 (file)
--- a/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
+++ b/smo-install/oran_oom/dmaapmediatorservice/templates/statefulset.yaml
@@ -1,82 +1,59 @@
-################################################################################\r
-#   Copyright (c) 2021 Nordix Foundation.                                      #\r
-#                                                                              #\r
-#   Licensed under the Apache License, Version 2.0 (the "License");            #\r
-#   you may not use this file except in compliance with the License.           #\r
-#   You may obtain a copy of the License at                                    #\r
-#                                                                              #\r
-#       http://www.apache.org/licenses/LICENSE-2.0                             #\r
-#                                                                              #\r
-#   Unless required by applicable law or agreed to in writing, software        #\r
-#   distributed under the License is distributed on an "AS IS" BASIS,          #\r
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #\r
-#   See the License for the specific language governing permissions and        #\r
-#   limitations under the License.                                             #\r
-################################################################################\r
-\r
-kind: StatefulSet\r
-apiVersion: apps/v1\r
-metadata:\r
-  name: {{ include "common.name.dmaapmediatorservice" . }}\r
-  namespace: {{ include "common.namespace.nonrtric" . }}\r
-  generation: 1\r
-  labels:\r
-    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}\r
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}\r
-    release: {{ .Release.Name }}\r
-    heritage: {{ .Release.Service }}\r
-  annotations:\r
-    deployment.kubernetes.io/revision: '1'\r
-spec:\r
-  serviceName: {{ include "common.name.dmaapmediatorservice" . }}\r
-  replicas: 1\r
-  selector:\r
-    matchLabels:\r
-      app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}\r
-      release: {{ .Release.Name }}\r
-  template:\r
-    metadata:\r
-      labels:\r
-        app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.dmaapmediatorservice" . }}\r
-        release: {{ .Release.Name }}\r
-    spec:\r
-      hostname: {{ include "common.name.dmaapmediatorservice" . }}\r
-      containers:\r
-      - name: {{ include "common.container.dmaapmediatorservice" . }}\r
-        image: {{ .Values.dmaapmediatorservice.image.registry }}/{{ .Values.dmaapmediatorservice.image.name }}:{{ .Values.dmaapmediatorservice.image.tag }}\r
-        imagePullPolicy: {{ .Values.dmaapmediatorservice.imagePullPolicy }}\r
-        ports:\r
-        - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort1 }}\r
-          protocol: TCP\r
-        - containerPort: {{ .Values.dmaapmediatorservice.service.targetPort2 }}\r
-          protocol: TCP\r
-        readinessProbe:\r
-          tcpSocket:\r
-            port: {{ .Values.dmaapmediatorservice.service.targetPort2 }}\r
-          initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}\r
-          periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}\r
-        livenessProbe:\r
-          tcpSocket:\r
-            port: {{ .Values.dmaapmediatorservice.service.targetPort2 }}\r
-          initialDelaySeconds: {{ .Values.dmaapmediatorservice.liveness.initialDelaySeconds }}\r
-          periodSeconds: {{ .Values.dmaapmediatorservice.liveness.periodSeconds }}\r
-        volumeMounts:\r
-        - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data\r
-          mountPath: /configs/type_config.json\r
-          subPath: type_config.json\r
-\r
-        env:\r
-          - name: INFO_PRODUCER_HOST\r
-            value: https://{{ include "common.name.dmaapmediatorservice" . }}\r
-          - name: INFO_PRODUCER_PORT\r
-            value: "{{ .Values.dmaapmediatorservice.service.internalPort2 }}"\r
-          - name: INFO_COORD_ADDR\r
-            value: https://informationservice:9083\r
-          - name: DMAAP_MR_ADDR\r
-            value: http://message-router.onap:3904\r
-          - name: LOG_LEVEL\r
-            value: Info\r
-      volumes:\r
-        - name: {{ include "common.name.dmaapmediatorservice" . }}-dmaapmediator-data\r
-          configMap:\r
-            name: {{ include "common.name.dmaapmediatorservice" . }}-configmap-data\r
+################################################################################
+#   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 }}