Feature 11006: make juju installation optional in community installer

[osm/devops.git] / installers / helm / osm / templates / lcm / lcm-deployment.yaml

diff --git a/installers/helm/osm/templates/lcm/lcm-deployment.yaml b/installers/helm/osm/templates/lcm/lcm-deployment.yaml
index e9bfd03..b714f50 100644 (file)
--- 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 }}