commit cfb60b18a07ee6a17587985fe0ea456ed0ba7825
author garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Apr 23 17:55:02 2025 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Fri Apr 25 09:37:51 2025 +0200
tree 08e8807670c1bd047aab85c22d04fd2c78c3a086
parent 5b47d2974ddbe7a9cba56886d3a100f2d774a918

Feature 11068: Integration of Airflow helm chart as subchart of OSM helm chart

Change-Id: I287d1767dfb356a27de7999ac39ec21dd29b7e60
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index a79a143..9c6ff88 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -245,7 +245,13 @@
     fi
     [ -n "$OSM_VCA_APIPROXY" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set lcm.config.OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}"
 
-    [ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true"
+    if [ -n "${INSTALL_NGSA}" ]; then
+        OSM_HELM_OPTS="${OSM_HELM_OPTS} --set airflow.defaultAirflowRepository=${DOCKER_REGISTRY_URL}${DOCKER_USER}/airflow"
+        [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string airflow.defaultAirflowTag=${OSM_DOCKER_TAG}"
+        OSM_HELM_OPTS="${OSM_HELM_OPTS} --set airflow.ingress.web.hosts[0].name=airflow.${OSM_K8S_EXTERNAL_IP}.nip.io"
+    else
+        OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true --set airflow.enabled=false"
+    fi
     if [ -n "${OSM_BEHIND_PROXY}" ]; then
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true"
         [ -n "${HTTP_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTP_PROXY=\"${HTTP_PROXY}\""
@@ -446,11 +452,7 @@
     deploy_osm_helm_chart
     track deploy_osm deploy_mongodb_ok
     track deploy_osm deploy_osm_services_k8s_ok
-    if [ -n "$INSTALL_NGSA" ]; then
-        # optional NGSA install
-        install_osm_ngsa_service
-        track deploy_osm install_osm_ngsa_ok
-    fi
+    track deploy_osm install_osm_ngsa_ok
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }