Skip to content

Commit 68f76ea

Browse files
dureradurera
authored
[patch] Clean up catalog metadata file & type hint fixes (#191)
1 parent 42fe0e4 commit 68f76ea

3 files changed

Lines changed: 112 additions & 93 deletions

File tree

‎src/mas/devops/data/catalogs/v9-260129-amd64.yaml‎

Lines changed: 109 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
2-
# Case bundle configuration for IBM Maximo Operator Catalog 260129 (AMD64)
2+
# Catalog metadata for IBM Maximo Operator Catalog v9-260129-amd64
33
# -----------------------------------------------------------------------------
4-
# In the future this won't be necessary as we'll be able to mirror from the
5-
# catalog itself, but not everything in the catalog supports this yet (including MAS)
6-
# so we need to use the CASE bundle mirror process still.
74

85
catalog_digest: sha256:54bcab31205bf3a5e0e0769158127b70b514e3a965ddd8f02785afe53171f0ee
96

@@ -13,141 +10,163 @@ ocp_compatibility:
1310
- 4.18
1411
- 4.19
1512

16-
# Dependencies
13+
14+
# Dependencies - Cloud Pak for Data
1715
# -----------------------------------------------------------------------------
18-
ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
19-
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)
20-
common_svcs_version_1: 4.11.0 # Additional version 4.11.0
16+
cpd_product_version_default: 5.2.0
17+
18+
ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
19+
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)
20+
common_svcs_version_1: 4.11.0 # TODO: Do we really still need to mirror two different versions of common services? If so, why?
21+
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/)
22+
ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored
23+
wsl_version: 11.0.0+20250521.202913.73
24+
wsl_runtimes_version: 11.0.0+20250515.090949.21
25+
wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0
26+
spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0
27+
cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0
28+
29+
postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0
30+
ccs_build: 11.0.0+20250605.130237.468 # cpd 5.2.0
31+
32+
# TODO: If this is only used in CPD 5.1.3, we shouldn't need this in this catalog metadata file
33+
elasticsearch_version: 1.1.2667 # Operator version 1.1.2667 - used in cpd 5.1.3 only
34+
opensearch_version: 1.1.2494 # Operator version 1.1.2494
35+
36+
# TODO: Why is this here, but commented out?
37+
# datarefinery_build: +20240517.202103.146
38+
39+
# 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
40+
# See: https://ibm-mas.slack.com/archives/C02PUHKQB5L/p1770849370378689
41+
datarefinery_version: 11.0.0+20250513.203727.232
2142

22-
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/)
23-
ibm_zen_version: 6.2.0+20250530.152516.232 # For CPD5 ibm-zen has to be explicitily mirrored
43+
# TODO: Why is this here, there is no evidence that it is being used in image mirroring?
44+
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
2445

46+
# Dependencies - Db2u
47+
# -----------------------------------------------------------------------------
2548
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)
49+
db2u_extras_version: 1.0.6 # No Update
50+
db2u_filter: db2
51+
2652
db2_channel_default: v110509.0 # Default Channel version for db2u-operator
27-
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
28-
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
29-
sls_version: 3.12.5 # Operator version 3.12.5 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
30-
tsm_version: 1.7.2 # Operator version 1.7.2 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
31-
dd_version: 1.1.21 # Operator version 1.1.21 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
32-
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
33-
wsl_version: 11.0.0+20250521.202913.73 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
34-
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
35-
wml_version: 11.0.0+20250530.193146.282 # Operator version 5.2.0
36-
postgress_version: 5.16.0+20250827.110911.2626 # ibm-cpd-cloud-native-postgresql-operator 5.2.0 cp4d
37-
38-
ccs_build: 11.0.0+20250605.130237.468 # cpd 5.2.0 using ccs build
39-
# datarefinery_build: +20240517.202103.146
4053

41-
spark_version: 11.0.0+20250604.163055.2097 # Operator version 5.2.0
42-
cognos_version: 28.0.0+20250515.175459.10054 # Operator version 25.0.0
43-
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)
44-
elasticsearch_version: 1.1.2667 # Operator version 1.1.2667 # used in cpd 5.1.3 only
45-
opensearch_version: 1.1.2494 # Operator version 1.1.2494
54+
55+
# Dependencies - CouchDb
56+
# -----------------------------------------------------------------------------
57+
# Note: This is required for Assist 9.0 (https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml)
58+
couchdb_version: 1.0.13 # Operator version 2.2.1 (1.0.13) sticking with 1.0.13
59+
60+
61+
# Dependencies - Minio
62+
# -----------------------------------------------------------------------------
63+
minio_version: RELEASE.2025-06-13T11-33-47Z
64+
65+
66+
# Dependencies - MongoDB
67+
# -----------------------------------------------------------------------------
68+
mongo_extras_version_default: 8.0.17
69+
# TODO: We probably don't need to keep carrying forward the now unsupported versions
70+
mongo_extras_version_4: 4.4.21
71+
mongo_extras_version_5: 5.0.23
72+
mongo_extras_version_6: 6.0.12
73+
mongo_extras_version_7: 7.0.23
74+
mongo_extras_version_8: 8.0.17
75+
76+
77+
# Dependencies - Amlen
78+
# -----------------------------------------------------------------------------
79+
amlen_extras_version: 1.1.3
80+
81+
82+
# Dependencies - Suite License Service
83+
# -----------------------------------------------------------------------------
84+
# https://github.ibm.com/maximoappsuite/ibm-sls/releases
85+
sls_version: 3.12.5
86+
87+
88+
# Dependencies - Truststore Manager
89+
# -----------------------------------------------------------------------------
90+
# https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases
91+
tsm_version: 1.7.2
92+
93+
94+
# Dependencies - Data Dictionary
95+
# -----------------------------------------------------------------------------
96+
# https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases
97+
dd_version: 1.1.21
98+
4699

47100
# Maximo Application Suite
48101
# -----------------------------------------------------------------------------
49102
mas_core_version:
50103
9.2.x-feature: 9.2.0-pre.stable_9887 # Updated
51-
9.1.x: 9.1.8 # Updated
104+
9.1.x: 9.1.8 # Updated
52105
9.0.x: 9.0.19 # Updated
53106
8.10.x: 8.10.33 # Updated
54107
8.11.x: 8.11.30 # Updated
55108
mas_assist_version:
56109
9.1.x: 9.1.7 # Updated
57110
9.0.x: 9.0.13 # Updated
58-
8.10.x: 8.7.8 # No Update
59-
8.11.x: 8.8.7 # No Update
111+
8.10.x: 8.7.8 # No Update
112+
8.11.x: 8.8.7 # No Update
60113
mas_hputilities_version:
61-
9.1.x: "" # Not Supported
62-
9.0.x: "" # Not Supported
63-
8.10.x: 8.6.7 # No Update
64-
8.11.x: "" # Not Supported
114+
9.1.x: "" # Not Supported
115+
9.0.x: "" # Not Supported
116+
8.10.x: 8.6.7 # No Update
117+
8.11.x: "" # Not Supported
65118
mas_iot_version:
66119
9.1.x: 9.1.7 # Updated
67120
9.0.x: 9.0.16 # Updated
68121
8.10.x: 8.7.30 # Updated
69122
8.11.x: 8.8.26 # Updated
70123
mas_manage_version:
71124
9.2.x-feature: 9.2.0-pre.stable_10282 # Updated
72-
9.1.x: 9.1.8 # Updated
73-
9.0.x: 9.0.21 # Updated
74-
8.10.x: 8.6.34 # Updated
75-
8.11.x: 8.7.28 # Updated
125+
9.1.x: 9.1.8 # Updated
126+
9.0.x: 9.0.21 # Updated
127+
8.10.x: 8.6.34 # Updated
128+
8.11.x: 8.7.28 # Updated
76129
mas_monitor_version:
77-
9.1.x: 9.1.7 # Updated
78-
9.0.x: 9.0.17 # Updated
79-
8.10.x: 8.10.27 # Updated
80-
8.11.x: 8.11.25 # Updated
130+
9.1.x: 9.1.7 # Updated
131+
9.0.x: 9.0.17 # Updated
132+
8.10.x: 8.10.27 # Updated
133+
8.11.x: 8.11.25 # Updated
81134
mas_optimizer_version:
82135
9.2.x-feature: 9.2.0-pre.stable_9869 # Updated
83-
9.1.x: 9.1.8 # Updated
84-
9.0.x: 9.0.19 # Updated
85-
8.10.x: 8.4.26 # Updated
86-
8.11.x: 8.5.25 # Updated
136+
9.1.x: 9.1.8 # Updated
137+
9.0.x: 9.0.19 # Updated
138+
8.10.x: 8.4.26 # Updated
139+
8.11.x: 8.5.25 # Updated
87140
mas_predict_version:
88141
9.1.x: 9.1.4 # Need to update
89142
9.0.x: 9.0.11 # Need to update
90143
8.10.x: 8.8.12 # Need to update
91144
8.11.x: 8.9.14 # Need to update
92145
mas_visualinspection_version:
93146
9.2.x-feature: 9.2.0-pre.stable_6198 # Need to update
94-
9.1.x: 9.1.7 # Updated
95-
9.0.x: 9.0.16 # Updated
96-
8.10.x: 8.8.4 # No Update
97-
8.11.x: 8.9.19 # Updated
147+
9.1.x: 9.1.7 # Updated
148+
9.0.x: 9.0.16 # Updated
149+
8.10.x: 8.8.4 # No Update
150+
8.11.x: 8.9.19 # Updated
98151
mas_facilities_version:
99152
9.1.x: 9.1.7 # Updated
100153
9.0.x: "" # Not Supported
101154
8.10.x: "" # Not Supported
102155
8.11.x: "" # Not Supported
103156

157+
# TODO: What is this? It almost certainly should not be here.
158+
manage_extras_913: 9.1.3
159+
104160

105161
# Maximo AI Service
106162
# ------------------------------------------------------------------------------
107163
aiservice_version:
108164
9.2.x-feature: 9.2.0-pre.stable_9768 # Updated
109165
9.1.x: 9.1.11 # Updated
110-
111-
112-
# Extra Images for UDS
113-
# ------------------------------------------------------------------------------
114-
uds_extras_version: 1.5.0
115-
116-
# Extra Images for Mongo
117-
# ------------------------------------------------------------------------------
118-
mongo_extras_version_default: 8.0.17
119-
120-
# Variables used to mirror additional mongo image versions
121-
mongo_extras_version_4: 4.4.21
122-
mongo_extras_version_5: 5.0.23
123-
mongo_extras_version_6: 6.0.12
124-
mongo_extras_version_7: 7.0.23
125-
mongo_extras_version_8: 8.0.17
126-
127-
# Extra Images for Db2u
128-
# ------------------------------------------------------------------------------
129-
db2u_extras_version: 1.0.6 # No Update
130-
db2u_filter: db2
131166

132-
# Extra Images for CCS used for PCD 5.2.0 Hotfix
133-
# ------------------------------------------------------------------------------
134-
ccs_extras_version: 11.0.0
135167

136-
# Extra Images for IBM Watson Discovery
168+
# Editorial
137169
# ------------------------------------------------------------------------------
138-
#wd_extras_version: 1.0.4
139-
140-
# Extra Images for Amlen
141-
# ------------------------------------------------------------------------------
142-
amlen_extras_version: 1.1.3
143-
144-
# Default Cloud Pak for Data version
145-
# ------------------------------------------------------------------------------
146-
cpd_product_version_default: 5.2.0
147-
148-
manage_extras_913: 9.1.3
149-
minio_version: RELEASE.2025-06-13T11-33-47Z
150-
151170
editorial:
152171
whats_new:
153172
- title: '**Security updates and bug fixes**'
@@ -167,4 +186,4 @@ editorial:
167186
- IBM Data Dictionary v1.1
168187
known_issues:
169188
- title: Customers using **Maximo Assist v8.7 or v8.8** should not update and must instead contact IBM Support for guidance regarding the removal of IBM Watson Discovery and upgrading to Maximo Assist v9.0
170-
- title: A known issue exists in the January 29, 2026 release affecting HSE and Oil & Gas (9.0.23 / 9.1.64). Customers with HSE installed should avoid upgrading to the January release. Installation of HSE or Oil & Gas on Manage 9.0.x / 9.1.x should be deferred until the February 2026 patch.
189+
- title: A known issue exists in the January 29, 2026 release affecting HSE and Oil & Gas (9.0.23 / 9.1.64). Customers with HSE installed should avoid upgrading to the January release. Installation of HSE or Oil & Gas on Manage 9.0.x / 9.1.x should be deferred until the February 2026 patch.

‎src/mas/devops/mas/suite.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def isAirgapInstall(dynClient: DynamicClient, checkICSP: bool = False) -> bool:
5454
return len(masIDMS.items) + len(aiserviceIDMS.items) > 0
5555

5656

57-
def getDefaultStorageClasses(dynClient: DynamicClient) -> dict:
57+
def getDefaultStorageClasses(dynClient: DynamicClient) -> SimpleNamespace:
5858
"""
5959
Detect and return default storage classes for the cluster environment.
6060

‎src/mas/devops/ocp.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def getConsoleURL(dynClient: DynamicClient) -> str:
318318
return f"https://{consoleRoute.spec.host}"
319319

320320

321-
def getNodes(dynClient: DynamicClient) -> str:
321+
def getNodes(dynClient: DynamicClient) -> dict:
322322
"""
323323
Get all nodes in the cluster.
324324
@@ -336,7 +336,7 @@ def getNodes(dynClient: DynamicClient) -> str:
336336
return nodes
337337

338338

339-
def getStorageClass(dynClient: DynamicClient, name: str) -> str:
339+
def getStorageClass(dynClient: DynamicClient, name: str) -> dict | None:
340340
"""
341341
Get a specific StorageClass by name.
342342

0 commit comments

Comments
 (0)