X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fhelm%2Fosm%2Ftemplates%2Flcm%2Flcm-deployment.yaml;h=b714f5053950b9c5f82d21fdea48ae4155e44e99;hb=refs%2Fchanges%2F44%2F13944%2F8;hp=e9bfd03fd8284badb2b24c783d0e4acf3c336a21;hpb=8080e4b32d3dc5e66ea85a503a4daa79df3098d0;p=osm%2Fdevops.git diff --git a/installers/helm/osm/templates/lcm/lcm-deployment.yaml b/installers/helm/osm/templates/lcm/lcm-deployment.yaml index e9bfd03f..b714f505 100644 --- a/installers/helm/osm/templates/lcm/lcm-deployment.yaml +++ b/installers/helm/osm/templates/lcm/lcm-deployment.yaml @@ -65,11 +65,13 @@ spec: envFrom: - configMapRef: name: {{ include "osm.fullname" . }}-lcm-configmap - {{- if not .Values.lcm.useOsmSecret }} + {{- if not .Values.lcm.useOsmSecret }} - secretRef: name: {{ .Values.lcm.secretName | default "lcm-secret" }} - {{- end }} + {{- end }} + {{- if or .Values.vca.enabled .Values.lcm.useOsmSecret }} env: + {{- if .Values.vca.enabled }} - name: OSMLCM_VCA_HOST valueFrom: secretKeyRef: @@ -90,18 +92,23 @@ spec: secretKeyRef: name: {{ include "osm.fullname" . }}-vca-secret key: OSM_VCA_CACERT - {{- if .Values.lcm.useOsmSecret }} + {{- end }} + {{- if .Values.lcm.useOsmSecret }} - name: OSMLCM_DATABASE_COMMONKEY valueFrom: secretKeyRef: name: {{ include "osm.fullname" . }}-secret key: OSM_DATABASE_COMMONKEY + {{- end }} {{- end }} volumeMounts: - mountPath: /etc/ssl/certs/osm-ca.crt name: osm-ca readOnly: true subPath: osm-ca.crt + - mountPath: /etc/ssl/lcm-client/ + name: lcm-client-cert + readOnly: true volumes: - name: osm-ca secret: @@ -110,6 +117,10 @@ spec: - key: tls.crt path: osm-ca.crt secretName: osm-ca + - name: lcm-client-cert + secret: + defaultMode: 420 + secretName: lcm-client-cert {{- with .Values.global.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }}