Skip to content

Fix backward compatibility for MaaS DB config namespace detection #2991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FedeAlonso merged 5 commits into from
Jul 14, 2026
Merged

Fix backward compatibility for MaaS DB config namespace detection #2991

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e2b13b
Fix backward compatibility for MaaS DB config namespace detection
FedeAlonso Jul 13, 2026
11cb3ad
wait properly to maas controller
FedeAlonso Jul 13, 2026
e99c5af
wait properly to maas controller
FedeAlonso Jul 14, 2026
3c6acb5
Increase tiemout
FedeAlonso Jul 14, 2026
f9d350e
Merge branch 'master' into RHOAIENG-76264
FedeAlonso Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion ods_ci/tasks/Resources/Database/configure_maas_postgres.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,37 @@
esac
}

INFRA_NS=$(derive_infra_namespace "${APPS_NS}")
detect_infra_namespace() {

Check warning on line 32 in ods_ci/tasks/Resources/Database/configure_maas_postgres.sh

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add an explicit return statement at the end of the function. 


See more on https://sonarcloud.io/project/issues?id=red-hat-data-services_ods-ci&issues=AZ9b4vNoT27gCPfsTSQM&open=AZ9b4vNoT27gCPfsTSQM&pullRequest=2991
local apps_ns="$1"

# MaaS provisioning may run before the RHOAI operator has fully deployed
# the maas-controller (CRD registration, reconciliation, and pod scheduling
# can take 10+ minutes after the CSV is ready). Without waiting, detect
# would see no controller and fall back to the apps namespace — then when
# the operator deploys a controller with INFRA_NAMESPACE=AUTO it looks in
# the infra namespace where the secret doesn't exist, and maas-api never
# starts. Wait up to 15 minutes to cover slow clusters.
echo "Waiting for maas-controller deployment in ${apps_ns}..." >&2
for i in $(seq 1 90); do
oc get deployment maas-controller -n "${apps_ns}" &>/dev/null && break
sleep 10
done

local infra_val
infra_val=$(oc get deployment maas-controller -n "${apps_ns}" \
-o jsonpath='{.spec.template.spec.containers[0].env[?(@.name=="INFRA_NAMESPACE")].value}' \
2>/dev/null)

if [[ "${infra_val}" == "AUTO" ]]; then
derive_infra_namespace "${apps_ns}"
elif [[ -n "${infra_val}" ]]; then
echo "${infra_val}"
else
echo "${apps_ns}"
fi
}

INFRA_NS=$(detect_infra_namespace "${APPS_NS}")

# Ensure namespaces exist
oc create namespace "${APPS_NS}" --dry-run=client -o yaml | oc apply -f -
Expand Down
Loading