Skip to content

Commit 5742a34

Browse files
authored
Ensure legacy whitelist overrides work like ops overrides (#3289)
1 parent 7cdb7d3 commit 5742a34

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

scripts/start-setupRbac

+8-3
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,18 @@ if [[ -v WHITELIST_FILE ]]; then
7777
fi
7878
if [[ -v WHITELIST ]]; then
7979
args=()
80-
if isTrue "${APPEND_WHITELIST:-false}" || isFalse "${OVERRIDE_WHITELIST:-true}"; then
81-
args+=(--append-only)
82-
fi
8380
existing="$EXISTING_WHITELIST_FILE"
8481
if [[ "$EXISTING_WHITELIST_FILE" = SYNC_FILE_MERGE_LIST ]]; then
8582
existing=MERGE
8683
fi
84+
# legacy option
85+
if [[ -v APPEND_WHITELIST ]] && isTrue "${APPEND_WHITELIST}"; then
86+
existing=MERGE
87+
fi
88+
# legacy option
89+
if [[ -v OVERRIDE_WHITELIST ]] && isFalse "${OVERRIDE_WHITELIST}"; then
90+
existing=SKIP
91+
fi
8792
# shellcheck disable=SC2086
8893
mc-image-helper manage-users \
8994
"${sharedArgs[@]}" "${args[@]}" \

0 commit comments

Comments
 (0)