mas-cli 11.12.0__py3-none-any.whl → 12.0.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "11.12.0"  # Python module compatible semver
+__version__ = "12.0.0"  # Python module compatible semver

mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "11.12.0"
+        self.version = "12.0.0"
         self.h1count = 0
         self.h2count = 0
 
@@ -184,6 +184,21 @@ class BaseApp(PrintMixin, PromptMixin):
             },
         }
 
+        self.licenses = {
+            "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
+            "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
+            "8.11.x": " - <u>https://ibm.biz/MAS811-License</u>\n - <u>https://ibm.biz/MAXIT81-License</u>",
+            "9.0.x": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>",
+            "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\nBe aware, this channel subscription is supported for non-production use only.   \nIt allows early access to new features for evaluation in non-production environments.   \nThis subscription is offered alongside and in parallel with our normal maintained streams.   \nWhen using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment.   \nSeverity must be either 3 or 4 and cases cannot be escalated.   \nPlease refer to IBM documentation for more details.\n",
+        }
+
+        self.upgrade_path = {
+            "9.0.x": "9.1.x-feature",
+            "8.11.x": "9.0.x",
+            "8.10.x": "8.11.x",
+            "8.9.x": "8.10.x",
+        }
+
         self.spinner = {
             "interval": 80,
             "frames": [" ⠋", " ⠙", " ⠹", " ⠸", " ⠼", " ⠴", " ⠦", " ⠧", " ⠇", " ⠏"]

mas/cli/install/app.py

@@ -112,19 +112,11 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
     @logMethodCall
     def licensePrompt(self):
-        licenses = {
-            "8.9.x": " - <u>https://ibm.biz/MAS89-License</u>",
-            "8.10.x": " - <u>https://ibm.biz/MAS810-License</u>",
-            "8.11.x": " - <u>https://ibm.biz/MAS811-License</u>\n - <u>https://ibm.biz/MAXIT81-License</u>",
-            "9.0.x": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>",
-            "9.1.x-feature": " - <u>https://ibm.biz/MAS90-License</u>\n - <u>https://ibm.biz/MaximoIT90-License</u>\n - <u>https://ibm.biz/MAXArcGIS90-License</u>\n\n - Be aware, this channel subscription is supported for non-production use only.  It allows early access to new features for evaluation is non-production environments. This subscription is offered alongside and in parallel with our normal maintained streams.  When using this subscription, IBM Support will only accept cases for the latest available bundle deployed in a non-production environment. Severity must be either 3 or 4 and cases cannot be escalated.  Please refer to IBM documentation for more details.\n",
-        }
-
         if not self.licenseAccepted:
             self.printH1("License Terms")
             self.printDescription([
                 "To continue with the installation, you must accept the license terms:",
-                licenses[self.getParam('mas_channel')]
+                self.licenses[self.getParam('mas_channel')]
             ])
 
             if self.noConfirm:
@@ -175,62 +167,28 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
 
-        self.catalogReleases = ["9.0.x", "8.11.x", "8.10.x"]
-
-        self.catalogTable = [
-            {
-                "": "Core",
-                "9.1.x-feature": self.chosenCatalog["mas_core_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_core_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_core_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_core_version"]["8.10.x"]
-            },
-            {
-                "": "Manage",
-                "9.1.x-feature": self.chosenCatalog["mas_manage_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_manage_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_manage_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_manage_version"]["8.10.x"]
-            },
-            {
-                "": "IoT",
-                "9.0.x": self.chosenCatalog["mas_iot_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_iot_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_iot_version"]["8.10.x"]
-            },
-            {
-                "": "Monitor",
-                "9.0.x": self.chosenCatalog["mas_monitor_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_monitor_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_monitor_version"]["8.10.x"]
-            },
-            {
-                "": "Assist",
-                "9.0.x": self.chosenCatalog["mas_assist_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_assist_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_assist_version"]["8.10.x"]
-            },
-            {
-                "": "Optimizer",
-                "9.1.x-feature": self.chosenCatalog["mas_optimizer_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_optimizer_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_optimizer_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_optimizer_version"]["8.10.x"]
-            },
-            {
-                "": "Predict",
-                "9.0.x": self.chosenCatalog["mas_predict_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_predict_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_predict_version"]["8.10.x"]
-            },
-            {
-                "": "Inspection",
-                "9.1.x-feature": self.chosenCatalog["mas_visualinspection_version"]["9.1.x-feature"],
-                "9.0.x": self.chosenCatalog["mas_visualinspection_version"]["9.0.x"],
-                "8.11.x": self.chosenCatalog["mas_visualinspection_version"]["8.11.x"],
-                "8.10.x": self.chosenCatalog["mas_visualinspection_version"]["8.10.x"]
-            }
-        ]
+        self.catalogReleases = []
+        self.catalogTable = []
+
+        applications = {
+            "Core": "mas_core_version",
+            "Manage": "mas_manage_version",
+            "IoT": "mas_iot_version",
+            "Monitor": "mas_monitor_version",
+            "Assist": "mas_assist_version",
+            "Optimizer": "mas_optimizer_version",
+            "Predict": "mas_predict_version",
+            "Inspection": "mas_visualinspection_version",
+        }
+
+        # Dynamically fetch the channels from the chosen catalog
+        # based on mas core
+        for channel in self.chosenCatalog["mas_core_version"]:
+            self.catalogReleases.append(channel)
+
+        # Generate catalogTable
+        for application, key in applications.items():
+            self.catalogTable.append({"": application} | self.chosenCatalog[key])
 
         summary = [
             "",

mas/cli/install/catalogs.py

@@ -9,13 +9,13 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-241205-amd64",
         "v9-241107-amd64",
         "v9-241003-amd64",
         "v9-240827-amd64",
-        "v9-241205-amd64"
     ],
     "s390x": [
+        "v9-241205-s390x",
         "v9-241107-s390x",
-        "v9-241205-s390x"
-    ]
+    ],
 }

mas/cli/templates/ibm-mas-tekton.yaml

@@ -231,7 +231,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
@@ -342,7 +342,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -460,7 +460,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -530,7 +530,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -843,7 +843,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -960,7 +960,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1066,7 +1066,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1388,7 +1388,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1498,7 +1498,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1587,7 +1587,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1691,7 +1691,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1773,7 +1773,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1869,6 +1869,20 @@ spec:
     - name: redhat_cert_manager_install_plan
       type: string
       default: "Automatic"
+
+    - name: group_sync_operator_cron_schedule
+      type: string
+      default: ''
+    - name: group_sync_operator_isv_tenant_url
+      type: string
+      default: ''
+    - name: group_sync_operator_isv_groups
+      type: string
+      default: ''
+    - name: ibm_rbac_binding_to_group
+      type: string
+      default: ''
+
   stepTemplate:
     name: gitops-cluster
     env:
@@ -1939,6 +1953,15 @@ spec:
       - name: REDHAT_CERT_MANAGER_INSTALL_PLAN
         value: $(params.redhat_cert_manager_install_plan)
 
+      - name: GROUP_SYNC_OPERATOR_CRON_SCHEDULE
+        value: $(params.group_sync_operator_cron_schedule)
+      - name: GROUP_SYNC_OPERATOR_ISV_TENANT_URL
+        value: $(params.group_sync_operator_isv_tenant_url)
+      - name: GROUP_SYNC_OPERATOR_ISV_GROUPS
+        value: $(params.group_sync_operator_isv_groups)
+      - name: IBM_RBAC_BINDING_TO_GROUP
+        value: $(params.ibm_rbac_binding_to_group)
+
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -1969,6 +1992,16 @@ spec:
           export CLUSTER_PROMOTION=true
         fi
 
+        if [[ -n "${GROUP_SYNC_OPERATOR_ISV_GROUPS}" ]];then
+          echo "Setting var INSTALL_GROUP_SYNC_OPERATOR to true as var GROUP_SYNC_OPERATOR_ISV_GROUPS is set"
+          export INSTALL_GROUP_SYNC_OPERATOR=true
+        fi
+
+        if [[ -n "${IBM_RBAC_BINDING_TO_GROUP}" ]];then
+          echo "Setting var INSTALL_IBM_RBAC to true as var IBM_RBAC_BINDING_TO_GROUP is set"
+          export INSTALL_IBM_RBAC=true
+        fi
+
         mkdir -p /tmp/init-cluster
         mas gitops-cluster -a $ACCOUNT -c $CLUSTER_NAME \
         --dir /tmp/init-cluster \
@@ -1985,7 +2018,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2088,7 +2121,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2236,7 +2269,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2365,7 +2398,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2626,7 +2659,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2724,7 +2757,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2851,7 +2884,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2949,7 +2982,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -3041,7 +3074,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3126,7 +3159,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3211,7 +3244,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3330,7 +3363,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3418,7 +3451,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -3501,7 +3534,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -3609,7 +3642,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -3719,7 +3752,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3822,7 +3855,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -3879,7 +3912,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4084,7 +4117,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -4182,7 +4215,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4274,7 +4307,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4366,7 +4399,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4459,7 +4492,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4550,7 +4583,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4643,7 +4676,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -4756,7 +4789,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4873,7 +4906,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -5008,7 +5041,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -5104,7 +5137,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -5226,7 +5259,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5352,7 +5385,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: shared-entitlement
 
@@ -5855,7 +5888,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6297,7 +6330,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6405,7 +6438,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -6527,7 +6560,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6645,7 +6678,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6701,7 +6734,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6888,7 +6921,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7046,7 +7079,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7152,7 +7185,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: certificates
@@ -7322,7 +7355,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7422,7 +7455,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -7546,7 +7579,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7647,7 +7680,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7788,7 +7821,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 
@@ -7897,7 +7930,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7994,7 +8027,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8274,7 +8307,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8324,7 +8357,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8458,7 +8491,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -8700,7 +8733,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8916,7 +8949,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kmodels
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -9094,7 +9127,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9137,7 +9170,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -9254,7 +9287,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9290,7 +9323,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9332,7 +9365,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9374,7 +9407,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9416,7 +9449,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9458,7 +9491,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9584,7 +9617,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -9652,7 +9685,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9888,7 +9921,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - odh
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -10064,7 +10097,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10453,12 +10486,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -10659,7 +10692,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -10748,7 +10781,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -10811,7 +10844,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -10886,7 +10919,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -10987,7 +11020,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -11130,7 +11163,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -11197,7 +11230,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11268,7 +11301,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -11458,7 +11491,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -11707,7 +11740,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11795,7 +11828,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -11860,7 +11893,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -11930,7 +11963,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -11997,12 +12030,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       script: |
         #!/usr/bin/env bash
@@ -12136,7 +12169,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -12217,7 +12250,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -12280,7 +12313,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -12366,7 +12399,7 @@ spec:
 
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -12428,7 +12461,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -12492,7 +12525,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:11.12.0
+      image: quay.io/ibmmas/cli:12.0.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -17601,6 +17634,18 @@ spec:
     - name: ingress
       type: string
       default: "false"
+    - name: group_sync_operator_cron_schedule
+      type: string
+      default: ''
+    - name: group_sync_operator_isv_tenant_url
+      type: string
+      default: ''
+    - name: group_sync_operator_isv_groups
+      type: string
+      default: ''
+    - name: ibm_rbac_binding_to_group
+      type: string
+      default: ''
   tasks:
     - name: gitops-cluster
       params:
@@ -17673,6 +17718,14 @@ spec:
           value: $(params.dns_provider)
         - name: ingress
           value: $(params.ingress)
+        - name: group_sync_operator_cron_schedule
+          value: $(params.group_sync_operator_cron_schedule)
+        - name: group_sync_operator_isv_tenant_url
+          value: $(params.group_sync_operator_isv_tenant_url)
+        - name: group_sync_operator_isv_groups
+          value: $(params.group_sync_operator_isv_groups)
+        - name: ibm_rbac_binding_to_group
+          value: $(params.ibm_rbac_binding_to_group)
       taskRef:
         kind: Task
         name: gitops-cluster

mas/cli/upgrade/app.py

@@ -22,7 +22,7 @@ from ..validators import InstanceIDValidator
 from .argParser import upgradeArgParser
 
 from mas.devops.ocp import createNamespace
-from mas.devops.mas import listMasInstances, verifyMasInstance
+from mas.devops.mas import listMasInstances, verifyMasInstance, getMasChannel
 from mas.devops.tekton import installOpenShiftPipelines, updateTektonDefinitions, launchUpgradePipeline
 
 logger = logging.getLogger(__name__)
@@ -37,6 +37,8 @@ class UpgradeApp(BaseApp):
         instanceId = args.mas_instance_id
         self.noConfirm = args.no_confirm
         self.skipPreCheck = args.skip_pre_check
+        self.licenseAccepted = args.accept_license
+        next_mas_channel = None
 
         if instanceId is None:
             self.printH1("Set Target OpenShift Cluster")
@@ -73,8 +75,30 @@ class UpgradeApp(BaseApp):
                 print_formatted_text(HTML(f"<Red>Error: MAS instance {instanceId} not found on this cluster</Red>"))
                 sys.exit(1)
 
+        current_mas_channel = getMasChannel(self.dynamicClient, instanceId)
+
+        if current_mas_channel not in self.upgrade_path:
+            self.fatalError(f"No upgrade available, {instanceId} is are already on the latest release {current_mas_channel}")
+
+        next_mas_channel = self.upgrade_path[current_mas_channel]
+
+        if not self.licenseAccepted:
+            self.printH1("License Terms")
+            self.printDescription([
+                "To continue with the upgrade, you must accept the license terms:",
+                self.licenses[next_mas_channel]
+            ])
+
+            if self.noConfirm:
+                self.fatalError("You must accept the license terms with --accept-license when using the --no-confirm flag")
+            else:
+                if not self.yesOrNo("Do you accept the license terms"):
+                    exit(1)
+
         self.printH1("Review Settings")
         print_formatted_text(HTML(f"<LightSlateGrey>Instance ID ..................... {instanceId}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Current MAS Channel ............. {current_mas_channel}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Next MAS Channel ................ {next_mas_channel}</LightSlateGrey>"))
         print_formatted_text(HTML(f"<LightSlateGrey>Skip Pre-Upgrade Checks ......... {self.skipPreCheck}</LightSlateGrey>"))
 
         if not self.noConfirm:

mas/cli/upgrade/argParser.py

@@ -32,7 +32,6 @@ masArgGroup.add_argument(
     required=False,
     help="The MAS instance ID to be upgraded"
 )
-
 otherArgGroup = upgradeArgParser.add_argument_group('More')
 otherArgGroup.add_argument(
     '--skip-pre-check',
@@ -48,6 +47,12 @@ otherArgGroup.add_argument(
     default=False,
     help="Launch the upgrade without prompting for confirmation",
 )
+otherArgGroup.add_argument(
+    "--accept-license",
+    action="store_true",
+    default=False,
+    help="Accept all license terms without prompting"
+)
 otherArgGroup.add_argument(
     '-h', "--help",
     action='help',

{mas_cli-11.12.0.dist-info → mas_cli-12.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 11.12.0
+Version: 12.0.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-11.12.0.dist-info → mas_cli-12.0.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-mas/cli/__init__.py,sha256=uJRIGuKBJ8PtfcxefX2cOD1js-U69tDfkjVuT_1tBWQ,527
-mas/cli/cli.py,sha256=m_-ZTCuNeow19SokclchfwImQVpO5KXOUPouMGCIlQY,16181
+mas/cli/__init__.py,sha256=SuVJxSRQRSP3Ll2dzMGVTLdmiWQ74YkDVA0GbXRYGVw,526
+mas/cli/cli.py,sha256=4yAkTlnnQgcx_02TtV4tfxqIMuoYlNbBJL05-ZGc6TA,17484
 mas/cli/displayMixins.py,sha256=e3lAx1DIOwsriDcNI0M2JyP1jeLOZKvId6sPrvWLyqs,5984
 mas/cli/gencfg.py,sha256=p38Ss_ooiNHOZTJT8l0YxDaEaPwD4ZXgxEbW-S9YLNY,3311
 mas/cli/validators.py,sha256=vi1pFA8QtqMhqtGk1NlkkNDUrlFCi53kS5wJqFGDgOU,5108
 mas/cli/install/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/install/app.py,sha256=UuYiqLz_rt3y8Co-UOuF7x4a8aQP35X0UjtyawIWzFA,58857
+mas/cli/install/app.py,sha256=fZQLKQYfvinBlnyMt8PQi7Qt4nIn8Atb247bNYT_9r4,55758
 mas/cli/install/argBuilder.py,sha256=dATpbY1kojvhr35NixZ11WZD3DzEJAfaAWhaYFLhEnQ,23033
 mas/cli/install/argParser.py,sha256=dt06eSJkZFqzMD0gboMDUBbfIrDnLB3nEowFAs3_Th4,33205
-mas/cli/install/catalogs.py,sha256=pqV-nlW-N5OdDVNk-dl3hU6XExC6oppZQHfC9KTA0ro,694
+mas/cli/install/catalogs.py,sha256=ivwWYa8eyfchOAaYxEHNTNsIevosw6Z9EQQ0iHcA3sU,697
 mas/cli/install/params.py,sha256=niefj7fwDvwDVjCOiRybURk6lNUWliv8IXNCX-mIkZw,4780
 mas/cli/install/summarizer.py,sha256=EW-9lIQQu9a0HWJeDP33socVKqTikkpr74n7uqa6QTs,21050
 mas/cli/install/settings/__init__.py,sha256=RdyBSh-rM0wkuvILVzJ1gxjOtLuQ1mF6QbEL0MyiKIY,1034
@@ -17,7 +17,7 @@ mas/cli/install/settings/kafkaSettings.py,sha256=oJxFhWQkqPi7Do53tu4oxskGbEL4hro
 mas/cli/install/settings/manageSettings.py,sha256=rBBq3r9AaDS5fLeKbItgLBnsguuZwyNKo80oYBBEB-0,16241
 mas/cli/install/settings/mongodbSettings.py,sha256=UVt8vMLNpgyewlcymSystIhICnHsd0uoM9qpgezVjGg,2567
 mas/cli/install/settings/turbonomicSettings.py,sha256=wRAFV0Rg3Em_ILkLd8xR-a_oglXivnVeF6nVI_73Q9o,1695
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=mJ8HMA2TXfrAZXtlgDgypRhGVBRTj-EVU2pnPTaZdjE,791729
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=XY-0p2Qd-KTo06fXWhazt6mj-rEv9SgSfwX4Lh-s2Wk,793541
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/suite_mongocfg.yml.j2,sha256=WrgJUfGyvfaRIHjY5VR_zLZ5irTpV5khKNq76ejIxKU,1606
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
@@ -97,10 +97,10 @@ mas/cli/update/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,50
 mas/cli/update/app.py,sha256=DZAljUA9sJwhtVv5ocudHYI2lCKR5m4Df3tEdlnH-iA,37229
 mas/cli/update/argParser.py,sha256=oOIXzB_rsI2p3og_5X5SFt_g7LURyEdLxZeiGCKq1nU,4711
 mas/cli/upgrade/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/upgrade/app.py,sha256=f1qfvzRdmf7YiYMtVTqKwE5RFVMcUkLGavCIZDuU_7c,5247
-mas/cli/upgrade/argParser.py,sha256=zk629svjIk-hD40Ytc5e5UOLO3xogVrfqSz09S17mWw,1882
-mas_cli-11.12.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
-mas_cli-11.12.0.dist-info/METADATA,sha256=JuanTrOvYuJ0Twm0ZtUWCVXRnZzCPektiiBcEj212Mc,2081
-mas_cli-11.12.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mas_cli-11.12.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-11.12.0.dist-info/RECORD,,
+mas/cli/upgrade/app.py,sha256=2lBHXcUX1wVXnENJo-BKRkhn6qyenZYGEHit2OmFR14,6463
+mas/cli/upgrade/argParser.py,sha256=pqzNDSHy6l13JunHWQLyOI-NFnDGDoVJ_HM07FLYJSc,2033
+mas_cli-12.0.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
+mas_cli-12.0.0.dist-info/METADATA,sha256=cjbzecRgjPm20lY7bjI9h1FrIXtwhm_qvZN75--tVwo,2080
+mas_cli-12.0.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mas_cli-12.0.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-12.0.0.dist-info/RECORD,,