mas-cli 11.6.0__py3-none-any.whl → 11.7.0__py3-none-any.whl

mas/cli/templates/suite_mongocfg.yml.j2

@@ -0,0 +1,55 @@
+---
+# Mongo credentials for MAS
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: mongodb-{{mas_instance_id|lower}}-admin
+  namespace: mas-{{mas_instance_id}}-core
+  {% if custom_labels is defined and custom_labels.items() %}
+labels:
+  {% for key, value in custom_labels.items() %}
+"{{ key }}": "{{ value }}"
+  {% endfor %}
+  {% endif %}
+data:
+  username: "{{ mongodb_admin_username }}"
+  password: "{{ mongodb_admin_password }}"
+---
+# Mongo configuration for MAS
+apiVersion: config.mas.ibm.com/v1
+kind: MongoCfg
+metadata:
+  name: {{mas_instance_id|lower}}-mongo-system
+  namespace: mas-{{mas_instance_id}}-core
+  labels:
+    mas.ibm.com/configScope: system
+    mas.ibm.com/instanceId: {{mas_instance_id}}
+  {% if custom_labels is defined and custom_labels.items() %}
+  {% for key, value in custom_labels.items() %}
+"{{ key }}": "{{ value }}"
+  {% endfor %}
+  {% endif %}
+spec:
+  displayName: "External MongoDB in 'mas-{{mas_instance_id}}-core' namespace"
+  type: external
+  config:
+    configDb: admin
+    retryWrites: true
+    authMechanism: DEFAULT
+    credentials:
+      secretName: mongodb-{{mas_instance_id|lower}}-admin
+    hosts:
+     {%- if mongodb_hosts is defined %}
+     {%- for host in mongodb_hosts.split(',') %}
+     {%- set host_port = host.split(':') %}
+     - host: {{ host_port[0] }}
+       port: {{ host_port[1] }}
+    {%- endfor %}
+    {%- endif %}
+  {%- if mongodb_ca_pem_local_file is defined and mongodb_ca_pem_local_file | length > 0 %}
+  certificates:
+    - alias: "part1"
+      crt: |
+        {{ mongodb_ca_pem_local_file | indent(width=8, first=False) }}
+  {%- endif %}

mas/cli/update/app.py

@@ -244,13 +244,13 @@ class UpdateApp(BaseApp):
         self.printH1("Select IBM Maximo Operator Catalog Version")
         self.printDescription([
             "Select MAS Catalog",
+            "  1) Nov 07 2024 Update (MAS 9.0.4, 8.11.16, & 8.10.19)",
             "  1) Oct 03 2024 Update (MAS 9.0.3, 8.11.15, & 8.10.18)",
             "  2) Aug 27 2024 Update (MAS 9.0.2, 8.11.14, & 8.10.17)",
-            "  3) July 30 2024 Update (MAS 9.0.1, 8.11.13, & 8.10.16)"
         ])
 
         catalogOptions = [
-            "v9-241003-amd64", "v9-240827-amd64", "v9-240730-amd64"
+            "v9-241107-amd64", "v9-241003-amd64", "v9-240827-amd64"
         ]
         self.promptForListSelect("Select catalog version", catalogOptions, "mas_catalog_version", default=1)
 
@@ -341,12 +341,13 @@ 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-241003-amd64": "6.0.12",
+                        "v9-241107-amd64": "7.0.12"
                     }
                     catalogVersion = self.getParam('mas_catalog_version')
                     if catalogVersion in mongoVersions:
@@ -411,6 +412,15 @@ class UpdateApp(BaseApp):
             ""
         ])
 
+    def selectDROStorageclass(self):
+        self.printDescription([
+            "",
+            "Select the storage class for DRO to use from the list below:"
+        ])
+        for storageClass in getStorageClasses(self.dynamicClient):
+            print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
+        self.promptForString("DRO storage class", "dro_storage_class", validator=StorageClassValidator())
+
     def detectUDS(self) -> None:
         with Halo(text='Checking for IBM User Data Services', spinner=self.spinner) as h:
             try:
@@ -437,19 +447,14 @@ class UpdateApp(BaseApp):
                         self.showUDSUpdateNotice()
                         self.fatalError(f"By choosing {self.getParam('mas_catalog_version')} you must provide the storage class to use for the migration to DRO using '--dro-storage-class' when using '--no-confirm'")
                     else:
-                        h.stop_and_persist(symbol=self.successIcon, text="IBM User Data Services needs to be migrated to IBM Data Reporter Operator")
                         self.showUDSUpdateNotice()
-                        if self.getParam("dro_migration") == "true" and self.getParam("dro_storage_class") is None:
+                        if self.getParam("dro_migration") != "true":
                             if not self.yesOrNo("Confirm migration from UDS to DRO", "dro_migration"):
                                 # If the user did not approve the update, abort
                                 exit(1)
-                            self.printDescription([
-                                "",
-                                "Select the storage class for DRO to use from the list below:"
-                            ])
-                            for storageClass in getStorageClasses(self.dynamicClient):
-                                print_formatted_text(HTML(f"<LightSlateGrey>  - {storageClass.metadata.name}</LightSlateGrey>"))
-                            self.promptForString("DRO storage class", "dro_storage_class", validator=StorageClassValidator())
+
+                        if self.getParam("dro_storage_class") is None or self.getParam("dro_storage_class") == "":
+                            self.selectDROStorageclass()
 
                 if self.getParam("dro_migration") == "true":
                     self.setParam("uds_action", "install-dro")
@@ -469,8 +474,8 @@ class UpdateApp(BaseApp):
             "v9-240625-amd64": "4.8.0",
             "v9-240730-amd64": "4.8.0",
             "v9-240827-amd64": "4.8.0",
-            "v9-241003-amd64": "4.8.0"
-
+            "v9-241003-amd64": "4.8.0",
+            "v9-241107-amd64": "4.8.0"
         }
 
         with Halo(text='Checking for IBM Cloud Pak for Data', spinner=self.spinner) as h:

{mas_cli-11.6.0.dist-info → mas_cli-11.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 11.6.0
+Version: 11.7.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.6.3
+Requires-Dist: mas-devops >=1.7.0
 Requires-Dist: halo
 Requires-Dist: prompt-toolkit
 Requires-Dist: openshift

{mas_cli-11.6.0.dist-info → mas_cli-11.7.0.dist-info}/RECORD

@@ -1,21 +1,25 @@
-mas/cli/__init__.py,sha256=jwFdxuSo_zwNXds0IVNrCiO5YZjBdvxHAVBfdCpvvYw,526
-mas/cli/cli.py,sha256=lR0h-pPyFXiKCOKka5wTRJbyQZDrQevq3-ZIvZUTa_A,14411
+mas/cli/__init__.py,sha256=QgfTAdX6sA6BSBR5wDxqLdHZ4ZzVjMFi7niDUS6iMB4,526
+mas/cli/cli.py,sha256=TrrhmPflgyTlZmbQjpmrE2MGjnGG86KtoFYp1-czYPQ,15811
 mas/cli/displayMixins.py,sha256=VVL2kWzPTqNQy63WT-tYIDnYa7SX3w33QX2XjSWVHWk,5636
-mas/cli/gencfg.py,sha256=BbWCyX6soIwQWcsKCLDTY0VkipLd944cuIAFpAWWXpA,2107
+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=iihHRfhdo4h91xHovfioDsYx-I6j9ClgB69oD6TwMEM,58314
-mas/cli/install/argBuilder.py,sha256=064MK0mp42bH6HM3lZiixkKZvMyXJuWPhwt1znTViQE,22734
-mas/cli/install/argParser.py,sha256=rqS36UVxMTz_XNG8e_W2IuIJZuYiq2sN75OmsAVczVg,32587
-mas/cli/install/summarizer.py,sha256=oo-_hcPWe3cKGmucpmUmhoWfUR_gzPZKUhwKGljGHGk,21002
-mas/cli/install/settings/__init__.py,sha256=wvprrlWi-j9SPwERiJkZdNKC99g_3QZ0h6lMn1gNGqE,962
-mas/cli/install/settings/additionalConfigs.py,sha256=rD9-eEiZZiMJ6O7zKTYeioZoqI5sghiRRuAOE7-pVq0,9373
-mas/cli/install/settings/db2Settings.py,sha256=0gR3nkr-xeR3cUgBzXWvatSgZf1fv2SbDdbxjBRBFG0,10712
-mas/cli/install/settings/kafkaSettings.py,sha256=OWE5MV--h2fTtATMQiaGQq1FXIMXzaTAPGE_6-vXoWU,6998
-mas/cli/install/settings/manageSettings.py,sha256=If2VVjX7YsYdcwB3P04_lSxm_dhC6sF3QEQJN0HND8A,15808
-mas/cli/install/settings/turbonomicSettings.py,sha256=qy1SBjWJw1AHfRQoLv8uB9DO_QFcGa8hZp1fhdM0dY8,1589
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=73bkddTaY1fI77AbnlsJYdmts16ABI1HCFOqmRyFweU,778036
+mas/cli/install/app.py,sha256=FBJotzLrI5P4hy4PIi21VrV-OWKkguUX71bQLT4my7k,54024
+mas/cli/install/argBuilder.py,sha256=v7Jcz-fX3BgQAOoCgp_FMlHWfO0JzPATbdMt4u34opY,22880
+mas/cli/install/argParser.py,sha256=E-AfgpDj1ao1zIkn306nITvndoB0_r6WNyokwAj3cB8,33045
+mas/cli/install/catalogs.py,sha256=44gOkCNFPNAZ1yBAz-h3IvDE1RrW2tv1kMWQVombk9o,4076
+mas/cli/install/params.py,sha256=QbEXMUHxZS_7g8yqOoNPyGzWlTryZBfn7MVt-nK55vc,4765
+mas/cli/install/summarizer.py,sha256=3SM_FrRbxJPsMPTcuv-VvhXPFWEigmVo1MSnIMAACoY,21054
+mas/cli/install/settings/__init__.py,sha256=RdyBSh-rM0wkuvILVzJ1gxjOtLuQ1mF6QbEL0MyiKIY,1034
+mas/cli/install/settings/additionalConfigs.py,sha256=bTNDizLM7I8qu_PY3yGXupdzxVXSOyT4P_r1TJXgCsk,9402
+mas/cli/install/settings/db2Settings.py,sha256=eLwk4rNpDg4jdnc_FWdwg7hQ4vQ8NyMrTmjxLutE4eA,12969
+mas/cli/install/settings/kafkaSettings.py,sha256=Fe3WKIP-c9g6R9Oa3mfLIjnB6wcIhEdWiHlGyl-gIU0,7217
+mas/cli/install/settings/manageSettings.py,sha256=Z4otj9OysuoDSq-sHf8LRfEqVCjXwYxJ-ldP4iYr4vI,16179
+mas/cli/install/settings/mongodbSettings.py,sha256=mFKL58d7ZxKkPkViUVAQTGhOxPSwAp5l2nhO0QF31qA,2356
+mas/cli/install/settings/turbonomicSettings.py,sha256=4MWrbZmnToeaDsstfJTn2DvUviokCyjlBM-GPQd4a8A,1678
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=xLcAx81pZ7nxJGav8xC_MJgDCGYinIqC89GYZKlDoH8,780115
 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
 mas/cli/templates/pod-templates/best-effort/ibm-mas-bascfg.yml,sha256=rkq8c2pVJoskgict9tCZzCchGSE2MBC-dJ47JyMYm7A,1559
 mas/cli/templates/pod-templates/best-effort/ibm-mas-coreidp.yml,sha256=9fBqmd6t8WNOpFlZ2imZVeXH2Z-wui6QVRw3RxBubBw,648
@@ -90,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=loh76IOo3h4gx9VUe4m27nqcI2_h2fK9h1uRvCZGOGE,37729
+mas/cli/update/app.py,sha256=-Ywqx_BlMCYeEQnL0CofwvISvNFmWDLAeAvCeu__mOM,37695
 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.6.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
-mas_cli-11.6.0.dist-info/METADATA,sha256=v3-xafN2zDAhnqyyEDJMy44ppQnNlJ9cp1eEX1XE6wE,2084
-mas_cli-11.6.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-mas_cli-11.6.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-11.6.0.dist-info/RECORD,,
+mas_cli-11.7.0.data/scripts/mas-cli,sha256=Es-wSefTBcR3Vs5_kIUHQLfWHxTXVrmIPMFY0hbrxt8,3493
+mas_cli-11.7.0.dist-info/METADATA,sha256=Te314ECgLRPicjYJ2rx6p_90l59ljlFMH3sFc8-av1k,2084
+mas_cli-11.7.0.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+mas_cli-11.7.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-11.7.0.dist-info/RECORD,,

{mas_cli-11.6.0.dist-info → mas_cli-11.7.0.dist-info}/WHEEL

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