Add lable for VESPAMGR to report xapp name

[it/dev.git] / xapp_onboarder / xapp_onboarder / resources / xapp-std / templates / deployment.yaml

diff --git a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
index 48be8c5..65c2c5d 100644 (file)
--- a/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
@@ -30,8 +30,20 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.annotations }}
+      annotations:
+        {{- range $key, $value := .Values.annotations }}
+          {{- if kindIs "string" $value }}
+        {{ $key }}: {{ $value | toPrettyJson }}
+          {{- else }}
+        {{ $key }}: |
+{{- $value | toPrettyJson | nindent 10 }}
+          {{- end }}
+        {{- end -}}
+      {{ end }}
       labels:
         app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
+        kubernetes_name: {{ include "ricxapp.namespace" . }}_{{ include "ricxapp.name" . }}
         release: {{ .Release.Name }}
     spec:
       hostname: {{ include "ricxapp.name" . }}
@@ -44,31 +56,46 @@ spec:
           configMap:
             name: {{ include "ricxapp.configmapname" . }}-appconfig
       containers:
-{{- range .Values.containers }}
-        - name: {{ .name }}
-          image: "{{ .image.registry }}/{{ .image.name }}:{{ .image.tag }}"
-          {{- if .command }}
-          command: [{{ .command }}]
+{{- $containers := .Values.containers }}
+{{- $ports := .Values.messaging.ports }}
+{{- range $container := $containers }}
+  {{- $portlist := list }}
+  {{- range $port := $ports }}
+    {{- if eq $port.container $container.name }}
+        {{- $portlist = append $portlist $port }}
+    {{- end }}
+  {{- end }}
+        - name: {{ $container.name }}
+          image: "{{ $container.image.registry }}/{{ $container.image.name }}:{{ $container.image.tag }}"
+          {{- if $container.command }}
+          command: [
+          {{- range $command := $container.command -}}
+          {{- $command | quote -}}
+          {{- if ne $command (last $container.command) }}
+          {{- print ", " -}}
+          {{- end -}}
+          {{- end -}}
+          {{- print "]" -}}
+          {{- end}}
+          {{- if $container.args }}
+          args: [
+          {{- range $arg := $container.args -}}
+          {{- $arg | quote -}}
+          {{- if ne $arg (last $container.args) }}
+          {{- print ", " -}}
+          {{- end -}}
+          {{- end -}}
+          {{- print "]" -}}
           {{- end}}
           imagePullPolicy: {{ $.Values.image_pull_policy }}
-          {{- if .ports }}
+  {{- if $portlist }}
           ports:
-            {{- if .ports.http }}
-            - name: http_{{ .name }}
-              containerPort: {{ .ports.http }}
-              protocol: TCP
-            {{- end }}
-            {{- if .ports.rmr_data }}
-            - name: rmrdata_{{ .name }}
-              containerPort: {{ .ports.rmr_data }}
+    {{- range $port := $portlist }}
+            - name: {{ $port.name }}
+              containerPort: {{ $port.port }}
               protocol: TCP
-            {{- end }}
-            {{- if .ports.rmr_route }}
-            - name: rmrroute_{{ .name }}
-              containerPort: {{ .ports.rmr_route }}
-              protocol: TCP
-            {{- end }}
-          {{- end }}
+    {{- end }}
+  {{- end }}
 {{- end }}
           volumeMounts:
             - name: config-volume
@@ -76,4 +103,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "ricxapp.configmapname" . }}-appenv
+            - configMapRef:
+                name: dbaas-appconfig
           restartPolicy: Always