Skip to content

Commit dfdf42c

Browse files
committed
Revert "[patch] enable arcgis clusterrole install in minimal mode"
This reverts commit 9f9a809.
1 parent 9f9a809 commit dfdf42c

1 file changed

Lines changed: 6 additions & 15 deletions

File tree

src/mas/devops/pre_install.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ def _should_apply_preinstall_mas_rbac_file(fileName: str, adminMode: str) -> boo
8181
if adminMode == "namespaced":
8282
return lowerName.startswith("role-non-essential-")
8383

84-
if adminMode == "minimal":
85-
# In minimal mode, apply pipeline-specific and arcgis cluster role RBAC files
86-
return lowerName.startswith("role-pipeline-") or lowerName.startswith("cluster-role-arcgis-")
87-
8884
return False
8985

9086

@@ -271,20 +267,15 @@ def applyPreInstallMASRBAC(
271267
if not rbacRootDir:
272268
rbacRootDir = DEFAULT_PREINSTALL_MAS_RBAC_ROOT
273269

270+
# Minimal mode - essential roles will be applied by each operator
271+
if adminMode == "minimal":
272+
logger.info("Minimal admin mode - essential roles will be applied by each operator")
273+
return
274+
274275
# For cluster mode, use ibm-mas operator only (apps not required)
275276
if adminMode == "cluster":
276-
validatedApps = {"core"} # Use core which maps to ibm-mas operator
277+
validatedApps = {"core", "arcgis"} # Use core which maps to ibm-mas operator
277278
logger.info("Cluster admin mode - using ibm-mas operator only")
278-
elif adminMode == "minimal":
279-
# Minimal mode - apply pipeline-specific roles and arcgis cluster roles if arcgis is selected
280-
validatedApps = {"core"} # Use core for pipeline RBAC
281-
282-
# Add arcgis if it's in selected apps
283-
if selectedApps and "arcgis" in selectedApps:
284-
validatedApps.add("arcgis")
285-
logger.info("Minimal admin mode - applying pipeline-specific RBAC and arcgis cluster roles")
286-
else:
287-
logger.info("Minimal admin mode - applying pipeline-specific RBAC, operators will apply their own essential roles")
288279
else:
289280
# For namespaced mode, validate and use selected apps
290281
validatedApps = _validate_selected_apps(selectedApps)

0 commit comments

Comments
 (0)