Skip to content

Commit

Permalink
[minor] Support September Catalog (#1019)
Browse files Browse the repository at this point in the history
Co-authored-by: Sanjay Prabhakar <[email protected]>
Co-authored-by: Sanjay Prabhakar <[email protected]>
  • Loading branch information
3 people committed Sep 26, 2023
1 parent 9bb8174 commit 65bc878
Show file tree
Hide file tree
Showing 26 changed files with 347 additions and 173 deletions.
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAS Devops Ansible Collection

MAS Compatability
-------------------------------------------------------------------------------
The collection supports IBM Maximo Application Suite version 8.9 and above.
The collection supports IBM Maximo Application Suite version 8.10 and above.


Releases
Expand Down
2 changes: 1 addition & 1 deletion docs/playbooks/oneclick-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Usage
Only one parameter is required, the new tag of the IBM Maximo Operator Catalog that you wish to use:

```bash
export MAS_CATALOG_VERSION=v8-230829-amd64
export MAS_CATALOG_VERSION=v8-230926-amd64
oc login --token=xxxx --server=https://myocpserver
ansible-playbook ibm.mas_devops.oneclick_update
```
Expand Down
4 changes: 1 addition & 3 deletions ibm/mas_devops/common_vars/casebundles/v8-230829-amd64.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
---
# Case bundle configuration for IBM Maximo Operator Catalog v230725
# Case bundle configuration for IBM Maximo Operator Catalog v230829
# -----------------------------------------------------------------------------
# In the future this won't be necessary as we'll be able to mirror from the
# catalog itself, but not everything in the catalog supports this yet (including MAS)
# so we need to use the CASE bundle mirror process still.

catalog_digest: sha256:ecc076b3219db96ed78faac32c815282515d830bc5c6025268be96ca15618f7e

## TODO UPDATE BELOW DEPENDENCIES(ESPECIALLY FOR db2u v110508.0.2) BASED ON NEW CURATED CONTENT - REMOVE THIS COMMENT ONCE DONE

# Dependencies
# -----------------------------------------------------------------------------
common_svcs_version: 1.19.4 # Operator version 3.23.4 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
Expand Down
78 changes: 78 additions & 0 deletions ibm/mas_devops/common_vars/casebundles/v8-230926-amd64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
---
# Case bundle configuration for IBM Maximo Operator Catalog v230926
# -----------------------------------------------------------------------------
# In the future this won't be necessary as we'll be able to mirror from the
# catalog itself, but not everything in the catalog supports this yet (including MAS)
# so we need to use the CASE bundle mirror process still.

catalog_digest: sha256:b3ad0d8d20eee9c7e48ba93b956a4f452e48ba0a648e76c39100c352f2cb6537

# Dependencies
# -----------------------------------------------------------------------------
common_svcs_version: 1.19.4 # Operator version 3.23.4 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
db2u_version: 5.1.4 # Operator version 110508.0.2 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
events_version: 4.6.1 # Operator version 4.6.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
uds_version: 2.0.11 # Operator version 2.0.11
sls_version: 3.8.0 # Operator version 3.8.0
tsm_version: 1.5.1 # Operator version 1.5.1
dd_version: 1.1.5 # Operator version 1.1.5
appconnect_version: 6.2.0 # Operator version 6.2.0
cp4d_platform_version: 2.9.0+20230524.165553 # Operator version 3.8.0
wsl_version: 6.5.0 # Operator version 6.5.0
wml_version: 6.5.0 # Operator version 3.5.0
spark_version: 6.5.0 # Operator version 3.5.0

# Watson discovery and its dependencies
# Match corresponding case version for default versions in the catalog source
# -----------------------------------------------------------------------------
wd_version: 5.5.0 # Operator version 4.6.5
model_train_version: 1.2.7 # Operator version 1.1.9
elasticsearch_version: 1.1.1541 # Operator version 1.1.1541
couchdb_version: 1.0.13 # Operator version 2.2.1


# Maximo Application Suite
# -----------------------------------------------------------------------------
mas_core_version:
8.10.x: 8.10.5 # Updated
8.11.x: 8.11.0 # Updated
mas_assist_version:
8.10.x: 8.7.2 # No Update
8.11.x: 8.8.0 # Updated
mas_hputilities_version:
8.10.x: 8.6.2 # No Update
8.11.x: "" # Not Supported
mas_iot_version:
8.10.x: 8.7.4 # No Update
8.11.x: 8.8.0 # Updated
mas_manage_version:
8.10.x: 8.6.5 # Updated
8.11.x: 8.7.0 # Updated
mas_monitor_version:
8.10.x: 8.10.5 # Updated
8.11.x: 8.11.0 # Updated
mas_optimizer_version:
8.10.x: 8.4.1 # No Update
8.11.x: 8.5.0 # Updated
mas_predict_version:
8.10.x: 8.8.2 # No Update
8.11.x: 8.9.0 # Updated
mas_visualinspection_version:
8.10.x: 8.8.1 # No Update
8.11.x: 8.9.0 # Updated

# Extra Images for UDS
# ------------------------------------------------------------------------------
uds_extras_version: 1.4.0

# Extra Images for Mongo
# ------------------------------------------------------------------------------
mongo_extras_version: 4.4.21

# Extra Images for Db2u
# ------------------------------------------------------------------------------
db2u_extras_version: 1.0.2

# Extra Images for IBM Watson Discovery
# ------------------------------------------------------------------------------
wd_extras_version: 1.0.1
49 changes: 0 additions & 49 deletions ibm/mas_devops/common_vars/casebundles/v8-airgap-amd64.yml

This file was deleted.

28 changes: 28 additions & 0 deletions ibm/mas_devops/common_vars/digests/ibm-mas-manage/8.5.9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
cp.icr.io/cp/manage/bdi:8.1.3: cp.icr.io/cp/manage/bdi@sha256:8d0b7d9da0b9787d1aa2cd517ec97626a8c7c548d9fd96a6a432c385fc60ab17
cp.icr.io/cp/manage/extension-acm:8.1.2: cp.icr.io/cp/manage/extension-acm@sha256:e95aa692c212c5351e9b55520d549ca314c438b6656792039cf6cde228cd5790
cp.icr.io/cp/manage/extension-anywhere:8.0.2: cp.icr.io/cp/manage/extension-anywhere@sha256:83aca8786c30b6033be81bc7667ac972f477ffc6b7a70cd54c190e600938886f
cp.icr.io/cp/manage/extension-aviation:8.1.3: cp.icr.io/cp/manage/extension-aviation@sha256:3d1b18700bce5c59cca8ec4b56112dba2cf96de6d46026b48c66549e67cf0210
cp.icr.io/cp/manage/extension-civil:8.4.7: cp.icr.io/cp/manage/extension-civil@sha256:c5a111f1e1816ff5d75b9dbd03265d1bc17afb19aa0313219aa6da2ee45fc181
cp.icr.io/cp/manage/extension-health:8.7.4: cp.icr.io/cp/manage/extension-health@sha256:9f2843650a594260a11cb46ba0567dc65c6c1142432d1c11800cccc1b88ecff4
cp.icr.io/cp/manage/extension-hse:8.1.3: cp.icr.io/cp/manage/extension-hse@sha256:9c7671f157abbfc52ba865b86c58cf95907be2a64f3c90f48ef2db386c0b4051
cp.icr.io/cp/manage/extension-nuclear:8.1.2: cp.icr.io/cp/manage/extension-nuclear@sha256:182760f9f05a1f812378c39f358d62451e5f5fba011b68932441a51b4358c7fb
cp.icr.io/cp/manage/extension-oilandgas:8.1.3: cp.icr.io/cp/manage/extension-oilandgas@sha256:49d2b8aa85f8cc2c163d1532597f2eb01a7eda3e3abfb30ad5d8ff75882ed166
cp.icr.io/cp/manage/extension-oracleadapter:8.2.0: cp.icr.io/cp/manage/extension-oracleadapter@sha256:d8f3a47ca74207bcef561176fe8f0a6ab05b477aa2e43e432c72c6bda1391234
cp.icr.io/cp/manage/extension-sapadapter:8.2.0: cp.icr.io/cp/manage/extension-sapadapter@sha256:eb83c9e0e155d1c6bee8bb63ac3c1581c076dbaec7ec3513ab23ccaae097645c
cp.icr.io/cp/manage/extension-serviceprovider:8.1.3: cp.icr.io/cp/manage/extension-serviceprovider@sha256:9dc0095c51175ee8833ac214679be9a7b2249e1a9cd2d7a7f280dd62e05ffcb0
cp.icr.io/cp/manage/extension-spatial:8.5.7: cp.icr.io/cp/manage/extension-spatial@sha256:583798ce2fac149a0cd1517134779d41dc765709f482c7099a49b7ad9f730c9a
cp.icr.io/cp/manage/extension-transportation:8.1.3: cp.icr.io/cp/manage/extension-transportation@sha256:357d350f84aaa83fb4e895ed85393f0a0ca78311644b6db0957c919e56ffdfe4
cp.icr.io/cp/manage/extension-utilities:8.1.2: cp.icr.io/cp/manage/extension-utilities@sha256:acf8c0e9d4defd393b1d42917cef2dc53488f29409f4153a99adece6c99cbf59
cp.icr.io/cp/manage/extension-workday:8.1.0: cp.icr.io/cp/manage/extension-workday@sha256:fef64cccc1e544072c7440c7ab9c60fc7b4208df606c120e4d6901a33cb408d3
cp.icr.io/cp/manage/health-aio:8.7.4: cp.icr.io/cp/manage/health-aio@sha256:742af5ecc7c0ee76d50a7298b940add71e17fba4d727aac4d7ebc9b83d4ffb44
cp.icr.io/cp/manage/ibm-mas-manage-appstatus:8.5.9: cp.icr.io/cp/manage/ibm-mas-manage-appstatus@sha256:93dd958c2c57ea4a3d14a9b707e8f3f5fdeaa28c1d6875dfc0fe2f006a83ba88
cp.icr.io/cp/manage/ibm-mas-manage-bdi:8.5.9: cp.icr.io/cp/manage/ibm-mas-manage-bdi@sha256:f53127b123b35637a923c2eee3cec370cab888486c0e7dac494ba81a8123b458
cp.icr.io/cp/manage/ibm-mas-manage-ws:8.5.9: cp.icr.io/cp/manage/ibm-mas-manage-ws@sha256:bc9d7fc53d84340a218c2a98d679afc95be47779860487e138baf61b70c28747
cp.icr.io/cp/manage/maf-tools:8.9.0: cp.icr.io/cp/manage/maf-tools@sha256:ced61b0881b44f22550f116b3089b1a7d20adc859676bb138574c242fed78d6d
cp.icr.io/cp/manage/manage-groupsyncagent:1.1.74: cp.icr.io/cp/manage/manage-groupsyncagent@sha256:b937c70c2ec1c144a2a71f2da9f44f6b58449ea585e4b611f77d4f22e70ffa62
cp.icr.io/cp/manage/manage-usersyncagent:2.1.77: cp.icr.io/cp/manage/manage-usersyncagent@sha256:e642b0d64fdacf8ebd95d748e381b095bebd501fedf08c5faf1d15accd6f1391
cp.icr.io/cp/manage/manageadmin:8.5.9: cp.icr.io/cp/manage/manageadmin@sha256:3cbf4c9f04c129343de014011e271a6972a23492f7f9f55806f1f95016ff3abd
cp.icr.io/cp/manage/maxloader:8.3.3: cp.icr.io/cp/manage/maxloader@sha256:daa928876ab5c418c6c5ac4880997a1b9d38b8776353991cdc8b7188a0a6871f
cp.icr.io/cp/manage/monitoragent:3.2.45: cp.icr.io/cp/manage/monitoragent@sha256:1b9f91b8b6d9aa9c2e046ac23df64503fb2fb3cf275c33f704c6ebd80d0c925b
cp.icr.io/cp/manage/ubi-wlp-jms-manage:1.3.7: cp.icr.io/cp/manage/ubi-wlp-jms-manage@sha256:37883d8e9d6a48674d71e21fb791de95e983fc49af01cc3d32088f3fa4535be0
cp.icr.io/cp/manage/ubi-wlp-manage:2.5.4: cp.icr.io/cp/manage/ubi-wlp-manage@sha256:6a2368d4c8c1b1a66681876fe1c199d379035aa34697819583c368746092d05a
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
cp.icr.io/cp/visualinspection/vision-dataset-feature:1.0.36: cp.icr.io/cp/visualinspection/vision-dataset-feature@sha256:7b595042e7fa25968d86bd6673598edf782968d188fa584d091ccf3f458fac50
cp.icr.io/cp/visualinspection/vision-dataset-summarization:1.0.26: cp.icr.io/cp/visualinspection/vision-dataset-summarization@sha256:7858145ae601568107bbaf97bc80fcd00e43a3061a3ffeb77e00c0dfdd758aa3
cp.icr.io/cp/visualinspection/vision-dle:8.9.0-x86_64: cp.icr.io/cp/visualinspection/vision-dle@sha256:5c791ffa5b0630f4ac180b788b12d3376c5d339adfdae1dc94a69fca574080af
cp.icr.io/cp/visualinspection/vision-dnn-service:8.9.0-x86_64: cp.icr.io/cp/visualinspection/vision-dnn-service@sha256:c87b225d44ff4ffa71546f6e0be4d382ad30ba2c427303922c360db2104d3169
cp.icr.io/cp/visualinspection/vision-edge-cme:8.9.0: cp.icr.io/cp/visualinspection/vision-edge-cme@sha256:23191526f32d1b728798247bb0d1dfaad1e4005d395a63048abaac1d2ea7ae9f
cp.icr.io/cp/visualinspection/vision-edge-controller:8.9.0: cp.icr.io/cp/visualinspection/vision-edge-controller@sha256:a7353e962f7a8b05415b68e0630b4435a33dfe779b6fdc9fc3d76a73a6e8b66b
cp.icr.io/cp/visualinspection/vision-edge-dle:8.9.0: cp.icr.io/cp/visualinspection/vision-edge-dle@sha256:c2f599a2a777e8186ee97e31060a93600d1461f69eaf315a3d3b35eb2e3b5d44
cp.icr.io/cp/visualinspection/vision-edge-inception:8.9.0: cp.icr.io/cp/visualinspection/vision-edge-inception@sha256:5a3cbd352722542f20621938a46e40b907c31682a3f14aa8d4584da1a91fd696
cp.icr.io/cp/visualinspection/vision-edge-manager:1.0.19: cp.icr.io/cp/visualinspection/vision-edge-manager@sha256:83fd2171b891cd4f060ee25a029665a2d2468f01274954b38cbab330bd7785e5
cp.icr.io/cp/visualinspection/vision-model-conversion:8.7.38: cp.icr.io/cp/visualinspection/vision-model-conversion@sha256:998dad55d3d6a9a322efdc9f82d87a32b3caecd84022fca1c07136c2da98209e
cp.icr.io/cp/visualinspection/vision-models:8.5.30: cp.icr.io/cp/visualinspection/vision-models@sha256:34fe3a138740baae1c44191a6f60d35794359cac2384f280b62a736d4a0addc3
cp.icr.io/cp/visualinspection/vision-preprocessing:8.8.3: cp.icr.io/cp/visualinspection/vision-preprocessing@sha256:83d5d7be4a7198d387314afcb51debff254df9141a5cd76b3070d6bd657825f1
cp.icr.io/cp/visualinspection/vision-service:9.4.4: cp.icr.io/cp/visualinspection/vision-service@sha256:3edb803494c98a2410a85fab2506141f21acd8e9cdc0f70c9264139837af3a60
cp.icr.io/cp/visualinspection/vision-taskanaly:8.5.41: cp.icr.io/cp/visualinspection/vision-taskanaly@sha256:17b12af391c0050d073a2fa742dd92411212e9e26c663bc627d8bc631e9e273c
cp.icr.io/cp/visualinspection/vision-ui:9.2.3: cp.icr.io/cp/visualinspection/vision-ui@sha256:60a717928cff5f49578d5aa4fd914e8eb66666e054c770621ba4d87d90f1199c
cp.icr.io/cp/visualinspection/vision-usage-reporter:1.1.49: cp.icr.io/cp/visualinspection/vision-usage-reporter@sha256:e8567b3fa7f017f299150b0f239ff46bfae586891419e8b5258a73e01cd68294
cp.icr.io/cp/visualinspection/vision-useragent:8.5.79: cp.icr.io/cp/visualinspection/vision-useragent@sha256:0a3b169d848098a6b2aba6bbecd4543c78a94201baf50ffb83a0128efaceddd4
cp.icr.io/cp/visualinspection/vision-video-microservice:8.8.3: cp.icr.io/cp/visualinspection/vision-video-microservice@sha256:ce4a5265203a0098faa7b944a9ba2003e2821b249dd1cf053a5a16a7952970e2
Loading

0 comments on commit 65bc878

Please sign in to comment.