Skip to content

Commit 5aed622

Browse files
nehasangwai-ibmnehasangwai-ibm
committed
Merge branch 'stable' into neha-cpd
2 parents cdbbde4 + e0d2e1c commit 5aed622

10 files changed

Lines changed: 151 additions & 55 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spark_version: 10.2.0 # Operator version 7.3.0
4242
cognos_version: 27.2.0 # Operator version 25.0.0
4343
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)
4444
elasticsearch_version: 1.1.2667 # Operator version 1.1.2667
45-
45+
minio_version: RELEASE.2025-06-13T11-33-47Z
4646

4747
# Maximo Application Suite
4848
# -----------------------------------------------------------------------------

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,5 @@ cpd_product_version_default: 5.1.3
141141
# Extra Images for kmodels
142142
# ------------------------------------------------------------------------------
143143
kmodels_extras_version_default: 1.0.14
144+
minio_version: RELEASE.2025-06-13T11-33-47Z
144145

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,6 @@ cpd_product_version_default: 5.1.3
144144
# Extra Images for kmodels
145145
# ------------------------------------------------------------------------------
146146
kmodels_extras_version_default: 1.0.14
147+
minio_version: RELEASE.2025-06-13T11-33-47Z
147148

148149
manage_extras_913: 9.1.3

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,6 @@ cpd_product_version_default: 5.1.3
140140
# Extra Images for kmodels
141141
# ------------------------------------------------------------------------------
142142
kmodels_extras_version_default: 1.0.14
143+
minio_version: RELEASE.2025-06-13T11-33-47Z
143144

144145
manage_extras_913: 9.1.3

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,5 @@ amlen_extras_version: 1.1.3
138138
# ------------------------------------------------------------------------------
139139
cpd_product_version_default: 5.2.0
140140

141-
# Extra Images for kmodels
142-
# ------------------------------------------------------------------------------
143-
kmodels_extras_version_default: 1.0.14
144-
145141
manage_extras_913: 9.1.3
142+
minio_version: RELEASE.2025-06-13T11-33-47Z

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

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
---
2-
# Case bundle configuration for IBM Maximo Operator Catalog 251030 (AMD64)
2+
# Case bundle configuration for IBM Maximo Operator Catalog 251127 (AMD64)
33
# -----------------------------------------------------------------------------
44
# In the future this won't be necessary as we'll be able to mirror from the
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:e1822cc642b155a22d82f0ed7149f72cfe67e4458605fac37e7ad43ad0a4ac6d
8+
catalog_digest: sha256:3fce7a6fd2aaafd40597178512d7a4722f28252baec8ac5d4f41edafbd432d7d
99

1010
ocp_compatibility:
11-
- 4.15
12-
- 4.16
13-
- 4.17
14-
- 4.18
15-
- 4.19
11+
- 4.16
12+
- 4.17
13+
- 4.18
14+
- 4.19
1615

1716
# Dependencies
1817
# -----------------------------------------------------------------------------
19-
ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
18+
ibm_licensing_version: 4.2.18 # Operator version 4.2.18 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
2019
common_svcs_version: 4.12.0 # Operator version 4.12.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
2120
common_svcs_version_1: 4.11.0 # Additional version 4.11.0
2221

@@ -26,7 +25,7 @@ ibm_zen_version: 6.1.1+20250218.180746.89 # For CPD5 ibm-zen has to be explic
2625
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)
2726
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
2827
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.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
28+
sls_version: 3.12.3 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
3029
tsm_version: 1.7.2 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
3130
dd_version: 1.1.20 # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
3231
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
@@ -47,14 +46,14 @@ elasticsearch_version: 1.1.2667 # Operator version 1.1.2667
4746
# Maximo Application Suite
4847
# -----------------------------------------------------------------------------
4948
mas_core_version:
50-
9.2.x-feature: 9.2.0-pre.stable_2456 # Updated
51-
9.1.x: 9.1.5 # Updated
52-
9.0.x: 9.0.16 # Updated
53-
8.10.x: 8.10.30 # Updated
54-
8.11.x: 8.11.27 # Updated
49+
9.2.x-feature: 9.2.0-pre.stable_4447 # Updated
50+
9.1.x: 9.1.6 # Updated
51+
9.0.x: 9.0.17 # Updated
52+
8.10.x: 8.10.31 # Updated
53+
8.11.x: 8.11.28 # Updated
5554
mas_assist_version:
56-
9.1.x: 9.1.4 # Updated
57-
9.0.x: 9.0.10 # Updated
55+
9.1.x: 9.1.5 # Updated
56+
9.0.x: 9.0.11 # Updated
5857
8.10.x: 8.7.8 # No Update
5958
8.11.x: 8.8.7 # No Update
6059
mas_hputilities_version:
@@ -63,39 +62,39 @@ mas_hputilities_version:
6362
8.10.x: 8.6.7 # No Update
6463
8.11.x: "" # Not Supported
6564
mas_iot_version:
66-
9.1.x: 9.1.4 # Updated
67-
9.0.x: 9.0.13 # Updated
68-
8.10.x: 8.7.27 # Updated
69-
8.11.x: 8.8.23 # Updated
65+
9.1.x: 9.1.5 # Updated
66+
9.0.x: 9.0.14 # Updated
67+
8.10.x: 8.7.28 # Updated
68+
8.11.x: 8.8.24 # Updated
7069
mas_manage_version:
71-
9.2.x-feature: 9.2.0-pre.stable_14287 # Updated
72-
9.1.x: 9.1.5 # Updated
73-
9.0.x: 9.0.18 # Updated
74-
8.10.x: 8.6.31 # Updated
75-
8.11.x: 8.7.25 # Updated
70+
9.2.x-feature: 9.2.0-pre.stable_4817 # Updated
71+
9.1.x: 9.1.6 # Updated
72+
9.0.x: 9.0.19 # Updated
73+
8.10.x: 8.6.32 # Updated
74+
8.11.x: 8.7.26 # Updated
7675
mas_monitor_version:
77-
9.1.x: 9.1.4 # Updated
78-
9.0.x: 9.0.14 # Updated
79-
8.10.x: 8.10.24 # Updated
80-
8.11.x: 8.11.22 # Updated
76+
9.1.x: 9.1.5 # Updated
77+
9.0.x: 9.0.15 # Updated
78+
8.10.x: 8.10.25 # Updated
79+
8.11.x: 8.11.23 # Updated
8180
mas_optimizer_version:
82-
9.2.x-feature: 9.2.0-pre.stable_2382 # Updated
83-
9.1.x: 9.1.5 # Updated
84-
9.0.x: 9.0.16 # Updated
85-
8.10.x: 8.4.23 # Updated
86-
8.11.x: 8.5.22 # Updated
81+
9.2.x-feature: 9.2.0-pre.stable_3097 # Updated
82+
9.1.x: 9.1.6 # Updated
83+
9.0.x: 9.0.16 # No Update
84+
8.10.x: 8.4.23 # No Update
85+
8.11.x: 8.5.22 # No Update
8786
mas_predict_version:
88-
9.1.x: 9.1.3 # Updated
89-
9.0.x: 9.0.10 # Updated
90-
8.10.x: 8.8.11 # Updated
91-
8.11.x: 8.9.13 # Updated
87+
9.1.x: 9.1.3 # Not release for 251127
88+
9.0.x: 9.0.10 # Not release for 251127
89+
8.10.x: 8.8.11 # Not release for 251127
90+
8.11.x: 8.9.13 # Not release for 251127
9291
mas_visualinspection_version:
93-
9.1.x: 9.1.3 # No update for v9-251030
94-
9.0.x: 9.0.13 # Updated
92+
9.1.x: 9.1.4 # Updated
93+
9.0.x: 9.0.14 # Updated
9594
8.10.x: 8.8.4 # No Update
96-
8.11.x: 8.9.16 # Updated
95+
8.11.x: 8.9.17 # Updated
9796
mas_facilities_version:
98-
9.1.x: 9.1.4 # Updated
97+
9.1.x: 9.1.5 # Updated
9998
9.0.x: "" # Not Supported
10099
8.10.x: "" # Not Supported
101100
8.11.x: "" # Not Supported
@@ -104,7 +103,7 @@ mas_facilities_version:
104103
# Maximo AI Service
105104
# ------------------------------------------------------------------------------
106105
aiservice_version:
107-
9.1.x: 9.1.7 # No Update
106+
9.1.x: 9.1.9 # Updated
108107

109108
# Extra Images for UDS
110109
# ------------------------------------------------------------------------------
@@ -138,7 +137,5 @@ amlen_extras_version: 1.1.3
138137
# ------------------------------------------------------------------------------
139138
cpd_product_version_default: 5.1.3
140139

141-
# Extra Images for kmodels
142-
# ------------------------------------------------------------------------------
143-
kmodels_extras_version_default: 1.0.14
144-
140+
manage_extras_913: 9.1.3
141+
minio_version: RELEASE.2025-06-13T11-33-47Z

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 251127 (PPC)
3+
# -----------------------------------------------------------------------------
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.
7+
8+
catalog_digest: sha256:73ab06c7642922daff44fbc1cc67fb89bc387ae96cf9d87e0c15511f8a6425c4
9+
10+
ocp_compatibility:
11+
- 4.16
12+
- 4.17
13+
- 4.18
14+
- 4.19
15+
16+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
17+
sls_version: 3.12.3 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
18+
tsm_version: 1.7.2 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
19+
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)
20+
21+
# Maximo Application Suite
22+
# -----------------------------------------------------------------------------
23+
mas_core_version:
24+
9.2.x-feature: 9.2.0-pre.stable_4447 # Updated
25+
9.1.x: 9.1.6 # Updated
26+
9.0.x: 9.0.17 # Updated
27+
8.10.x: "" # Not Supported
28+
8.11.x: "" # Not Supported
29+
mas_manage_version:
30+
9.2.x-feature: 9.2.0-pre.stable_4817 # Updated
31+
9.1.x: 9.1.6 # Updated
32+
9.0.x: 9.0.19 # Updated
33+
8.10.x: "" # Not Supported
34+
8.11.x: "" # Not Supported
35+
36+
# Extra Images for UDS
37+
# ------------------------------------------------------------------------------
38+
uds_extras_version: 1.5.0
39+
40+
# Extra Images for Mongo
41+
# ------------------------------------------------------------------------------
42+
mongo_extras_version_default: 8.0.13
43+
44+
# Variables used to mirror additional mongo image versions
45+
mongo_extras_version_4: 4.4.21
46+
mongo_extras_version_5: 5.0.23
47+
mongo_extras_version_6: 6.0.12
48+
mongo_extras_version_7: 7.0.12
49+
mongo_extras_version_8: 8.0.13

‎src/mas/devops/data/catalogs/v9-251127-s390x.yaml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 251127 (Z)
3+
# -----------------------------------------------------------------------------
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.
7+
8+
catalog_digest: sha256:8d2995b2b9589488c1b36035003febf5a5bd025fe56529593b8552fe8ee7135c
9+
10+
ocp_compatibility:
11+
- 4.16
12+
- 4.17
13+
- 4.18
14+
- 4.19
15+
16+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
17+
sls_version: 3.12.3 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
18+
tsm_version: 1.7.2 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
19+
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)
20+
21+
# Maximo Application Suite
22+
# -----------------------------------------------------------------------------
23+
mas_core_version:
24+
9.2.x-feature: 9.2.0-pre.stable_4447 # Updated
25+
9.1.x: 9.1.6 # Updated
26+
9.0.x: 9.0.17 # Updated
27+
8.10.x: "" # Not Supported
28+
8.11.x: "" # Not Supported
29+
mas_manage_version:
30+
9.2.x-feature: 9.2.0-pre.stable_4817 # Updated
31+
9.1.x: 9.1.6 # Updated
32+
9.0.x: 9.0.19 # Updated
33+
8.10.x: "" # Not Supported
34+
8.11.x: "" # Not Supported
35+
36+
# Extra Images for UDS
37+
# ------------------------------------------------------------------------------
38+
uds_extras_version: 1.5.0
39+
40+
# Extra Images for Mongo
41+
# ------------------------------------------------------------------------------
42+
mongo_extras_version_default: 8.0.13
43+
44+
# Variables used to mirror additional mongo image versions
45+
mongo_extras_version_4: 4.4.21
46+
mongo_extras_version_5: 5.0.23
47+
mongo_extras_version_6: 6.0.12
48+
mongo_extras_version_7: 7.0.12
49+
mongo_extras_version_8: 8.0.13

‎src/mas/devops/mas.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ def isAirgapInstall(dynClient: DynamicClient, checkICSP: bool = False) -> bool:
3737
else:
3838
IDMSApi = dynClient.resources.get(api_version="config.openshift.io/v1", kind="ImageDigestMirrorSet")
3939
masIDMS = IDMSApi.get(label_selector="mas.ibm.com/idmsContent=ibm")
40-
return len(masIDMS.items) > 0
40+
aiserviceIDMS = IDMSApi.get(label_selector="aiservice.ibm.com/idmsContent=ibm")
41+
return len(masIDMS.items) + len(aiserviceIDMS.items) > 0
4142

4243

4344
def getDefaultStorageClasses(dynClient: DynamicClient) -> dict:

‎src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ spec:
257257
value: "{{ aiservice_watsonxai_deployment_id }}"
258258
- name: aiservice_watsonxai_space_id
259259
value: "{{ aiservice_watsonxai_space_id }}"
260-
- name: aiservice_watsonxai_full
261-
value: "{{ aiservice_watsonxai_full }}"
260+
- name: aiservice_watsonxai_on_prem
261+
value: "{{ aiservice_watsonxai_on_prem }}"
262262
- name: aiservice_watsonxai_verify
263263
value: "{{ aiservice_watsonxai_verify }}"
264264

0 commit comments

Comments
 (0)