-
Notifications
You must be signed in to change notification settings - Fork 43
[minor] Improved SLS configuration flow #1438
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.
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
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
durera
approved these changes
Jan 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
SLS related changes
Updated SLS flow
Upload/Replace the license file?ibm-slsmas-{instanceId}-slsor--sls-namespacearg valueUpload/Replace the license file?License file secret is now created in the CLI within
python/src/mas/cli/install/settings/additionalConfigs.pyleveraging theself.addFilesToSecretfunctionImproved the
slsSummaryfunction to display variables depending on what SLS config has been chosenUpdated
python/src/mas/cli/install/argBuilder.pyto show SLS params based on config chosenAdded/updated SLS parameters under various tekton yamls
Separated out the DRO prompts within the
configSLSasconfigDRO. Visually no change though.Other changes
configCatalogfunction to show feature channels more clearly--image-pull-policyarg is now also passed on to interactive mode. This will help with development work.Related PR's
Testing
Interactive
Simple
No SLS on cluster
CLI:
Tekton Params:
sls_channel=3.xsls_entitlement_file=/workspace/entitlement/entitlement.licsls_icr_cpopen=icr.io/cpopensls_mongodb_cfg_file=/workspace/configs/mongo-mongoce.ymlsls_action=installExisting SLS on cluster - No license upload
CLI:
6) Configure AppPoint Licensing By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster. SLS auto-detected: ibm-sls Upload/Replace the license file? [y/n] n Contact e-mail address rawa.resul@ibm.com Contact first name Rawa Contact last name Resul ... 15.3) IBM Suite License Service Namespace ............................... DefaultTekton Params:
sls_channel=3.xsls_icr_cpopen=icr.io/cpopensls_mongodb_cfg_file=/workspace/configs/mongo-mongoce.ymlsls_action=gencfgExisting SLS on cluster - License upload
CLI:
6) Configure AppPoint Licensing By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster. SLS auto-detected: ibm-sls Upload/Replace the license file? [y/n] y License file /mnt/home/entitlement_2.lic Contact e-mail address rawa.resul@ibm.com Contact first name Rawa Contact last name Resul ... 15.3) IBM Suite License Service Namespace ............................... Default Subscription Channel .................... 3.x IBM Open Registry ....................... icr.io/cpopen License File ............................ /mnt/home/entitlement_2.licTekton Params:
sls_channel=3.xsls_entitlement_file=/workspace/entitlement/entitlement_2.licsls_icr_cpopen=icr.io/cpopensls_mongodb_cfg_file=/workspace/configs/mongo-mongoce.ymlsls_action=installAdvanced
Install with Shared SLS
CLI:
Tekton Params:
sls_channel=3.xsls_entitlement_file=/workspace/entitlement/entitlement.licsls_icr_cpopen=icr.io/cpopensls_mongodb_cfg_file=/workspace/configs/mongo-mongoce.ymlsls_action=installInstall with Dedicated SLS
CLI
Tekton Params:
sls_channel=3.xsls_entitlement_file=/workspace/entitlement/entitlement.licsls_namespace=mas-masdev-slssls_icr_cpopen=icr.io/cpopensls_mongodb_cfg_file=/workspace/configs/mongo-mongoce.ymlsls_action=installNon-Interactive
All above scenarios have been tested an ran via command lines as well based on the Non-Interactive Install Command summary