Merge branch 'stable' into mascore-11094

Author: terc1997

.gitignore

@@ -6,10 +6,6 @@ __pycache__/
 # Distribution / packaging
 dist
 *.egg-info
-pandoc-*-amd64.deb
-pandoc-*-windows-x86_64.msi
-pandoc-*-x86_64-macOS.pkg
-README.rst
 
 # Environments
 .venv/
@@ -19,5 +15,5 @@ venv/
 # Other
 kubectl.exe
 /build
-/.vscode
-/site
+/.vscode
+/site

pyproject.toml

@@ -1,6 +1,5 @@
 [build-system]
 requires = [
-  "setuptools",
-  "pypandoc"
+  "setuptools"
 ]
 build-backend = "setuptools.build_meta"

setup.py

@@ -14,13 +14,8 @@
 sys.path.insert(0, 'src')
 
 
-if not os.path.exists('README.rst'):
-    import pypandoc
-    pypandoc.download_pandoc(targetfolder='~/bin/')
-    pypandoc.convert_file('README.md', 'rst', outputfile='README.rst')
-
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
 # Maintain a single source of versioning
@@ -54,6 +49,7 @@ def get_version(rel_path):
     license='Eclipse Public License - v1.0',
     description='Python for Maximo Application Suite Dev/Ops',
     long_description=long_description,
+    long_description_content_type='text/markdown',
     install_requires=[
         'pyyaml',                  # MIT License
         'openshift',               # Apache Software License

src/mas/devops/data/catalogs/v9-260216-amd64.yaml

@@ -34,9 +34,6 @@ ccs_extras_version: 11.0.0                       # Extra Images for CCS used for
 elasticsearch_version: 1.1.2667                  # Operator version 1.1.2667 - used in cpd 5.1.3 only
 opensearch_version: 1.1.2494                     # Operator version 1.1.2494
 
-# TODO: Why is this here, but commented out?
-# datarefinery_build: +20240517.202103.146
-
 # I have added this as a guess as to the actual version used, we are currently using the wsl_version, but that does not exist for datarefinery
 # See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689
 datarefinery_version: 11.0.0+20250513.203727.232

src/mas/devops/data/catalogs/v9-260226-amd64.yaml

@@ -15,36 +15,100 @@ ocp_compatibility:
 - "4.20"
 - "4.21"
 
-# Dependencies
+# Dependencies - Cloud Pak for Data
 # -----------------------------------------------------------------------------
-ibm_licensing_version: 4.2.17                # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
-common_svcs_version: 4.13.0                  # Operator version 4.13.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
-common_svcs_version_1: 4.11.0                  # Additional version 4.11.0
+cpd_product_version_default: 5.2.0
+
+ibm_licensing_version: 4.2.17                    # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
+common_svcs_version: 4.13.0                      # Operator version 4.13.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
+common_svcs_version_1: 4.11.0                    # TODO: Do we really still need to mirror two different versions of common services?  If so, why?
+cp4d_platform_version: 5.2.0+20250709.170324     # Operator version 5.2.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
+ibm_zen_version: 6.2.0+20250530.152516.232       # For CPD5 ibm-zen has to be explicitily mirrored
+wsl_version: 11.0.0+20250521.202913.73
+wsl_runtimes_version: 11.0.0+20250515.090949.21
+wml_version: 11.0.0+20250530.193146.282          # Operator version 5.2.0
+spark_version: 11.0.0+20250604.163055.2097       # Operator version 5.2.0
+cognos_version: 28.0.0+20250515.175459.10054     # Operator version 25.0.0
+
+postgress_version: 5.16.0+20250827.110911.2626   # ibm-cpd-cloud-native-postgresql-operator 5.2.0
+ccs_build: 11.0.0+20250605.130237.468            # cpd 5.2.0
+ccs_extras_version: 11.0.0                       # Extra Images for CCS used for PCD 5.2.0 Hotfix
+
+# TODO: If this is only used in CPD 5.1.3, we shouldn't need this in this catalog metadata file
+elasticsearch_version: 1.1.2667                  # Operator version 1.1.2667 - used in cpd 5.1.3 only
+opensearch_version: 1.1.2494                     # Operator version 1.1.2494
+
+# I have added this as a guess as to the actual version used, we are currently using the wsl_version, but that does not exist for datarefinery
+# See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689
+datarefinery_version: 11.0.0+20250513.203727.232
 
-cp4d_platform_version: 5.2.0+20250709.170324               # Operator version 5.2.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
-ibm_zen_version: 6.2.0+20250530.152516.232                     # For CPD5 ibm-zen has to be explicitily mirrored
+# TODO: Why is this here, there is no evidence that it is being used in image mirroring?
+events_version: 5.0.1  # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
+
+
+# Dependencies - Db2u
+# -----------------------------------------------------------------------------
+db2u_version: 7.3.1+20250821.161005.16793    # Operator version 110509.0.7 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
+db2u_extras_version: 1.0.6 # No Update
+db2u_filter: db2
 
-db2u_version: 7.3.1+20250821.161005.16793    # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
 db2_channel_default: v110509.0               # Default Channel version for db2u-operator
-events_version: 5.0.1                        # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
+
+
+# Dependencies - CouchDb
+# -----------------------------------------------------------------------------
+# Note: This is required for Assist 9.0 (https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml)
+couchdb_version: 1.0.13  # Operator version 2.2.1 (1.0.13) sticking with 1.0.13
+
+
+# Dependencies - Minio
+# -----------------------------------------------------------------------------
+minio_version: RELEASE.2025-06-13T11-33-47Z
+
+
+# Dependencies - MongoDB
+# -----------------------------------------------------------------------------
+mongo_extras_version_default: 8.0.17
+# TODO: We probably don't need to keep carrying forward the now unsupported versions
+mongo_extras_version_4: 4.4.21
+mongo_extras_version_5: 5.0.23
+mongo_extras_version_6: 6.0.12
+mongo_extras_version_7: 7.0.23
+mongo_extras_version_8: 8.0.17
+
+
+# Dependencies - Amlen
+# -----------------------------------------------------------------------------
+amlen_extras_version: 1.1.3
+
+
+# Dependencies - UDS
+# -----------------------------------------------------------------------------
 uds_version: 2.0.12                          # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
-sls_version: 3.12.5                          # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
-tsm_version: 1.7.3                           # Operator version 1.7.3 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
-dd_version: 1.1.22                           # Operator version 1.1.22 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
+uds_extras_version: 1.5.0
+
+
+# Dependencies - App Connect
+# -----------------------------------------------------------------------------
 appconnect_version: 6.2.0                    # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
-wsl_version: 11.0.0+20250521.202913.73                     # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
-wsl_runtimes_version: 11.0.0+20250515.090949.21               # cpd 5.1.3 uses version 10.3.0 of wsl runtimes but only 10.2.0 for wsl itself
-wml_version: 11.0.0+20250530.193146.282                             # Operator version 5.2.0
-postgress_version: 5.16.0+20250827.110911.2626                # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d 
 
-ccs_build: 11.0.0+20250605.130237.468       # cpd 5.2.0 using ccs build
-# datarefinery_build: +20240517.202103.146
 
-spark_version: 11.0.0+20250604.163055.2097                      # Operator version 5.2.0
-cognos_version: 28.0.0+20250515.175459.10054                     # Operator version 25.0.0
-couchdb_version: 1.0.13                     # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml)
-elasticsearch_version: 1.1.2667           # Operator version 1.1.2667 # used in cpd 5.1.3 only
-opensearch_version: 1.1.2494                # Operator version 1.1.2494
+# Dependencies - Suite License Service
+# -----------------------------------------------------------------------------
+# https://github.ibm.com/maximoappsuite/ibm-sls/releases
+sls_version: 3.12.5
+
+
+# Dependencies - Truststore Manager
+# -----------------------------------------------------------------------------
+# https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases
+tsm_version: 1.7.3
+
+
+# Dependencies - Data Dictionary
+# -----------------------------------------------------------------------------
+# https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases
+dd_version: 1.1.22
 
 # Maximo Application Suite
 # -----------------------------------------------------------------------------
@@ -109,47 +173,14 @@ mas_facilities_version:
 aiservice_version:
   9.2.x-feature: 9.2.0-pre.stable_12908 #  Updated
   9.1.x: 9.1.12  #  Updated
- 
 
-# Extra Images for UDS
-# ------------------------------------------------------------------------------
-uds_extras_version: 1.5.0
-
-# Extra Images for Mongo
-# ------------------------------------------------------------------------------
-mongo_extras_version_default: 8.0.17
 
-# Variables used to mirror additional mongo image versions
-mongo_extras_version_4: 4.4.21
-mongo_extras_version_5: 5.0.23
-mongo_extras_version_6: 6.0.12
-mongo_extras_version_7: 7.0.23
-mongo_extras_version_8: 8.0.17
-
-# Extra Images for Db2u
-# ------------------------------------------------------------------------------
-db2u_extras_version: 1.0.6 # No Update
-db2u_filter: db2
-
-# Extra Images for CCS used for PCD 5.2.0 Hotfix
-# ------------------------------------------------------------------------------
-ccs_extras_version: 11.0.0
-
-# Extra Images for IBM Watson Discovery
-# ------------------------------------------------------------------------------
-#wd_extras_version: 1.0.4
+# TODO: What is this?  It almost certainly should not be here.
+manage_extras_913: 9.1.3
 
-# Extra Images for Amlen
-# ------------------------------------------------------------------------------
-amlen_extras_version: 1.1.3
 
-# Default Cloud Pak for Data version
+# Editorial
 # ------------------------------------------------------------------------------
-cpd_product_version_default: 5.2.0
-
-manage_extras_913: 9.1.3
-minio_version: RELEASE.2025-06-13T11-33-47Z
-
 editorial:
   whats_new:
   - title: '**Openshift 4.20 support** Openshift Container Platform 4.20 support has been added. Refer OCP 4.20 release notes [here](https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html/release_notes/index)'
@@ -161,7 +192,7 @@ editorial:
     - IBM Maximo IoT [v8.7.31](https://www.ibm.com/support/pages/node/7261516), [v8.8.28](https://www.ibm.com/support/pages/node/7261517), [v9.0.17](https://www.ibm.com/support/pages/node/7261518) and [v9.1.8](https://www.ibm.com/support/pages/node/7261519)
     - IBM Maximo Monitor [v8.10.28](https://www.ibm.com/support/pages/node/7261278), [v8.11.26](https://www.ibm.com/support/pages/node/7261280), [v9.0.18](https://www.ibm.com/support/pages/node/7261279) and [v9.1.8](https://www.ibm.com/support/pages/node/7261281)
     - IBM Maximo Optimizer [v8.5.26](https://www.ibm.com/support/pages/node/7261750), [v9.0.20](https://www.ibm.com/support/pages/node/7261751) and [v9.1.9](https://www.ibm.com/support/pages/node/7261752)
-    - IBM Maximo Assist [v9.0.14](https://www.ibm.com/support/pages/node/7261513), [v9.1.8](https://www.ibm.com/support/pages/node/7261514) 
+    - IBM Maximo Assist [v9.0.14](https://www.ibm.com/support/pages/node/7261513), [v9.1.8](https://www.ibm.com/support/pages/node/7261514)
     - IBM Maximo Predict [v8.8.13](https://www.ibm.com/support/pages/node/7261271), [v8.9.15](https://www.ibm.com/support/pages/node/7261269), [v9.0.12](https://www.ibm.com/support/pages/node/7261267) and [v9.1.5](https://www.ibm.com/support/pages/node/7261268)
     - IBM Maximo Visual Inspection [v8.9.20](https://www.ibm.com/support/pages/node/7261735), [v9.0.17](https://www.ibm.com/support/pages/node/7261734), [v9.1.10](https://www.ibm.com/support/pages/node/7261733)
     - IBM Maximo Real Estate and Facilities [v9.1.12](https://www.ibm.com/support/pages/node/7261512)