X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=xapp_onboarder%2Fxapp_onboarder%2Fresources%2Fxapp-std%2Ftemplates%2Fdeployment.yaml;fp=ric-xapps%2Fhelm%2Fxapp-std%2Ftemplates%2Fdeployment.yaml;h=48be8c5367d56d2d75b79facb0c73f4b5e96bbd7;hb=3b56acc14a2308e853612e22738cd44687288149;hp=5afa1267b26874a881ec50a783664bb0458b812f;hpb=96a85f952452bf2efd606dcc52f86250f7da29a0;p=it%2Fdev.git

diff --git a/ric-xapps/helm/xapp-std/templates/deployment.yaml b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
similarity index 69%
rename from ric-xapps/helm/xapp-std/templates/deployment.yaml
rename to xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
index 5afa126..48be8c5 100644
--- a/ric-xapps/helm/xapp-std/templates/deployment.yaml
+++ b/xapp_onboarder/xapp_onboarder/resources/xapp-std/templates/deployment.yaml
@@ -23,7 +23,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.ricxapp.replicaCount }}
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
@@ -36,37 +36,44 @@ spec:
     spec:
       hostname: {{ include "ricxapp.name" . }}
       imagePullSecrets:
-        - name: {{ include "ricxapp.imagepullsecret" . }}
+{{- range .Values.containers }}
+        - name: {{ .image.registry | replace "." "-" | replace ":" "-" | replace "/" "-" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+      volumes:
+        - name: config-volume
+          configMap:
+            name: {{ include "ricxapp.configmapname" . }}-appconfig
       containers:
-        - name: {{ include "ricxapp.containername" . }}
-          image: "{{ .Values.ricxapp.image.repository }}/{{ .Values.ricxapp.image.name }}:{{ .Values.ricxapp.image.tag }}"
-          imagePullPolicy: {{ .Values.ricxapp.image.pullPolicy }}
+{{- range .Values.containers }}
+        - name: {{ .name }}
+          image: "{{ .image.registry }}/{{ .image.name }}:{{ .image.tag }}"
+          {{- if .command }}
+          command: [{{ .command }}]
+          {{- end}}
+          imagePullPolicy: {{ $.Values.image_pull_policy }}
+          {{- if .ports }}
           ports:
-            - name: http
-              containerPort: {{ .Values.ricxapp.service.http.containerPort }}
+            {{- if .ports.http }}
+            - name: http_{{ .name }}
+              containerPort: {{ .ports.http }}
               protocol: TCP
-            - name: rmrroute
-              containerPort: {{ .Values.ricxapp.service.rmr.route.port }}
+            {{- end }}
+            {{- if .ports.rmr_data }}
+            - name: rmrdata_{{ .name }}
+              containerPort: {{ .ports.rmr_data }}
               protocol: TCP
-            - name: rmrdata
-              containerPort: {{ .Values.ricxapp.service.rmr.data.port }}
+            {{- end }}
+            {{- if .ports.rmr_route }}
+            - name: rmrroute_{{ .name }}
+              containerPort: {{ .ports.rmr_route }}
               protocol: TCP
+            {{- end }}
+          {{- end }}
+{{- end }}
           volumeMounts:
             - name: config-volume
-              mountPath: {{ .Values.ricxapp.appconfig.path }}
+              mountPath: {{ .Values.appconfig.path }}
           envFrom:
             - configMapRef:
                 name: {{ include "ricxapp.configmapname" . }}-appenv
-          {{- if .Values.ricxapp.livenessProbe }}
-          livenessProbe:
-            {{- .Values.ricxapp.livenessProbe | nindent 12 -}}
-          {{ end }}
-          {{- if .Values.ricxapp.readinessProbe }}
-          readinessProbe:
-            {{- .Values.ricxapp.readinessProbe | nindent 12 -}}
-          {{ end }}
           restartPolicy: Always
-      volumes:
-        - name: config-volume
-          configMap:
-            name: {{ include "ricxapp.configmapname" . }}-appconfig