Feature 10991: new environment variables OSMLCM_VCA_MAINPOSTRENDERERPATH and OSMLCM_VCA_PODLABELSPOSTRENDERERPATH
Change-Id: Ifd1632f546bcdebd985b33accc6d0bf592de68f9
Signed-off-by: Pedro Pereira <pedrocjdpereira@av.it.pt>
diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 2a90f6b..af62d1f 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -159,6 +159,10 @@
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju
+# post-renderers
+ENV OSMLCM_MAINPOSTRENDERERPATH /app/N2VC/n2vc/post-renderer-scripts/mainPostRenderer/mainPostRenderer
+ENV OSMLCM_PODLABELSPOSTRENDERERPATH /app/N2VC/n2vc/post-renderer-scripts/podLabels/podLabels
+
# helm
ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable
# ENV OSMLCM_VCA_HELM_CA_CERTS <ca-cert>
diff --git a/installers/helm/osm/templates/lcm/lcm-configmap.yaml b/installers/helm/osm/templates/lcm/lcm-configmap.yaml
index 9fdfcc8..5cbc1cf 100644
--- a/installers/helm/osm/templates/lcm/lcm-configmap.yaml
+++ b/installers/helm/osm/templates/lcm/lcm-configmap.yaml
@@ -30,6 +30,8 @@
OSMLCM_STORAGE_COLLECTION: "files"
OSMLCM_STORAGE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0"
OSMLCM_GLOBAL_LOGLEVEL: {{ .Values.lcm.logLevel | default .Values.global.logLevel | default "INFO" }}
+ OSMLCM_MAINPOSTRENDERERPATH: "{{ .Values.lcm.mainPostRenderer.path }}{{ .Values.lcm.mainPostRenderer.scriptName }}"
+ OSMLCM_PODLABELSPOSTRENDERERPATH: "{{ .Values.lcm.podLabelsPostRenderer.path }}{{ .Values.lcm.podLabelsPostRenderer.scriptName }}"
{{- if .Values.global.behindHttpProxy -}}
{{- with .Values.global.httpProxy }}
{{- . | toYaml | nindent 2 }}
diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index 1575136..13d8d42 100644
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -203,6 +203,12 @@
# replicaCount: 1
useOsmSecret: true
# secretName: "lcm-secret"
+ mainPostRenderer:
+ scriptName: mainPostRenderer
+ path: /app/N2VC/n2vc/post-renderer-scripts/mainPostRenderer/
+ podLabelsPostRenderer:
+ scriptName: podLabels
+ path: /app/N2VC/n2vc/post-renderer-scripts/podLabels/
config:
OSMLCM_VCA_CLOUD: "lxd-cloud"
OSMLCM_VCA_K8S_CLOUD: "k8scloud"