From 5742a346589d58d83817859dd56f2936cbd76b4d Mon Sep 17 00:00:00 2001
From: August Abt <augustabt@users.noreply.github.com>
Date: Sun, 2 Feb 2025 12:48:41 -0800
Subject: [PATCH] Ensure legacy whitelist overrides work like ops overrides
 (#3289)

---
 scripts/start-setupRbac | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/start-setupRbac b/scripts/start-setupRbac
index 27776f14..42a69e5d 100644
--- 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[@]}" \