From 578ac927dfa7d606285f6b46f110131ef7364623 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 8 Sep 2025 17:17:23 +0200 Subject: [PATCH] Add timeout option to OSM helm chart deployment Change-Id: I280f75801e4f8abd6b2f4858868d380eac995672 Signed-off-by: garciadeblas --- installers/00-default-install-options.rc | 2 +- installers/01-export-osm-install-options.sh | 1 + installers/40-deploy-osm.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/installers/00-default-install-options.rc b/installers/00-default-install-options.rc index eac65698..1961d4fd 100644 --- a/installers/00-default-install-options.rc +++ b/installers/00-default-install-options.rc @@ -47,4 +47,4 @@ export OSM_BEHIND_PROXY= export OPENSHIFT_MGMT_CLUSTER= export MGMT_CLUSTER_CA_FILE= export OSM_K8S_NGINX_IPADDRESS= - +export OSM_HELM_TIMEOUT= diff --git a/installers/01-export-osm-install-options.sh b/installers/01-export-osm-install-options.sh index 2aca7444..414a55f0 100755 --- a/installers/01-export-osm-install-options.sh +++ b/installers/01-export-osm-install-options.sh @@ -63,6 +63,7 @@ export OSM_BEHIND_PROXY=${OSM_BEHIND_PROXY} export OPENSHIFT_MGMT_CLUSTER=${OPENSHIFT_MGMT_CLUSTER} export MGMT_CLUSTER_CA_FILE=${MGMT_CLUSTER_CA_FILE} export OSM_K8S_NGINX_IPADDRESS=${OSM_K8S_NGINX_IPADDRESS} +export OSM_HELM_TIMEOUT=${OSM_HELM_TIMEOUT} EOF cat "${OSM_HOME_DIR}/user-install-options.rc" diff --git a/installers/40-deploy-osm.sh b/installers/40-deploy-osm.sh index aa7f4a28..6b138e0d 100755 --- a/installers/40-deploy-osm.sh +++ b/installers/40-deploy-osm.sh @@ -72,6 +72,7 @@ fi # Generate helm values to be passed with --set OSM_HELM_OPTS="" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set nbi.useOsmSecret=false" +[ -n "${OSM_HELM_TIMEOUT}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --timeout ${OSM_HELM_TIMEOUT}" # TODO: review if next line is really needed or should be conditional to DOCKER_REGISTRY_URL not empty # [ -n "${DOCKER_REGISTRY_URL}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repository=${DOCKER_REGISTRY_URL}${DOCKER_USER}" -- 2.25.1