Skip to content

Commit be0cb6a

Browse files
jainyjosephjainyjoseph
committed
Merge branch 'update-250925' into mongo8013
2 parents 1dc1a37 + 37e4405 commit be0cb6a

6 files changed

Lines changed: 109 additions & 41 deletions

File tree

‎.secrets.baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-02-28T10:11:51Z",
6+
"generated_at": "2025-09-30T07:33:15Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -92,7 +92,7 @@
9292
"hashed_secret": "a4b48a81cdab1e1a5dd37907d6c85ca1c61ddc7c",
9393
"is_secret": false,
9494
"is_verified": false,
95-
"line_number": 263,
95+
"line_number": 290,
9696
"type": "Secret Keyword",
9797
"verified_result": null
9898
}

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

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# catalog itself, but not everything in the catalog supports this yet (including MAS)
66
# so we need to use the CASE bundle mirror process still.
77

8-
catalog_digest: sha256:984fde70dda6e3a5db3256f5c9a68c1eedaaf21f3182b57694c032fc20bd817e
8+
catalog_digest: sha256:dfad6765c3d4ec5a4ca5f0eb8b8954565c5bb1fc07a8093fdaf9f88a9658ddaa
99

1010
ocp_compatibility:
1111
- 4.15
@@ -26,7 +26,7 @@ db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to fi
2626
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
2727
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
2828
sls_version: 3.12.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
29-
tsm_version: 1.7.0 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
29+
tsm_version: 1.7.1 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
3030
dd_version: 1.1.19 # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
3131
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
3232
wsl_version: 10.2.0 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
@@ -46,14 +46,15 @@ elasticsearch_version: 1.1.2667 # Operator version 1.1.2667
4646
# Maximo Application Suite
4747
# -----------------------------------------------------------------------------
4848
mas_core_version:
49+
9.2.x-feature: 9.2.0-pre.stable_11883 # Updated
4950
9.1.x-feature: 9.1.0 # No Update
50-
9.1.x: 9.1.2 # No Update
51-
9.0.x: 9.0.14 # No Update
52-
8.10.x: 8.10.28 # No Update
53-
8.11.x: 8.11.25 # No Update
51+
9.1.x: 9.1.4 # Updated
52+
9.0.x: 9.0.15 # Updated
53+
8.10.x: 8.10.29 # Updated
54+
8.11.x: 8.11.26 # Updated
5455
mas_assist_version:
55-
9.1.x: 9.1.1 # No Update
56-
9.0.x: 9.0.8 # No Update
56+
9.1.x: 9.1.3 # Updated
57+
9.0.x: 9.0.9 # Updated
5758
8.10.x: 8.7.8 # No Update
5859
8.11.x: 8.8.7 # No Update
5960
mas_hputilities_version:
@@ -62,40 +63,42 @@ mas_hputilities_version:
6263
8.10.x: 8.6.7 # No Update
6364
8.11.x: "" # Not Supported
6465
mas_iot_version:
65-
9.1.x: 9.1.2 # No Update
66-
9.0.x: 9.0.11 # No Update
67-
8.10.x: 8.7.25 # No Update
68-
8.11.x: 8.8.21 # No Update
66+
9.1.x: 9.1.3 # Updated
67+
9.0.x: 9.0.12 # Updated
68+
8.10.x: 8.7.26 # Updated
69+
8.11.x: 8.8.22 # Updated
6970
mas_manage_version:
71+
9.2.x-feature: 9.2.0-pre.stable_13752 # Updated
7072
9.1.x-feature: 9.1.0 # No Update
7173
9.1.x: 9.1.2 # No Update
72-
9.0.x: 9.0.16 # No Update
73-
8.10.x: 8.6.29 # No Update
74-
8.11.x: 8.7.23 # No Update
74+
9.0.x: 9.0.17 # Updated
75+
8.10.x: 8.6.30 # Updated
76+
8.11.x: 8.7.24 # Updated
7577
mas_monitor_version:
76-
9.1.x: 9.1.2 # No Update
77-
9.0.x: 9.0.12 # No Update
78-
8.10.x: 8.10.22 # No Update
79-
8.11.x: 8.11.20 # No Update
78+
9.1.x: 9.1.3 # Updated
79+
9.0.x: 9.0.13 # Updated
80+
8.10.x: 8.10.23 # Updated
81+
8.11.x: 8.11.21 # Updated
8082
mas_optimizer_version:
83+
9.2.x-feature: 9.2.0-pre.stable_525 # Updated
8184
9.1.x-feature: 9.1.0 # No Update
82-
9.1.x: 9.1.3 # No Update
83-
9.0.x: 9.0.14 # No Update
84-
8.10.x: 8.4.21 # No Update
85-
8.11.x: 8.5.20 # No Update
85+
9.1.x: 9.1.4 # No Update
86+
9.0.x: 9.0.15 # No Update
87+
8.10.x: 8.4.22 # No Update
88+
8.11.x: 8.5.21 # No Update
8689
mas_predict_version:
87-
9.1.x: 9.1.1 # No Update
88-
9.0.x: 9.0.8 # No Update
89-
8.10.x: 8.8.9 # No Update
90-
8.11.x: 8.9.11 # No Update
90+
9.1.x: 9.1.2 # Updated
91+
9.0.x: 9.0.9 # Updated
92+
8.10.x: 8.8.10 # Updated
93+
8.11.x: 8.9.12 # Updated
9194
mas_visualinspection_version:
9295
9.1.x-feature: 9.1.0 # No Update
93-
9.1.x: 9.1.1 # No Update
94-
9.0.x: 9.0.11 # No Update
96+
9.1.x: 9.1.2 # Updated
97+
9.0.x: 9.0.12 # Updated
9598
8.10.x: 8.8.4 # No Update
96-
8.11.x: 8.9.14 # No Update
99+
8.11.x: 8.9.15 # Updated
97100
mas_facilities_version:
98-
9.1.x: 9.1.2 # No Update
101+
9.1.x: 9.1.3 # Updated
99102
9.0.x: "" # Not Supported
100103
8.10.x: "" # Not Supported
101104
8.11.x: "" # Not Supported
@@ -104,7 +107,7 @@ mas_facilities_version:
104107
# Maximo AI Service
105108
# ------------------------------------------------------------------------------
106109
aiservice_version:
107-
9.1.x: 9.1.6 # Updated
110+
9.1.x: 9.1.7 # Updated
108111

109112
# Extra Images for UDS
110113
# ------------------------------------------------------------------------------

‎src/mas/devops/data/catalogs/v9-250925-ppc64le.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,27 @@
55
# catalog itself, but not everything in the catalog supports this yet (including MAS)
66
# so we need to use the CASE bundle mirror process still.
77

8-
catalog_digest: sha256:a8f7907111603d134bccd361a73f338c4d25b9597b15fc15421c4fd343555d97
8+
catalog_digest: sha256:cd7d82bc2467d8ff62a0a4a1b09e90658e94dd96d00bb917e5bdced80b0d0411
99

1010
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
1111
sls_version: 3.12.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
12-
tsm_version: 1.7.0 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
12+
tsm_version: 1.7.1 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
1313
db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.2 to find the version 7.2.0, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
1414

1515
# Maximo Application Suite
1616
# -----------------------------------------------------------------------------
1717
mas_core_version:
18+
9.2.x-feature: 9.2.0-pre.stable_11883 # Updated
1819
9.1.x-feature: 9.1.0 # No Update
19-
9.1.x: 9.1.2 # No Update
20-
9.0.x: 9.0.14 # No Update
20+
9.1.x: 9.1.4 # Updated
21+
9.0.x: 9.0.15 # Updated
2122
8.10.x: "" # Not Supported
2223
8.11.x: "" # Not Supported
2324
mas_manage_version:
25+
9.2.x-feature: 9.2.0-pre.stable_13752 # Updated
2426
9.1.x-feature: 9.1.0 # No Update
2527
9.1.x: 9.1.2 # No Update
26-
9.0.x: 9.0.16 # No Update
28+
9.0.x: 9.0.17 # Updated
2729
8.10.x: "" # Not Supported
2830
8.11.x: "" # Not Supported
2931

‎src/mas/devops/db2.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,12 @@ def check_reg_cfg(db2u_instance_cr: dict, core_v1_api: client.CoreV1Api, mas_ins
237237
for cr_k, cr_v in reg_cfg_cr.items():
238238
# regex ignores any trailing [O] (which indicates the param has been overridden I think)
239239
matches = re.search(fr"{cr_k}=(.*?)(?:\s\[O\])?$", reg_cfg_pod, re.MULTILINE)
240-
if matches is None:
240+
if matches is None and cr_v != '':
241241
failures.append(f"[registry cfg] {cr_k} not found in output of db2set command")
242242
continue
243-
pod_v = matches.group(1)
243+
pod_v = ''
244+
if cr_v != '':
245+
pod_v = matches.group(1)
244246

245247
if not cr_pod_v_matches(cr_k, cr_v, pod_v):
246248
failures.append(f"[registry cfg] {cr_k}: {cr_v} != {pod_v}")

‎src/mas/devops/mas.py‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,41 @@ def getMasChannel(dynClient: DynamicClient, instanceId: str) -> str:
225225
return masSubscription.spec.channel
226226

227227

228+
def getAppsSubscriptionChannel(dynClient: DynamicClient, instanceId: str) -> list:
229+
"""
230+
Return list of installed apps with their subscribed channel
231+
"""
232+
try:
233+
installedApps = []
234+
appKinds = [
235+
"assist",
236+
"facilities",
237+
"health",
238+
"hputilities",
239+
"iot",
240+
"manage",
241+
"monitor",
242+
"mso",
243+
"optimizer",
244+
"safety",
245+
"predict",
246+
"visualinspection",
247+
"aibroker"
248+
]
249+
for appKind in appKinds:
250+
appSubscription = getSubscription(dynClient, f"mas-{instanceId}-{appKind}", f"ibm-mas-{appKind}")
251+
if appSubscription is not None:
252+
installedApps.append({"appId": appKind, "channel": appSubscription.spec.channel})
253+
return installedApps
254+
except NotFoundError:
255+
return []
256+
except ResourceNotFoundError:
257+
return []
258+
except UnauthorizedError:
259+
logger.error("Error: Unable to get MAS app subscriptions due to failed authorization: {e}")
260+
return []
261+
262+
228263
def updateIBMEntitlementKey(dynClient: DynamicClient, namespace: str, icrUsername: str, icrPassword: str, artifactoryUsername: str = None, artifactoryPassword: str = None, secretName: str = "ibm-entitlement") -> ResourceInstance:
229264
if secretName is None:
230265
secretName = "ibm-entitlement"

‎test/src/test_db2.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,32 @@ def test_check_reg_cfg(mocker):
274274
])
275275

276276

277+
def test_check_reg_cfg_with_empty_value_in_cr(mocker):
278+
279+
mock_db2_pod_exec_db2set = mocker.patch("mas.devops.db2.db2_pod_exec_db2set")
280+
mock_db2_pod_exec_db2set.return_value = '''
281+
DB2AUTH=OSAUTHDB,ALLOW_LOCAL_FALLBACK,PLUGIN_AUTO_RELOAD
282+
DB2_FMP_COMM_HEAPSZ=65536 [O]
283+
'''
284+
285+
db2_instance_cr = dict(
286+
spec=dict(
287+
environment=dict(
288+
instance=dict(
289+
registry=dict(
290+
DB2AUTH='WRONG',
291+
NOTFOUNDINOUTPUT="",
292+
)
293+
)
294+
)
295+
)
296+
)
297+
298+
assert set(db2.check_reg_cfg(db2_instance_cr, None, None, None)) == set([
299+
"[registry cfg] DB2AUTH: WRONG != OSAUTHDB,ALLOW_LOCAL_FALLBACK,PLUGIN_AUTO_RELOAD"
300+
])
301+
302+
277303
@pytest.mark.parametrize("test_case_name, expected_failures", [
278304
# This test case simulates what will happen when we run the validate_db2_config using the IoT Db2uInstance CR
279305
# as we have it today in fvtsaas after the CR settings have been applied successfully to DB2

0 commit comments

Comments
 (0)