Skip to content

[patch] configure the app id only in namespaced, and remove the pre install rbac for minimal #346

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
durera merged 2 commits into from
May 21, 2026
+14 −13
Merged

[patch] configure the app id only in namespaced, and remove the pre install rbac for minimal #346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed801a9
[patch] remove the preinstall rbac for minimal
May 21, 2026
e00b60f
[patch] fix the black
May 21, 2026
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
27 changes: 14 additions & 13 deletions src/mas/devops/pre_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ def _should_apply_preinstall_mas_rbac_file(fileName: str, permissionMode: str) -
if not (lowerName.endswith(".yml") or lowerName.endswith(".yaml")):
return False

# TODO: Sort out this openshift-ingress exception properly.
# For now, always apply this manifest in any permission mode.
if lowerName == "role-essential-core-entitymgr-suite-openshift-ingress.yaml":
return True

if permissionMode == "cluster":
return lowerName.startswith("cluster-role-")

Expand Down Expand Up @@ -137,10 +132,6 @@ def _discover_preinstall_mas_rbac_files(
if not rbacRootDir:
rbacRootDir = DEFAULT_PREINSTALL_MAS_RBAC_ROOT

# Due to ingresscontroller role we need to apply the preinstall RBAC for the minimal permission mode
# if permissionMode == "minimal":
# return []

selectedOperatorDirs = _get_selected_operator_dirs(selectedApps)

sourceRoots = [
Expand Down Expand Up @@ -280,12 +271,22 @@ def applyPreInstallMASRBAC(
if not rbacRootDir:
rbacRootDir = DEFAULT_PREINSTALL_MAS_RBAC_ROOT

validatedApps = _validate_selected_apps(selectedApps)

if not validatedApps:
logger.info("No selected apps provided for pre-install MAS RBAC apply")
# Minimal mode - essential roles will be applied by each operator
if permissionMode == "minimal":
logger.info("Minimal permission mode - essential roles will be applied by each operator")
return

# For cluster mode, use ibm-mas operator only (apps not required)
if permissionMode == "cluster":
validatedApps = {"core"} # Use core which maps to ibm-mas operator
logger.info("Cluster permission mode - using ibm-mas operator only")
else:
# For namespaced mode, validate and use selected apps
validatedApps = _validate_selected_apps(selectedApps)
if not validatedApps:
logger.info("No selected apps provided for namespaced mode pre-install MAS RBAC apply")
return

manifestFiles = _discover_preinstall_mas_rbac_files(
rbacRootDir=rbacRootDir,
masVersion=masVersion,
Expand Down
Loading