From b54e51a524d3b273f96df68d0e646fd36fc08645 Mon Sep 17 00:00:00 2001
From: Pedro Pereira <pedrocjdpereira@av.it.pt>
Date: Fri, 23 Aug 2024 10:01:42 +0100
Subject: [PATCH] Feature 10983: new environment variable
OSMLCM_NODESELECTORPOSTRENDERERPATH
Change-Id: Ib9b93884ab7e8bcffdcfccc5a1bf79fa232116fd
Signed-off-by: Pedro Pereira <pedrocjdpereira@av.it.pt>
---
docker/LCM/Dockerfile | 1 +
installers/helm/osm/templates/lcm/lcm-configmap.yaml | 1 +
installers/helm/osm/values.yaml | 3 +++
3 files changed, 5 insertions(+)
diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index a9c12e6d..bc17b7e6 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -162,6 +162,7 @@ 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
+ENV OSMLCM_NODESELECTORPOSTRENDERERPATH /app/N2VC/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 38f4d8ed..1102bf58 100644
--- a/installers/helm/osm/templates/lcm/lcm-configmap.yaml
+++ b/installers/helm/osm/templates/lcm/lcm-configmap.yaml
@@ -30,6 +30,7 @@ data:
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 b0a9b8fb..24be083d 100644
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -240,6 +240,9 @@ lcm:
podLabelsPostRenderer:
scriptName: podLabels
path: /usr/lib/python3/dist-packages/n2vc/post-renderer-scripts/podLabels/
+ nodeSelectorPostRenderer:
+ scriptName: nodeSelector
+ path: /usr/lib/python3/dist-packages/n2vc/post-renderer-scripts/nodeSelector/
config:
OSMLCM_VCA_CLOUD: "lxd-cloud"
OSMLCM_VCA_K8S_CLOUD: "k8scloud"
--
GitLab