From 2e51a88e50d7669d681148abb955f036f971318e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 27 Jan 2026 16:55:56 +0100 Subject: [PATCH] Remove postrenderer env variables from LCM configmap and set them in Dockerfile Change-Id: I6f04a46cae9371983a0d8884924b6a460cc4ad21 Signed-off-by: garciadeblas --- docker/LCM/Dockerfile | 6 +++--- installers/helm/osm/templates/lcm/lcm-configmap.yaml | 3 --- installers/helm/osm/values.yaml | 9 --------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index e361eaa5..38c42c4c 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -163,9 +163,9 @@ ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju # post-renderers -ENV OSMLCM_MAINPOSTRENDERERPATH /app/osm_lcm/n2vc/post-renderer-scripts/mainPostRenderer/mainPostRenderer -ENV OSMLCM_PODLABELSPOSTRENDERERPATH /app/osm_lcm/n2vc/post-renderer-scripts/podLabels/podLabels -ENV OSMLCM_NODESELECTORPOSTRENDERERPATH /app/osm_lcm/n2vc/post-renderer-scripts/nodeSelector/nodeSelector +ENV OSMLCM_MAINPOSTRENDERERPATH /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/mainPostRenderer/mainPostRenderer +ENV OSMLCM_PODLABELSPOSTRENDERERPATH /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/podLabels/podLabels +ENV OSMLCM_NODESELECTORPOSTRENDERERPATH /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/nodeSelector/nodeSelector # helm ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable diff --git a/installers/helm/osm/templates/lcm/lcm-configmap.yaml b/installers/helm/osm/templates/lcm/lcm-configmap.yaml index 1102bf58..7210aa91 100644 --- a/installers/helm/osm/templates/lcm/lcm-configmap.yaml +++ b/installers/helm/osm/templates/lcm/lcm-configmap.yaml @@ -28,9 +28,6 @@ data: OSMLCM_STORAGE_PATH: "/app/storage" OSMLCM_STORAGE_COLLECTION: "files" 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 }}" - OSMLCM_NODESELECTORPOSTRENDERERPATH: "{{ .Values.lcm.nodeSelectorPostRenderer.path }}{{ .Values.lcm.nodeSelectorPostRenderer.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 b579424b..bc8ddfd8 100644 --- a/installers/helm/osm/values.yaml +++ b/installers/helm/osm/values.yaml @@ -326,15 +326,6 @@ lcm: # replicaCount: 1 useOsmSecret: true # secretName: "lcm-secret" - mainPostRenderer: - scriptName: mainPostRenderer - path: /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/mainPostRenderer/ - podLabelsPostRenderer: - scriptName: podLabels - path: /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/podLabels/ - nodeSelectorPostRenderer: - scriptName: nodeSelector - path: /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/nodeSelector/ config: OSMLCM_VCA_CLOUD: "lxd-cloud" OSMLCM_VCA_K8S_CLOUD: "k8scloud" -- 2.25.1