Skip to content

Support AGENT_CONFIG from volume mounts and remove secret logging #9243

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
merged 1 commit into from
Oct 28, 2025
Merged

Support AGENT_CONFIG from volume mounts and remove secret logging #9243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions src/deploy/NVA_build/noobaa_init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,24 @@ run_internal_process() {

prepare_agent_conf() {
AGENT_CONF_FILE="/noobaa_storage/agent_conf.json"
if [ -z ${AGENT_CONFIG} ]
then
echo "AGENT_CONFIG is required ENV variable. AGENT_CONFIG is missing. Exit"

[ -f "$AGENT_CONF_FILE" ] && return 0

# get AGENT_CONFIG from env var or file
AGENT_CONFIG_PATH=${AGENT_CONFIG_PATH:-"/etc/agent-config/agent_config"}
AGENT_CONFIG=${AGENT_CONFIG:-$(cat "$AGENT_CONFIG_PATH" 2>/dev/null || echo "")}

if [ -z "${AGENT_CONFIG}" ]; then
echo "AGENT_CONFIG is required. AGENT_CONFIG is not found in env or $AGENT_CONFIG_PATH. Exit"
exit 1
else
echo "Got base64 agent_conf: ${AGENT_CONFIG}"
if [ ! -f $AGENT_CONF_FILE ]; then
openssl enc -base64 -d -A <<<${AGENT_CONFIG} >${AGENT_CONF_FILE}
fi
echo "Written agent_conf.json: $(cat ${AGENT_CONF_FILE})"
fi

# write agent config - decode base64 if not a valid JSON format
if ! echo "${AGENT_CONFIG}" | jq . >"$AGENT_CONF_FILE" 2>/dev/null; then
openssl enc -base64 -d -A <<<"${AGENT_CONFIG}" >"$AGENT_CONF_FILE" || {
echo "AGENT_CONFIG format is invalid. AGENT_CONFIG must be valid JSON or base64 encoded JSON. Exit"
exit 1
}
fi
}

Expand Down