Skip to content
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

[minor] Improved SLS configuration flow #1438

Merged
merged 81 commits into from
Jan 30, 2025
Merged

[minor] Improved SLS configuration flow #1438

merged 81 commits into from
Jan 30, 2025

Conversation

rawa-resul
Copy link
Contributor

@rawa-resul rawa-resul commented Jan 12, 2025

Description

SLS related changes

  • Updated SLS flow

    • Simplified
      • Install SLS in "ibm-sls" (shared) namespace
      • If namespace exists prompt for Upload/Replace the license file?
      • Otherwise, prompt for License file
    • Advanced
      • Prompt for selection
        • Install MAS with Cluster-Shared License (AppPoints)
          • Sets namespace to ibm-sls
        • Install MAS with Dedicated License (AppPoints)
          • Sets namespace to either mas-{instanceId}-sls or --sls-namespace arg value
      • If namespace exists prompt for Upload/Replace the license file?
      • Otherwise, prompt for License file
  • License file secret is now created in the CLI within python/src/mas/cli/install/settings/additionalConfigs.py leveraging the self.addFilesToSecret function

  • Improved the slsSummary function to display variables depending on what SLS config has been chosen

  • Updated python/src/mas/cli/install/argBuilder.py to show SLS params based on config chosen

  • Added/updated SLS parameters under various tekton yamls

  • Separated out the DRO prompts within the configSLS as configDRO. Visually no change though.

Other changes

  • Update configCatalog function to show feature channels more clearly
  • --image-pull-policy arg is now also passed on to interactive mode. This will help with development work.

Related PR's

Testing

  • All scenarios have been fully tested and verified on a fyre cluster

Interactive

Simple

No SLS on cluster

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.

License file /mnt/home/entitlement.lic
Contact e-mail address [email protected]
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.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement.lic
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Existing 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 [email protected]
Contact first name Rawa
Contact last name Resul

...

15.3) IBM Suite License Service
  Namespace ............................... Default

Tekton Params:
sls_channel = 3.x
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = gencfg

Existing 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 [email protected]
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.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement_2.lic
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Advanced

Install with Shared SLS

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.

Alternatively you may choose to install using a dedicated license only available to this MAS instance.
  1. Install MAS with Cluster-Shared License (AppPoints)
  2. Install MAS with Dedicated License (AppPoints)
SLS Mode 1
License file /mnt/home/entitlement.lic
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul
IBM Data Reporter Operator (DRO) Namespace redhat-marketplace

...

24.3) IBM Suite License Service
  Namespace ............................... ibm-sls
  Subscription Channel .................... 3.x
  IBM Open Registry ....................... icr.io/cpopen
  License File ............................ /mnt/home/entitlement.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement.lic
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Install with Dedicated SLS

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.

Alternatively you may choose to install using a dedicated license only available to this MAS instance.
  1. Install MAS with Cluster-Shared License (AppPoints)
  2. Install MAS with Dedicated License (AppPoints)
SLS Mode 2
License file /mnt/home/entitlement.lic
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul
IBM Data Reporter Operator (DRO) Namespace redhat-marketplace

...

24.3) IBM Suite License Service
  Namespace ............................... mas-masdev-sls
  Subscription Channel .................... 3.x
  IBM Open Registry ....................... icr.io/cpopen
  License File ............................ /mnt/home/entitlement.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement.lic
sls_namespace = mas-masdev-sls
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Non-Interactive

All above scenarios have been tested an ran via command lines as well based on the Non-Interactive Install Command summary

@rawa-resul rawa-resul self-assigned this Jan 12, 2025
@durera durera changed the title [minor] Update SLS configuration flow [minor] Improved SLS configuration flow Jan 30, 2025
@durera durera merged commit a73bef8 into master Jan 30, 2025
12 checks passed
@durera durera deleted the sls-rr branch January 30, 2025 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants