X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fe2term%2Ftemplates%2Fdeployment.yaml;h=feab4260b00b7a71f38ad9b5799490eb14ed9d82;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=ed80b846307f88f3403768ad51c356ee4e97e4c0;hpb=b40448785de1a21c690a4a8c86c9956391dc2b65;p=it%2Fdep.git diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml index ed80b846..feab4260 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml @@ -42,10 +42,13 @@ spec: release: {{ .Release.Name }} spec: hostname: {{ include "common.name.e2term" . }} - hostNetwork: true + hostNetwork: {{ .Values.e2term.hostnetworkmode }} dnsPolicy: ClusterFirstWithHostNet imagePullSecrets: - name: {{ include "common.repositoryCred" . }} + {{- with .Values.e2term.nodeselector }} + nodeSelector: {{ toYaml . | trim | nindent 8 -}} + {{- end }} containers: - name: {{ include "common.containername.e2term" . }} image: {{ include "common.repository" . }}/{{ .Values.e2term.image.name }}:{{ .Values.e2term.image.tag }} @@ -54,6 +57,19 @@ spec: - mountPath: /opt/e2/router.txt name: local-router-file subPath: router.txt + - mountPath: /tmp/rmr_verbose + name: local-router-file + subPath: rmr_verbose +{{ if .Values.e2term.pizpub.enabled }} + - mountPath: "{{ .Values.e2term.env.messagecollectorfile }}" + name: vol-shared + readOnly: false + subPath: "{{ .Values.e2term.pizpub.scanDirectory }}" +{{ else }} + - mountPath: "{{ .Values.e2term.env.messagecollectorfile }}" + name: vol-shared + readOnly: false +{{ end }} envFrom: - configMapRef: name: {{ include "common.configmapname.e2term" . }}-env @@ -65,8 +81,39 @@ spec: stdin: true tty: true securityContext: - privileged: true + privileged: {{ .Values.e2term.privilegedmode }} + +{{ if .Values.e2term.pizpub.enabled }} + - name: {{ include "common.containername.e2term" . }}-pizpub + image: {{ include "common.repository" . }}/{{ .Values.e2term.pizpub.imageName }}:{{ .Values.e2term.pizpub.imageVersion }} + imagePullPolicy: {{ include "common.pullPolicy" . }} + volumeMounts: + - mountPath: /etc/localtime + name: localtime + readOnly: true + - mountPath: "{{ .Values.e2term.pizpub.dataRootDir }}" + name: vol-shared + readOnly: false + - name: pizpub-config + mountPath: /opt/app/config/conf/ + lifecycle: + postStart: + exec: + command: ["/bin/sh", "/opt/app/config/conf/cleaner.sh", "{{ .Values.e2term.pizpub.dataRootDir }}/{{ .Values.e2term.pizpub.processedDirectory }}", "3"] +{{ end }} volumes: - name: local-router-file configMap: name: {{ include "common.configmapname.e2term" . }}-router-configmap +{{ if .Values.e2term.pizpub.enabled }} + - name: localtime + hostPath: + path: /etc/localtime + - name: pizpub-config + configMap: + name: {{ include "common.configmapname.e2term" . }}-pizpub +{{ end }} + - name: vol-shared + persistentVolumeClaim: + claimName: {{ include "common.pvcname.e2term" . }} +