mas-cli 12.1.0__py3-none-any.whl → 13.1.0__py3-none-any.whl

mas/cli/update/app.py

@@ -90,6 +90,9 @@ class UpdateApp(BaseApp):
         if self.dynamicClient is None:
             self.fatalError("The Kubernetes dynamic Client is not available.  See log file for details")
 
+        # Perform a check whether the cluster is set up for airgap install, this will trigger an early failure if the cluster is using the now
+        # deprecated MaximoApplicationSuite ImageContentSourcePolicy instead of the new ImageDigestMirrorSet
+        self.isAirgap()
         self.reviewCurrentCatalog()
         self.reviewMASInstance()
 
@@ -232,13 +235,13 @@ class UpdateApp(BaseApp):
         self.printH1("Select IBM Maximo Operator Catalog Version")
         self.printDescription([
             "Select MAS Catalog",
-            "  1) Dec 05 2024 Update (MAS 9.0.6, 8.11.17, & 8.10.20)",
-            "  2) Nov 07 2024 Update (MAS 9.0.4, 8.11.16, & 8.10.19)",
-            "  3) Oct 03 2024 Update (MAS 9.0.3, 8.11.15, & 8.10.18)",
+            "  1) Jan 09 2025 Update (MAS 9.0.7, 8.11.18, & 8.10.21)",
+            "  2) Dec 05 2024 Update (MAS 9.0.6, 8.11.17, & 8.10.20)",
+            "  3) Nov 07 2024 Update (MAS 9.0.4, 8.11.16, & 8.10.19)",
         ])
 
         catalogOptions = [
-            "v9-241205-amd64", "v9-241107-amd64", "v9-241003-amd64"
+            "v9-250109-amd64", "v9-241205-amd64", "v9-241107-amd64"
         ]
         self.promptForListSelect("Select catalog version", catalogOptions, "mas_catalog_version", default=1)
 
@@ -329,14 +332,15 @@ class UpdateApp(BaseApp):
                     # the case bundles in there anymore
                     # Longer term we will centralise this information inside the mas-devops python collection,
                     # where it can be made available to both the ansible collection and this python package.
-                    defaultMongoVersion = "6.0.12"
+                    defaultMongoVersion = "7.0.12"
                     mongoVersions = {
                         "v9-240625-amd64": "6.0.12",
                         "v9-240730-amd64": "6.0.12",
                         "v9-240827-amd64": "6.0.12",
                         "v9-241003-amd64": "6.0.12",
                         "v9-241107-amd64": "7.0.12",
-                        "v9-241205-amd64": "7.0.12"
+                        "v9-241205-amd64": "7.0.12",
+                        "v9-250109-amd64": "7.0.12"
                     }
                     catalogVersion = self.getParam('mas_catalog_version')
                     if catalogVersion in mongoVersions:
@@ -465,7 +469,8 @@ class UpdateApp(BaseApp):
             "v9-240827-amd64": "4.8.0",
             "v9-241003-amd64": "4.8.0",
             "v9-241107-amd64": "4.8.0",
-            "v9-241205-amd64": "5.0.0"
+            "v9-241205-amd64": "5.0.0",
+            "v9-250109-amd64": "5.0.0"
         }
 
         with Halo(text='Checking for IBM Cloud Pak for Data', spinner=self.spinner) as h:

mas/cli/upgrade/app.py

@@ -38,7 +38,6 @@ class UpgradeApp(BaseApp):
         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")
@@ -70,18 +69,22 @@ class UpgradeApp(BaseApp):
             print()
             instanceId = prompt(HTML('<Yellow>Enter MAS instance ID: </Yellow>'), completer=suiteCompleter, validator=InstanceIDValidator(), validate_while_typing=False)
 
-        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]
+        currentChannel = getMasChannel(self.dynamicClient, instanceId)
+        if currentChannel is not None:
+            if currentChannel not in self.upgrade_path:
+                self.fatalError(f"No upgrade available, {instanceId} is are already on the latest release {currentChannel}")
+            nextChannel = self.upgrade_path[currentChannel]
+        else:
+            # We still allow the upgrade to proceed even though we can't detect the MAS instance.  The upgrade may be being
+            # queued up to run after install for instance
+            currentChannel = "Unknown"
+            nextChannel = "Unknown"
 
         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]
+                self.licenses[nextChannel]
             ])
 
             if self.noConfirm:
@@ -92,8 +95,8 @@ class UpgradeApp(BaseApp):
 
         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>Current MAS Channel ............. {currentChannel}</LightSlateGrey>"))
+        print_formatted_text(HTML(f"<LightSlateGrey>Next MAS Channel ................ {nextChannel}</LightSlateGrey>"))
         print_formatted_text(HTML(f"<LightSlateGrey>Skip Pre-Upgrade Checks ......... {self.skipPreCheck}</LightSlateGrey>"))
 
         if not self.noConfirm:

{mas_cli-12.1.0.dist-info → mas_cli-13.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mas-cli
-Version: 12.1.0
+Version: 13.1.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Communications
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: mas-devops>=1.10.0
+Requires-Dist: mas-devops>=2.0.0
 Requires-Dist: halo
 Requires-Dist: prompt_toolkit
 Requires-Dist: openshift
@@ -28,6 +28,15 @@ Requires-Dist: build; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pyinstaller; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 mas.devops
 ----------

{mas_cli-12.1.0.dist-info → mas_cli-13.1.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
-mas/cli/__init__.py,sha256=WYSU0MV45wJvR2Cf4OZj_ri1t50MpWfvDrWdQM1McsI,526
-mas/cli/cli.py,sha256=0ZAuvGjjcxyV8svC-bsUvBVZBfNLA_cmUwjPWU0J_0g,17484
+mas/cli/__init__.py,sha256=DkwsZTkmOj4JPvMYcjqZCtmq0SKrVnThI4S9DCRY-Zc,526
+mas/cli/cli.py,sha256=SAxjeXwCLU_3SrAjV0U7b381MyFYQkvVRv8qdQTXP4s,18115
 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=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=ivwWYa8eyfchOAaYxEHNTNsIevosw6Z9EQQ0iHcA3sU,697
-mas/cli/install/params.py,sha256=niefj7fwDvwDVjCOiRybURk6lNUWliv8IXNCX-mIkZw,4780
-mas/cli/install/summarizer.py,sha256=EW-9lIQQu9a0HWJeDP33socVKqTikkpr74n7uqa6QTs,21050
+mas/cli/install/app.py,sha256=b2ZrvAasBnxQbk5z3udW6c93xwizAURQr4XFschYZ4o,56140
+mas/cli/install/argBuilder.py,sha256=GYPHvkRrJo4xHeLvNrbq90qTh1c6FCE7MP9w_tbHGO8,23977
+mas/cli/install/argParser.py,sha256=ltMCOYjn7Zr2d5I62LN46qBFX67miVb-asJFIsuasyc,34363
+mas/cli/install/catalogs.py,sha256=vzn94BIDfrpk98YRjxqDgooUEr0jFMLINhu-8EsoF-k,724
+mas/cli/install/params.py,sha256=0Zp-aPPFBnZhnhz7wYs_YLJYgPRcAYVEHA2L7Iajs90,4959
+mas/cli/install/summarizer.py,sha256=yyYk0Vf_theQqMPe-_r1o0D_kniZkkmExd1Fkj8J2r4,20987
 mas/cli/install/settings/__init__.py,sha256=RdyBSh-rM0wkuvILVzJ1gxjOtLuQ1mF6QbEL0MyiKIY,1034
 mas/cli/install/settings/additionalConfigs.py,sha256=QyeVN_y3aXL3GU5RxtfPSgQTon72eSj6_xlwSwJvoMQ,9426
 mas/cli/install/settings/db2Settings.py,sha256=YlMosXmxj8L71U_pcg0M9o38Xw2W1fOK8rdj0hPgpCA,13003
 mas/cli/install/settings/kafkaSettings.py,sha256=oJxFhWQkqPi7Do53tu4oxskGbEL4hroH2129OLom5lU,7241
 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=WRCMHV-1nCKFlcgP93syRxtuvAvvJr03fD8N5dCh3vs,797296
+mas/cli/install/settings/turbonomicSettings.py,sha256=ul4eWf53b1NCzJTFsEPX6DWM23YUlWILYBygplqXYlU,1631
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=QdvFa38qgjv9HQcYGFwKgVm7CgHbJ4u67OKO5xijrrs,823549
 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
@@ -94,13 +94,13 @@ mas/cli/uninstall/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc
 mas/cli/uninstall/app.py,sha256=uPJy3z-1Yt66MSFdZz1Qh8MjA97ZrQmjSgTx-Gqua9I,10047
 mas/cli/uninstall/argParser.py,sha256=VVG4myUvFOtg98L6HAzpgGg7s5c-vub_UMZPGuNQko4,3452
 mas/cli/update/__init__.py,sha256=v0WJlcdrSycWGT5ofFjRDV3jTZ8AqVCz1AGxok4Khtc,508
-mas/cli/update/app.py,sha256=onkB2Gn9aJooMQB0AKrGvjN1B7yhajWTGTRdBRiM4I8,37226
+mas/cli/update/app.py,sha256=vJMCgmNJjRHMieNz98Vd_1krTc6TgZMom02Q6OvICcc,37595
 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=xSM5r-3tE3ohphHvUSsXqRMvnxNFSoy_8-jlQLjLEno,6180
+mas/cli/upgrade/app.py,sha256=EuEZayc0nw9kA6Hz8M9Mv7uk0hgmspJSZCYhNEfCECk,6428
 mas/cli/upgrade/argParser.py,sha256=pqzNDSHy6l13JunHWQLyOI-NFnDGDoVJ_HM07FLYJSc,2033
-mas_cli-12.1.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
-mas_cli-12.1.0.dist-info/METADATA,sha256=UQUNyyzKoA5SrTtn785A_tY3RY6-NDOqKIRMbMn6iGc,2080
-mas_cli-12.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mas_cli-12.1.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-12.1.0.dist-info/RECORD,,
+mas_cli-13.1.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
+mas_cli-13.1.0.dist-info/METADATA,sha256=Q2vHMZKh8Pmk_ounZHSEB-OSZMfIRhXkBK4zjJluVRM,2258
+mas_cli-13.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mas_cli-13.1.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-13.1.0.dist-info/RECORD,,

{mas_cli-12.1.0.dist-info → mas_cli-13.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any