Ensure legacy whitelist overrides work like ops overrides (#3289)

itzg · Feb 2, 2025 · 5742a34 · 5742a34
1 parent 7cdb7d3
commit 5742a34
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/scripts/start-setupRbac b/scripts/start-setupRbac
@@ -77,13 +77,18 @@ if [[ -v WHITELIST_FILE ]]; then
 fi
 if [[ -v WHITELIST ]]; then
   args=()
-  if isTrue "${APPEND_WHITELIST:-false}" || isFalse "${OVERRIDE_WHITELIST:-true}"; then
-    args+=(--append-only)
-  fi
   existing="$EXISTING_WHITELIST_FILE"
   if [[ "$EXISTING_WHITELIST_FILE" = SYNC_FILE_MERGE_LIST ]]; then
     existing=MERGE
   fi
+  # legacy option
+  if [[ -v APPEND_WHITELIST ]] && isTrue "${APPEND_WHITELIST}"; then
+    existing=MERGE
+  fi
+  # legacy option
+  if [[ -v OVERRIDE_WHITELIST ]] && isFalse "${OVERRIDE_WHITELIST}"; then
+    existing=SKIP
+  fi
   # shellcheck disable=SC2086
   mc-image-helper manage-users \
     "${sharedArgs[@]}" "${args[@]}" \