From 65bc8787ce89079bc49f16811792d23ffad1d7ce Mon Sep 17 00:00:00 2001 From: Caroline Azadze Date: Tue, 26 Sep 2023 07:49:16 -0400 Subject: [PATCH] [minor] Support September Catalog (#1019) Co-authored-by: Sanjay Prabhakar Co-authored-by: Sanjay Prabhakar --- docs/index.md | 2 +- docs/playbooks/oneclick-update.md | 2 +- .../casebundles/v8-230829-amd64.yml | 4 +- .../casebundles/v8-230926-amd64.yml | 78 +++++++++++++++++++ .../casebundles/v8-airgap-amd64.yml | 49 ------------ .../digests/ibm-mas-manage/8.5.9.yaml | 28 +++++++ .../ibm-mas-visualinspection/8.9.0.yaml | 18 +++++ .../common_vars/digests/ibm-mas/8.9.10.yaml | 42 ++++++++++ .../playbooks/mirror_add_assist.yml | 19 +++-- .../playbooks/mirror_add_hputilities.yml | 17 +++- ibm/mas_devops/playbooks/mirror_add_iot.yml | 19 +++-- .../playbooks/mirror_add_manage.yml | 19 +++-- .../playbooks/mirror_add_monitor.yml | 39 ++++------ .../playbooks/mirror_add_optimizer.yml | 19 +++-- .../playbooks/mirror_add_predict.yml | 19 +++-- .../playbooks/mirror_add_visualinspection.yml | 19 +++-- ibm/mas_devops/playbooks/mirror_core.yml | 19 +++-- .../playbooks/mirror_dependencies.yml | 21 +++-- ibm/mas_devops/playbooks/oneclick_core.yml | 2 +- ibm/mas_devops/playbooks/oneclick_update.yml | 2 +- .../config_maps/olm-utils-cm-4.6.6.yml.j2 | 12 +-- .../roles/ibm_catalogs/defaults/main.yml | 1 + .../roles/ibm_catalogs/tasks/install/main.yml | 34 ++++---- .../mirror_case_prepare/tasks/prepare-dev.yml | 22 ------ .../vars/monitor_8.10.0.yml | 5 -- .../templates/imagecontentsourcepolicy.yml.j2 | 9 +++ 26 files changed, 347 insertions(+), 173 deletions(-) create mode 100644 ibm/mas_devops/common_vars/casebundles/v8-230926-amd64.yml delete mode 100644 ibm/mas_devops/common_vars/casebundles/v8-airgap-amd64.yml create mode 100644 ibm/mas_devops/common_vars/digests/ibm-mas-manage/8.5.9.yaml create mode 100644 ibm/mas_devops/common_vars/digests/ibm-mas-visualinspection/8.9.0.yaml create mode 100644 ibm/mas_devops/common_vars/digests/ibm-mas/8.9.10.yaml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/monitor_8.10.0.yml diff --git a/docs/index.md b/docs/index.md index ce0e26d95..5c6ce3b50 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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 diff --git a/docs/playbooks/oneclick-update.md b/docs/playbooks/oneclick-update.md index 210c31fa1..584d7c02c 100644 --- a/docs/playbooks/oneclick-update.md +++ b/docs/playbooks/oneclick-update.md @@ -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 ``` diff --git a/ibm/mas_devops/common_vars/casebundles/v8-230829-amd64.yml b/ibm/mas_devops/common_vars/casebundles/v8-230829-amd64.yml index 6d0333cbd..d1ee89bd9 100644 --- a/ibm/mas_devops/common_vars/casebundles/v8-230829-amd64.yml +++ b/ibm/mas_devops/common_vars/casebundles/v8-230829-amd64.yml @@ -1,5 +1,5 @@ --- -# 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) @@ -7,8 +7,6 @@ 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) diff --git a/ibm/mas_devops/common_vars/casebundles/v8-230926-amd64.yml b/ibm/mas_devops/common_vars/casebundles/v8-230926-amd64.yml new file mode 100644 index 000000000..fa5e9d3a4 --- /dev/null +++ b/ibm/mas_devops/common_vars/casebundles/v8-230926-amd64.yml @@ -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 diff --git a/ibm/mas_devops/common_vars/casebundles/v8-airgap-amd64.yml b/ibm/mas_devops/common_vars/casebundles/v8-airgap-amd64.yml deleted file mode 100644 index b60621307..000000000 --- a/ibm/mas_devops/common_vars/casebundles/v8-airgap-amd64.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -# Default configuration for any dev catalog -# ----------------------------------------------------------------------------- -# These may be the same for the dev catalog. Other variables would be requested in env variables - -# 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) -common_svcs_version_1: 1.19.3 # Operator version 3.23.3 -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-pre.stable # Operator dev version -tsm_version: 1.5.2-pre.stable # Operator dev version -dd_version: 1.1.5-pre.stable # Operator dev version -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 - -# Maximo Application Suite -# ----------------------------------------------------------------------------- -mas_core_version: - 8.11.x-stable: 8.11.0-pre.stable -mas_iot_version: - 8.11.x-stable: 8.8.0-pre.stable -mas_manage_version: - 8.11.x-stable: 8.7.0-pre.stable -mas_monitor_version: - 8.11.x-stable: 8.11.0-pre.stable -mas_optimizer_version: - 8.11.x-stable: 8.5.0-pre.stable -mas_predict_version: - 8.11.x-stable: 8.9.0-pre.stable -mas_visualinspection_version: - 8.11.x-stable: 8.9.0-pre.stable - -# 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 diff --git a/ibm/mas_devops/common_vars/digests/ibm-mas-manage/8.5.9.yaml b/ibm/mas_devops/common_vars/digests/ibm-mas-manage/8.5.9.yaml new file mode 100644 index 000000000..5d3155996 --- /dev/null +++ b/ibm/mas_devops/common_vars/digests/ibm-mas-manage/8.5.9.yaml @@ -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 diff --git a/ibm/mas_devops/common_vars/digests/ibm-mas-visualinspection/8.9.0.yaml b/ibm/mas_devops/common_vars/digests/ibm-mas-visualinspection/8.9.0.yaml new file mode 100644 index 000000000..9888cec35 --- /dev/null +++ b/ibm/mas_devops/common_vars/digests/ibm-mas-visualinspection/8.9.0.yaml @@ -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 diff --git a/ibm/mas_devops/common_vars/digests/ibm-mas/8.9.10.yaml b/ibm/mas_devops/common_vars/digests/ibm-mas/8.9.10.yaml new file mode 100644 index 000000000..d44bdc66c --- /dev/null +++ b/ibm/mas_devops/common_vars/digests/ibm-mas/8.9.10.yaml @@ -0,0 +1,42 @@ +cp.icr.io/cp/mas/accapppoints:3.5.7: cp.icr.io/cp/mas/accapppoints@sha256:4e94c4e7dc43c00dceacc3e6ef9353b42e84cec6276e7c6203786852e5c02cca +cp.icr.io/cp/mas/admin-dashboard:8.4.101: cp.icr.io/cp/mas/admin-dashboard@sha256:42509de34d24926e835fb1dba6c006113ba5be313f96bf8fa24e6df82426e3be +cp.icr.io/cp/mas/adoptionusage-metering:1.1.104: cp.icr.io/cp/mas/adoptionusage-metering@sha256:37ba19dfc80f50ea1c1a2c8783be5eabed707cd8277e9b22861c781ae6c1c098 +cp.icr.io/cp/mas/adoptionusage-reporter:1.9.7: cp.icr.io/cp/mas/adoptionusage-reporter@sha256:86db660bfb84f9319d9b05c8e74a25cff382efd79498f78d0b12aa9b870a74e4 +cp.icr.io/cp/mas/adoptionusageapi:1.9.25: cp.icr.io/cp/mas/adoptionusageapi@sha256:7c510f8317020fbf24a9d8f2c23ef08d2b69cce45611e8c6bfdbc74bd1c4bbec +cp.icr.io/cp/mas/catalogapi:2.3.10: cp.icr.io/cp/mas/catalogapi@sha256:8476288bf1612da8ea809132b55a3c1035aa95439a698c61248eb8d896a7b76c +cp.icr.io/cp/mas/catalogmgr:3.1.24: cp.icr.io/cp/mas/catalogmgr@sha256:58eb03a735c638d368daaf303ad35a8fb336e85dbc66eaf770033f4b5a52ab63 +cp.icr.io/cp/mas/coreapi:11.12.105: cp.icr.io/cp/mas/coreapi@sha256:7745a9bb5598bc07c3af7b0705f8b96e8cc26f037e5326c3c61cb0aa9da8e7ad +cp.icr.io/cp/mas/coreidp-login:3.2.58: cp.icr.io/cp/mas/coreidp-login@sha256:099d77bebba9438e8e2f14a2e9fdaee2039b82ec87a90251d3aa5fe8c5ab328e +cp.icr.io/cp/mas/coreidp:2.5.21: cp.icr.io/cp/mas/coreidp@sha256:e95fd7f6b436294cdbc91618f62219fd2bb0db8512c68b9e99f078ac2e75d84e +cp.icr.io/cp/mas/groupsync-coordinator:1.4.124: cp.icr.io/cp/mas/groupsync-coordinator@sha256:0e82f61a1d3fecd1690d0062b275de89ce5897b0a04f80849ec2198ac19e63e4 +cp.icr.io/cp/mas/homepage:6.4.58: cp.icr.io/cp/mas/homepage@sha256:2ab5afd6088979789d86d2fb06b13d23d5ada01a03975ab0f323b6cc02352728 +cp.icr.io/cp/mas/ibm-mas-addons:8.9.10: cp.icr.io/cp/mas/ibm-mas-addons@sha256:058237d8ff4bc1716375e7c594a33db0d7c7573c7f1d60cbea6bb1e74b76c40f +cp.icr.io/cp/mas/ibm-mas-cfg-bas:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-bas@sha256:4f62d1a07e4b0f8321a48e77cc3e3cde992f9ce344dbb8e19712371bff7cc21d +cp.icr.io/cp/mas/ibm-mas-cfg-idp:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-idp@sha256:5e6e926dd6c06deff0654f8984c38cb90f3ef907669abf9a977b1f1ab7fbf26a +cp.icr.io/cp/mas/ibm-mas-cfg-jdbc:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-jdbc@sha256:0bd2771d7b563a84a29360c7eb5d7107ef164300ffea6cfced10ff7a084af558 +cp.icr.io/cp/mas/ibm-mas-cfg-kafka:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-kafka@sha256:4cb78906c59c3eba1481282c8d1a440dc9c0375ca4dbd43132513a80fb9c11f2 +cp.icr.io/cp/mas/ibm-mas-cfg-mongo:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-mongo@sha256:4e10bdc00d7547c72947102413f2b9690e49a5a1ee377af9d73d07fb5bcdd625 +cp.icr.io/cp/mas/ibm-mas-cfg-objectstorage:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-objectstorage@sha256:48c2f6f9cd4d89a134875e8888a6d74c32aad40a83c4238fb8eeda6983759923 +cp.icr.io/cp/mas/ibm-mas-cfg-pushnotification:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-pushnotification@sha256:e4a3a684cf6eaab2c174655927e443bbec930a339c9e92ea3d76d55b181ca588 +cp.icr.io/cp/mas/ibm-mas-cfg-scim:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-scim@sha256:05c0121e7b21aa38d52ea1112c68040e04d592f68a344212ffeaaee1ddef3500 +cp.icr.io/cp/mas/ibm-mas-cfg-sls:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-sls@sha256:99088345f1eea00aa32da8593c37334558a844f05c067edeb8c74c3e1d6918d7 +cp.icr.io/cp/mas/ibm-mas-cfg-smtp:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-smtp@sha256:6f7e2b2049156e6975ca32190b69f2c2b8cba1212793e439d6f6012ba6441cbd +cp.icr.io/cp/mas/ibm-mas-cfg-watsonstudio:8.9.10: cp.icr.io/cp/mas/ibm-mas-cfg-watsonstudio@sha256:d7b1f261c2aadaedf76f78804e432ab55d469b4f58cf1fa0b8d724892af91a72 +cp.icr.io/cp/mas/ibm-mas-coreidp:8.9.10: cp.icr.io/cp/mas/ibm-mas-coreidp@sha256:6573365db9d13fa84baf7465d9d4dd3bed6a49c43caf6cb54c3ae8833fd5b428 +cp.icr.io/cp/mas/ibm-mas-ws:8.9.10: cp.icr.io/cp/mas/ibm-mas-ws@sha256:1f83f1c34895fb51e6239467f781f9a47cf8495410b313db683cdb7e1966f93b +cp.icr.io/cp/mas/importuser:1.0.29: cp.icr.io/cp/mas/importuser@sha256:02b9f9e955b4083ed828afd77e88c1f8094a3e0da94fd7e80dc2191483387fca +cp.icr.io/cp/mas/internalapi:5.8.28: cp.icr.io/cp/mas/internalapi@sha256:62f16d0d8f29e4cc11bf0df64bfd517cfc4f30bc9528f0ed7708b9fb03afe733 +cp.icr.io/cp/mas/kubectl:3.0.106: cp.icr.io/cp/mas/kubectl@sha256:5aee3c081b9e6ec1b4c142b12fc8745cfb5357e3e4cdd0b6aba7e22d84b5d8db +cp.icr.io/cp/mas/licensing-mediator:3.7.11: cp.icr.io/cp/mas/licensing-mediator@sha256:f11e8b30c813ebd7d34cc2a5dea17f08e98ff6b0047f17b7de1ed9a3d4479de7 +cp.icr.io/cp/mas/ltpakeys-generator:2.6.72: cp.icr.io/cp/mas/ltpakeys-generator@sha256:cad7ad69e689a64ec02e6c38d332d42805fb50597f5d2f7a2be8be5a8d34334c +cp.icr.io/cp/mas/milestonesapi:2.5.28: cp.icr.io/cp/mas/milestonesapi@sha256:3e0960a0a78b5e9ee1b033a6e1b897dd03aece2bb19a99f284d8c4ac76f5e261 +cp.icr.io/cp/mas/mobileapi:6.1.47: cp.icr.io/cp/mas/mobileapi@sha256:4a4472f8cd5c0fe493e271d887dd975487c3bdb2d089a4893074224c14d69d73 +cp.icr.io/cp/mas/monagent-mas:1.8.63: cp.icr.io/cp/mas/monagent-mas@sha256:32541582ab21dcbb86ee8acb83e1bff4a5e8bafed35b79815021c1ff4fcff634 +cp.icr.io/cp/mas/navigator:6.4.56: cp.icr.io/cp/mas/navigator@sha256:68963b12b5ba4b4ec765ef0ac8aa030547225df0a23806b040b92065cb2b182e +cp.icr.io/cp/mas/oidcclient-reg:2.3.111: cp.icr.io/cp/mas/oidcclient-reg@sha256:a6dc897bfd4614e68ff91f357924b9d927f21d79cc25b20e6671f7340fe6247d +cp.icr.io/cp/mas/push-notification-service:2.3.41: cp.icr.io/cp/mas/push-notification-service@sha256:f3ab3f5af19ac1102fdd5c9b22bde6cffda8731dec9e1fe396025340206bda66 +cp.icr.io/cp/mas/scimsync-agent:2.4.87: cp.icr.io/cp/mas/scimsync-agent@sha256:2578a5b2836a83b71e391dab70e295537d830e949a99c3e8a70e214e8357e9dc +cp.icr.io/cp/mas/scimsync:1.1.89: cp.icr.io/cp/mas/scimsync@sha256:0269281d78eccd32e3d87c3880e231d9b18fdc6e26fbf5273ef8692da2b934d6 +cp.icr.io/cp/mas/sendmailapi:1.10.12: cp.icr.io/cp/mas/sendmailapi@sha256:0971af07da3cbd143499ae73825b5cbf7ddc9f9852d25408cf08058b57062104 +cp.icr.io/cp/mas/usersync-coordinator:3.0.88: cp.icr.io/cp/mas/usersync-coordinator@sha256:729ce7663f8f6cbbce7e30aaacbaac76505ab4399d396a6c0ee0d5c5925f4b6b +cp.icr.io/cp/mas/workspace-coordinator:2.5.136: cp.icr.io/cp/mas/workspace-coordinator@sha256:fab2902879a77569abc84586b2b4ae5c813a5e6ae7c34cac98ec6be8bb68d0fc diff --git a/ibm/mas_devops/playbooks/mirror_add_assist.yml b/ibm/mas_devops/playbooks/mirror_add_assist.yml index 84213e8a3..26cdfafd7 100644 --- a/ibm/mas_devops/playbooks/mirror_add_assist.yml +++ b/ibm/mas_devops/playbooks/mirror_add_assist.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Assist @@ -19,11 +28,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-assist - case_version: "{{ mas_assist_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_ASSIST_VERSION') | default (mas_assist_version[mas_channel], True) }}" exclude_images: [] ibmpak_skip_dependencies: false - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-assist - manifest_version: "{{ mas_assist_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_ASSIST_VERSION') | default (mas_assist_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_hputilities.yml b/ibm/mas_devops/playbooks/mirror_add_hputilities.yml index d0d9ab949..bf41d3490 100644 --- a/ibm/mas_devops/playbooks/mirror_add_hputilities.yml +++ b/ibm/mas_devops/playbooks/mirror_add_hputilities.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Health and Predict Utilities @@ -19,11 +28,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-hputilities - case_version: "{{ mas_hputilities_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_HPUTILITIES_VERSION') | default (mas_hputilities_version[mas_channel], True) }}" exclude_images: [] ibmpak_skip_dependencies: false - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-hputilities - manifest_version: "{{ mas_hputilities_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_HPUTILITIES_VERSION') | default (mas_hputilities_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_iot.yml b/ibm/mas_devops/playbooks/mirror_add_iot.yml index 117f8af43..4e5a9c0d0 100644 --- a/ibm/mas_devops/playbooks/mirror_add_iot.yml +++ b/ibm/mas_devops/playbooks/mirror_add_iot.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo IoT @@ -19,10 +28,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-iot - case_version: "{{ mas_iot_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_IOT_VERSION') | default (mas_iot_version[mas_channel], True) }}" exclude_images: [] - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-iot - manifest_version: "{{ mas_iot_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_IOT_VERSION') | default (mas_iot_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_manage.yml b/ibm/mas_devops/playbooks/mirror_add_manage.yml index 2e74dfe77..696c0515f 100644 --- a/ibm/mas_devops/playbooks/mirror_add_manage.yml +++ b/ibm/mas_devops/playbooks/mirror_add_manage.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Manage @@ -19,10 +28,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-manage - case_version: "{{ mas_manage_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_MANAGE_VERSION') | default (mas_manage_version[mas_channel], True) }}" exclude_images: [] - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-manage - manifest_version: "{{ mas_manage_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_MANAGE_VERSION') | default (mas_manage_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_monitor.yml b/ibm/mas_devops/playbooks/mirror_add_monitor.yml index 3df1932cc..e965ff50d 100644 --- a/ibm/mas_devops/playbooks/mirror_add_monitor.yml +++ b/ibm/mas_devops/playbooks/mirror_add_monitor.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Asset Data Dictionary @@ -19,13 +28,13 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-data-dictionary - case_version: "{{ dd_version }}" + case_version: "{{ lookup('env', 'DATA_DICTIONARY_VERSION') | default (dd_version, True) }}" exclude_images: [] - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-data-dictionary - manifest_version: "{{ dd_version }}" + manifest_version: "{{ lookup('env', 'DATA_DICTIONARY_VERSION') | default (dd_version, True) }}" # 2. IBM Maximo Monitor @@ -34,27 +43,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-monitor - case_version: "{{ mas_monitor_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_MONITOR_VERSION') | default (mas_monitor_version[mas_channel], True) }}" exclude_images: [] - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-monitor - manifest_version: "{{ mas_monitor_version[mas_channel] }}" - - - # 3. IBM Maximo Monitor image fix in version 8.10.0 (there are two digests and catalog uses one and case bundle uses the other) - # ------------------------------------------------------------------------- - - name: ibm.mas_devops.mirror_extras_prepare - when: - - mirror_mode != "from-filesystem" - - mas_monitor_version[mas_channel] == "8.10.0" - vars: - extras_name: monitor - extras_version: "{{ mas_monitor_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_MONITOR_VERSION') | default (mas_monitor_version[mas_channel], True) }}" - - name: ibm.mas_devops.mirror_images - when: mas_monitor_version[mas_channel] == "8.10.0" - vars: - manifest_name: extras_monitor - manifest_version: "{{ mas_monitor_version[mas_channel] }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_optimizer.yml b/ibm/mas_devops/playbooks/mirror_add_optimizer.yml index a969f2fc3..6a67f01a1 100644 --- a/ibm/mas_devops/playbooks/mirror_add_optimizer.yml +++ b/ibm/mas_devops/playbooks/mirror_add_optimizer.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Optimizer @@ -19,10 +28,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-optimizer - case_version: "{{ mas_optimizer_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_OPTIMIZER_VERSION') | default (mas_optimizer_version[mas_channel], True) }}" exclude_images: [] - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-optimizer - manifest_version: "{{ mas_optimizer_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_OPTIMIZER_VERSION') | default (mas_optimizer_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_predict.yml b/ibm/mas_devops/playbooks/mirror_add_predict.yml index 96d1105c6..65fa7fabd 100644 --- a/ibm/mas_devops/playbooks/mirror_add_predict.yml +++ b/ibm/mas_devops/playbooks/mirror_add_predict.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Predict @@ -19,11 +28,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-predict - case_version: "{{ mas_predict_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_PREDICT_VERSION') | default (mas_predict_version[mas_channel], True) }}" exclude_images: [] ibmpak_skip_dependencies: false - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-predict - manifest_version: "{{ mas_predict_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_PREDICT_VERSION') | default (mas_predict_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml b/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml index c5d32287b..d9312a730 100644 --- a/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml +++ b/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml @@ -9,14 +9,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Visual Inspection @@ -25,10 +34,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-visualinspection - case_version: "{{ mas_visualinspection_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_VISUALINSPECTION_VERSION') | default (mas_visualinspection_version[mas_channel], True) }}" exclude_images: [] - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-visualinspection - manifest_version: "{{ mas_visualinspection_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_VISUALINSPECTION_VERSION') | default (mas_visualinspection_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_core.yml b/ibm/mas_devops/playbooks/mirror_core.yml index ef31efd3b..f3c2a9f6f 100644 --- a/ibm/mas_devops/playbooks/mirror_core.yml +++ b/ibm/mas_devops/playbooks/mirror_core.yml @@ -3,14 +3,23 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230829-amd64', True) }}" - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.10.x', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default ('8.11.x', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Application Suite Core @@ -19,11 +28,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas - case_version: "{{ mas_core_version[mas_channel] }}" + case_version: "{{ lookup('env', 'MAS_CORE_VERSION') | default (mas_core_version[mas_channel], True) }}" exclude_images: [] ibmpak_skip_dependencies: true - name: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas - manifest_version: "{{ mas_core_version[mas_channel] }}" + manifest_version: "{{ lookup('env', 'MAS_CORE_VERSION') | default (mas_core_version[mas_channel], True) }}" diff --git a/ibm/mas_devops/playbooks/mirror_dependencies.yml b/ibm/mas_devops/playbooks/mirror_dependencies.yml index d088bb0f2..b32b787e1 100644 --- a/ibm/mas_devops/playbooks/mirror_dependencies.yml +++ b/ibm/mas_devops/playbooks/mirror_dependencies.yml @@ -3,7 +3,7 @@ any_errors_fatal: true vars: - catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230627-amd64', True) }}" + catalog_tag: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-230926-amd64', True) }}" mirror_mode: "{{ lookup('env', 'MIRROR_MODE') | default ('direct', True) }}" # 1. Catalog @@ -59,9 +59,18 @@ mirror_appconnect: "{{ lookup('env', 'MIRROR_APPCONNECT') | default ('False', True) | bool }}" pre_tasks: + - name: "Get stats for the catalog file" + ansible.builtin.stat: + path: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + register: catalog_file_stats + + - name: "Debug stats if the digest image map file exists" + ansible.builtin.set_fact: + file_catalog_tag: "{{ (catalog_file_stats.stat.exists|bool) | ternary(catalog_tag, 'v8-230926-amd64') }}" + - name: Load CASE bundle versions include_vars: - file: "{{ playbook_dir }}/../common_vars/casebundles/{{ catalog_tag }}.yml" + file: "{{ playbook_dir }}/../common_vars/casebundles/{{ file_catalog_tag }}.yml" roles: # 1. IBM Maximo Operator Catalog @@ -194,7 +203,7 @@ - mirror_mode != "from-filesystem" vars: case_name: ibm-sls - case_version: "{{ sls_version }}" + case_version: "{{ lookup('env', 'SLS_VERSION') | default (sls_version, True) }}" exclude_images: [] ibmpak_skip_dependencies: false @@ -202,7 +211,7 @@ when: mirror_sls vars: manifest_name: ibm-sls - manifest_version: "{{ sls_version }}" + manifest_version: "{{ lookup('env', 'SLS_VERSION') | default (sls_version, True) }}" # 6. IBM Truststore Manager @@ -213,7 +222,7 @@ - mirror_mode != "from-filesystem" vars: case_name: ibm-truststore-mgr - case_version: "{{ tsm_version }}" + case_version: "{{ lookup('env', 'TSM_VERSION') | default (tsm_version, True) }}" exclude_images: [] ibmpak_skip_dependencies: false @@ -221,7 +230,7 @@ when: mirror_tsm vars: manifest_name: ibm-truststore-mgr - manifest_version: "{{ tsm_version }}" + manifest_version: "{{ lookup('env', 'TSM_VERSION') | default (tsm_version, True) }}" # 7. CP4D diff --git a/ibm/mas_devops/playbooks/oneclick_core.yml b/ibm/mas_devops/playbooks/oneclick_core.yml index 8df262e28..3cafb6306 100644 --- a/ibm/mas_devops/playbooks/oneclick_core.yml +++ b/ibm/mas_devops/playbooks/oneclick_core.yml @@ -11,7 +11,7 @@ sls_mongodb_cfg_file: "{{ mas_config_dir }}/mongo-{{ mongodb_namespace }}.yml" # Core Services Configuration - mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default('8.10.x', true) }}" + mas_channel: "{{ lookup('env', 'MAS_CHANNEL') | default('8.11.x', true) }}" # Workspace Configuration mas_workspace_name: "{{ lookup('env', 'MAS_WORKSPACE_NAME') | default('MAS Development', true) }}" diff --git a/ibm/mas_devops/playbooks/oneclick_update.yml b/ibm/mas_devops/playbooks/oneclick_update.yml index 5f577ea69..073fc1b70 100644 --- a/ibm/mas_devops/playbooks/oneclick_update.yml +++ b/ibm/mas_devops/playbooks/oneclick_update.yml @@ -5,7 +5,7 @@ - name: Check for required environment variables assert: that: lookup('env', 'MAS_CATALOG_VERSION') != "" - fail_msg: "You must provide the catalog version to update to (e.g. 'v8-230725-amd64', 'v8-230829-amd64')" + fail_msg: "You must provide the catalog version to update to (e.g. 'v8-230829-amd64', 'v8-230926-amd64')" roles: - ibm.mas_devops.ibm_catalogs diff --git a/ibm/mas_devops/roles/cp4d/templates/config_maps/olm-utils-cm-4.6.6.yml.j2 b/ibm/mas_devops/roles/cp4d/templates/config_maps/olm-utils-cm-4.6.6.yml.j2 index 9077c9681..de486425b 100644 --- a/ibm/mas_devops/roles/cp4d/templates/config_maps/olm-utils-cm-4.6.6.yml.j2 +++ b/ibm/mas_devops/roles/cp4d/templates/config_maps/olm-utils-cm-4.6.6.yml.j2 @@ -45,8 +45,8 @@ data: cpfs: - csv_version: 3.23.3 - case_version: 1.19.3 + csv_version: 3.23.4 + case_version: 1.19.4 sub_channel: "v3.23" cpd_platform: @@ -57,8 +57,8 @@ data: status_operator_info_field: "controlPlaneOperatorVersion" zen: - csv_version: 1.8.4 - cr_version: 4.8.4 + csv_version: 1.8.5 + cr_version: 4.8.5 scheduler: case_version: 1.12.0 @@ -432,8 +432,8 @@ data: sub_channel: v2.3 model_train: - case_version: 1.2.6 - csv_version: 1.1.8 + case_version: 1.2.7 + csv_version: 1.1.9 sub_channel: v1.1 ws_pipelines: diff --git a/ibm/mas_devops/roles/ibm_catalogs/defaults/main.yml b/ibm/mas_devops/roles/ibm_catalogs/defaults/main.yml index 2bdf792d3..6bda0d774 100644 --- a/ibm/mas_devops/roles/ibm_catalogs/defaults/main.yml +++ b/ibm/mas_devops/roles/ibm_catalogs/defaults/main.yml @@ -7,5 +7,6 @@ ibm_catalogs_action: "{{ lookup('env', 'IBM_CATALOGS_ACTION') | default('install artifactory_username: "{{ lookup('env', 'ARTIFACTORY_USERNAME') | lower }}" artifactory_token: "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}" +# mas_catalog_digest is needed for development airgap. This environment variable should be set before running the code mas_catalog_digest: "{{ lookup('env', 'MAS_CATALOG_DIGEST') }}" mas_catalog_version: "{{ lookup('env', 'MAS_CATALOG_VERSION') | default ('v8-amd64', True) }}" diff --git a/ibm/mas_devops/roles/ibm_catalogs/tasks/install/main.yml b/ibm/mas_devops/roles/ibm_catalogs/tasks/install/main.yml index c7c31b560..8a7d6e99b 100644 --- a/ibm/mas_devops/roles/ibm_catalogs/tasks/install/main.yml +++ b/ibm/mas_devops/roles/ibm_catalogs/tasks/install/main.yml @@ -20,29 +20,30 @@ # 2.2 Offline catalog # If this fails then it means we can't perform an airgap install using this catalog -- name: Load CASE bundle versions for the offline catalog - when: airgap_install - include_vars: - file: "{{ role_path }}/../../common_vars/casebundles/{{ mas_catalog_version }}.yml" - -# If we are updating the catalog in an airgap environment, we first have to -# update the image digest configmaps, otherwise when the operators update -# they will not be able to use digests for the new images. -- name: "Update digest maps ahead of catalog update" - when: airgap_install - include_tasks: tasks/install/update-digest-maps.yml - -- name: "Create IBM offline catalog" +- name: "Set up for offline released catalogs" when: - - airgap_install - artifactory_username is not defined or artifactory_username == "" - artifactory_token is not defined or artifactory_token == "" - kubernetes.core.k8s: - template: templates/offline-catalog.yml.j2 + - airgap_install + block: + - name: "Load CASE bundle versions for the offline catalog" + include_vars: + file: "{{ role_path }}/../../common_vars/casebundles/{{ mas_catalog_version }}.yml" + + # If we are updating the catalog in an airgap environment, we first have to + # update the image digest configmaps, otherwise when the operators update + # they will not be able to use digests for the new images. + - name: "Update digest maps ahead of catalog update" + include_tasks: tasks/install/update-digest-maps.yml + + - name: "Create IBM offline catalog" + kubernetes.core.k8s: + template: templates/offline-catalog.yml.j2 # 3. Install development (pre-release) catalog # ----------------------------------------------------------------------------- +# non-airgap catalog - name: "Install development (pre-release) catalogs" when: - artifactory_username is defined and artifactory_username != "" @@ -50,6 +51,7 @@ - not airgap_install include_tasks: tasks/install/development-catalog.yml +# airgap catalog - name: "Make sure that catalog digest is available for airgap dev catalog" when: - airgap_install diff --git a/ibm/mas_devops/roles/mirror_case_prepare/tasks/prepare-dev.yml b/ibm/mas_devops/roles/mirror_case_prepare/tasks/prepare-dev.yml index c39dc8144..f851be8c2 100644 --- a/ibm/mas_devops/roles/mirror_case_prepare/tasks/prepare-dev.yml +++ b/ibm/mas_devops/roles/mirror_case_prepare/tasks/prepare-dev.yml @@ -62,26 +62,7 @@ # 6. Write src=dest mapping for image mirroring # ----------------------------------------------------------------------------- -# Workaround for older versions of truststore manager -- name: "{{ case_name }} : Generate manifest using the related images from the CSV file (Trust Store Mgr<1.5.1)" - when: case_name == "ibm-truststore-mgr" and case_version is version('1.5.1','<') - ansible.builtin.lineinfile: - path: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" - create: true - line: "{{ (item.image | regex_replace('cpopen/ibm-truststore-mgr/worker', 'ibm-truststore-mgr/worker')) + '=' + registry_public_url + '/' + (item.name | regex_replace('cpopen/ibm-truststore-mgr/worker', 'ibm-truststore-mgr/worker')) }}" - loop: "{{ (lookup('file', '{{ mirror_working_dir }}/{{ case_name }}-dev-with-digest-bundle/operators/{{ case_name }}/config/manifests/bases/{{ case_name }}.clusterserviceversion.yaml') | from_yaml).spec.relatedImages }}" - -# Workaround to save image in cpopen/ibm-truststore-mgr/worker in the registry -- name: "{{ case_name }} : Generate manifest using the related images from the CSV file" - when: case_name == "ibm-truststore-mgr" and case_version is version('1.5.1','>=') - ansible.builtin.lineinfile: - path: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" - create: true - line: "{{ item.image + '=' + registry_public_url + '/' + (item.name | regex_replace('ibm-truststore-mgr/worker', 'cpopen/ibm-truststore-mgr/worker')) }}" - loop: "{{ (lookup('file', '{{ mirror_working_dir }}/{{ case_name }}-dev-with-digest-bundle/operators/{{ case_name }}/config/manifests/bases/{{ case_name }}.clusterserviceversion.yaml') | from_yaml).spec.relatedImages }}" - - name: "{{ case_name }} : Generate manifest using the related images from the CSV file" - when: case_name != "ibm-truststore-mgr" ansible.builtin.lineinfile: path: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" create: true @@ -99,9 +80,6 @@ vars: operator_bundle: "cpopen/{{ case_name }}-operator-bundle-with-digest:{{ case_version }}" -- debug: - msg: "Bundle image with digest .............. {{ operator_bundle_with_digest.stdout }}" - - name: "{{ case_name }} : Add operator bundle to manifest file" ansible.builtin.lineinfile: path: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/monitor_8.10.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/monitor_8.10.0.yml deleted file mode 100644 index 2a63836ef..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/monitor_8.10.0.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -extra_images: - - name: cp/monitor/ibm-mas-monitor-ws - registry: cp.icr.io - digest: sha256:d84c065a9ed96f948b2cb736cdfa2c9983a378a34ca68fa81757cd858be63f4e diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 index de1d41be9..107394ce7 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 @@ -51,6 +51,15 @@ spec: # 4. Artifactory # ------------------------------------------------------------------------- + # Trust Store Manager + - source: docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen/ibm-truststore-mgr/worker + mirrors: + - {{ registry_private_url }}/ibm-truststore-mgr/worker + # SLS + - source: docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen/ibm-sls/api-licensing + mirrors: + - {{ registry_private_url }}/ibm-sls/api-licensing + # All other images - source: docker-na-public.artifactory.swg-devops.com/wiotp-docker-local mirrors: - {{ registry_private_url }}