From 9eb2574eb90eb39ca82728da339f9ff0bb5bc8e5 Mon Sep 17 00:00:00 2001 From: Tom Klapiscak <7372253+tomklapiscak@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:57:18 +0000 Subject: [PATCH 1/6] [patch] workaround login issue with argocd v2.14.2 cli causing fvtsaas to fail (#1477) --- image/cli/mascli/functions/gitops_bootstrap | 2 +- image/cli/mascli/functions/gitops_utils | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/image/cli/mascli/functions/gitops_bootstrap b/image/cli/mascli/functions/gitops_bootstrap index 8080dce3a4..6f1d0cca00 100644 --- a/image/cli/mascli/functions/gitops_bootstrap +++ b/image/cli/mascli/functions/gitops_bootstrap @@ -237,7 +237,7 @@ function gitops_bootstrap() { fi # 12. Add cluster to ARgoCD - argocd login ${ARGOCD_URL} --username ${ARGOCD_USERNAME} --password ${ARGOCD_PASSWORD} --insecure + argocd login ${ARGOCD_URL} --username ${ARGOCD_USERNAME} --password ${ARGOCD_PASSWORD} --insecure --skip-test-tls export K8S_AUTH_CONTEXT=$(oc whoami -c) argocd cluster add $K8S_AUTH_CONTEXT -y rc=$? diff --git a/image/cli/mascli/functions/gitops_utils b/image/cli/mascli/functions/gitops_utils index b44bbc13f5..48572923b8 100644 --- a/image/cli/mascli/functions/gitops_utils +++ b/image/cli/mascli/functions/gitops_utils @@ -723,7 +723,7 @@ function argocd_login() { exit 1 fi echo "argo:argocd_login : ARGOCD_URL=$ARGOCD_URL ARGOCD_USERNAME=$ARGOCD_USERNAME ARGOCD_PASSWORD=${ARGOCD_PASSWORD:0:8} ..." - argocd login $ARGOCD_URL --username $ARGOCD_USERNAME --password $ARGOCD_PASSWORD --insecure + argocd login $ARGOCD_URL --username $ARGOCD_USERNAME --password $ARGOCD_PASSWORD --insecure --skip-test-tls return_code=$? echo "argo:argocd_login : return_code=$return_code" From ea68a5cf32ac96119e9c3489437f8a949e7e2302 Mon Sep 17 00:00:00 2001 From: David Parker Date: Wed, 19 Feb 2025 22:49:05 +0000 Subject: [PATCH 2/6] [doc] Provide updated dependency diagrams --- docs/img/mas-810-dependencies.svg | 533 ++++++++++++++++++++++++++++ docs/img/mas-811-dependencies.svg | 554 ++++++++++++++++++++++++++++++ docs/img/mas-90-dependencies.svg | 554 ++++++++++++++++++++++++++++++ docs/reference/dependencies.md | 22 +- 4 files changed, 1656 insertions(+), 7 deletions(-) create mode 100644 docs/img/mas-810-dependencies.svg create mode 100644 docs/img/mas-811-dependencies.svg create mode 100644 docs/img/mas-90-dependencies.svg diff --git a/docs/img/mas-810-dependencies.svg b/docs/img/mas-810-dependencies.svg new file mode 100644 index 0000000000..38fc37ee27 --- /dev/null +++ b/docs/img/mas-810-dependencies.svg @@ -0,0 +1,533 @@ + + + + + + + + + + +IBM Maximo Application Suite 8.10 + + + + + +Maximo Application Suite Core + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Suite License Service + + + + + + +Data Reporter Operator + + + + + + +Cert-Manager + + + + + + +IBM License Service + + + + + + +ODLM + + + + + + + + + + +Maximo IoT + + + + + + +Db2 + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Apache Kafka + + + + + + + + + + +Maximo Optimizer + + + + + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Asset Data Dictionary + + + + + + +Db2 + + + + + + +Maximo Assist + + + + + + +Cloud Object Storage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Maximo Visual Inspection + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +NVIDIA GPU Operator + + + + + + +Node Feature Discovery Operator + + + + + + +Maximo Manage + + + + + + +Db2 + + + + + + +Oracle Database + + + + + + +SQL Server + + + + + + +Maximo Predict + + + + + + +Db2 + + + + + + +Watson Studio Local + + + + + + +Watson Machine Learning + + + + + + +Watson Analytics Service + + + + + +IBM SPSS Modeler + + + + + + + +Maximo Monitor + + + + + + +Db2 + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Apache Kafka + + + + + + + + + + + + + + + + +IBM Maximo Application Suite + +IBM Cloud Pak for Data + +IBM Cloud Pak Foundation Services + +Red Hat OpenShift Container Platform + +Other dependencies + +Required dependency + +Optional dependency + +Alternative dependency + + + +Requires + + + + + + + +Integrates with + + + + + + + + + + + + +Alternatives + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/img/mas-811-dependencies.svg b/docs/img/mas-811-dependencies.svg new file mode 100644 index 0000000000..a72ce5f0aa --- /dev/null +++ b/docs/img/mas-811-dependencies.svg @@ -0,0 +1,554 @@ + + + + + + + + + + +IBM Maximo Application Suite 8.11 + + + + + +Maximo Application Suite Core + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Suite License Service + + + + + + +Data Reporter Operator + + + + + + +Cert-Manager + + + + + + +IBM License Service + + + + + + +ODLM + + + + + + + + + + +Maximo IoT + + + + + + +Db2 + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Apache Kafka + + + + + + + + + + +Maximo Optimizer + + + + + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Asset Data Dictionary + + + + + + +Db2 + + + + + + +Maximo Assist + + + + + + +Cloud Object Storage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Maximo Visual Inspection + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +NVIDIA GPU Operator + + + + + + +Node Feature Discovery Operator + + + + + + +Maximo Manage + + + + + + +Db2 + + + + + + +Oracle Database + + + + + + +SQL Server + + + + + +Watson Studio Local +For Maximo Health + + + + + + +Apache Kafka + + + + + + + +Maximo Predict + + + + + + +Db2 + + + + + + +Watson Studio Local + + + + + + +Watson Machine Learning + + + + + + +Watson Analytics Service + + + + + +IBM SPSS Modeler + + + + + + + +Maximo Monitor + + + + + + +Db2 + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Apache Kafka + + + + + + + + + + + + + + + + +IBM Maximo Application Suite + +IBM Cloud Pak for Data + +IBM Cloud Pak Foundation Services + +Red Hat OpenShift Container Platform + +Other dependencies + +Required dependency + +Optional dependency + +Alternative dependency + + + +Requires + + + + + + + +Integrates with + + + + + + + + + + + + +Alternatives + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/img/mas-90-dependencies.svg b/docs/img/mas-90-dependencies.svg new file mode 100644 index 0000000000..b76a4e1249 --- /dev/null +++ b/docs/img/mas-90-dependencies.svg @@ -0,0 +1,554 @@ + + + + + + + + + + +IBM Maximo Application Suite 9.0 + + + + + +Maximo Application Suite Core + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Suite License Service + + + + + + +Data Reporter Operator + + + + + + +Cert-Manager + + + + + + +IBM License Service + + + + + + +ODLM + + + + + + + + + + +Maximo IoT + + + + + + +Db2 + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Apache Kafka + + + + + + + + + + +Maximo Optimizer + + + + + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Asset Data Dictionary + + + + + + +Db2 + + + + + + +Maximo Assist + + + + + + +Cloud Object Storage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Maximo Visual Inspection + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +NVIDIA GPU Operator + + + + + + +Node Feature Discovery Operator + + + + + + +Maximo Manage + + + + + + +Db2 + + + + + + +Oracle Database + + + + + + +SQL Server + + + + + +Watson Studio Local +For Maximo Health + + + + + + +Apache Kafka + + + + + + + +Maximo Predict + + + + + + +Db2 + + + + + + +Watson Studio Local + + + + + + +Watson Machine Learning + + + + + + +Watson Analytics Service + + + + + +IBM SPSS Modeler + + + + + + + +Maximo Monitor + + + + + + +Db2 + + + + + + +MongoDB + + + + + + +Amazon DocumentDb + + + + + + +Apache Kafka + + + + + + + + + + + + + + + + +IBM Maximo Application Suite + +IBM Cloud Pak for Data + +IBM Cloud Pak Foundation Services + +Red Hat OpenShift Container Platform + +Other dependencies + +Required dependency + +Optional dependency + +Alternative dependency + + + +Requires + + + + + + + +Integrates with + + + + + + + + + + + + +Alternatives + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/dependencies.md b/docs/reference/dependencies.md index b9bcaeedf2..245db9c70e 100644 --- a/docs/reference/dependencies.md +++ b/docs/reference/dependencies.md @@ -1,8 +1,16 @@ -# Application Dependencies +Application Dependencies +=============================================================================== -## Maximo Application Suite 8.11 -![](../img/app-dependencies-811.png) - - -## Maximo Application Suite 8.10 -![](../img/app-dependencies-810.png) +
+ + + + + + + + + + + +
From 988f55290e8b054722bd3f3a3bf358e0cddcbec4 Mon Sep 17 00:00:00 2001 From: David Parker Date: Thu, 20 Feb 2025 14:24:17 +0000 Subject: [PATCH 3/6] [doc] Restore operator package release notes --- .../packages/ibm-mas-aibroker/9.0.5.md | 5 + .../catalogs/packages/ibm-mas-arcgis/9.0.0.md | 5 + .../catalogs/packages/ibm-mas-assist/8.7.8.md | 83 ++++++++++++ .../catalogs/packages/ibm-mas-assist/8.8.7.md | 86 +++++++++++++ .../catalogs/packages/ibm-mas-assist/9.0.3.md | 118 ++++++++++++++++++ .../packages/ibm-mas-hputilities/8.6.7.md | 5 + docs/catalogs/packages/ibm-mas-iot/8.7.19.md | 7 ++ docs/catalogs/packages/ibm-mas-iot/8.8.15.md | 8 ++ docs/catalogs/packages/ibm-mas-iot/9.0.5.md | 11 ++ .../packages/ibm-mas-manage/8.6.22.md | 6 + .../packages/ibm-mas-manage/8.7.16.md | 9 ++ .../catalogs/packages/ibm-mas-manage/9.0.9.md | 12 ++ .../packages/ibm-mas-monitor/8.10.16.md | 5 + .../packages/ibm-mas-monitor/8.11.14.md | 5 + .../packages/ibm-mas-monitor/9.0.6.md | 5 + .../packages/ibm-mas-optimizer/8.4.14.md | 5 + .../packages/ibm-mas-optimizer/8.5.13.md | 5 + .../packages/ibm-mas-optimizer/9.0.7.md | 5 + .../packages/ibm-mas-predict/8.8.5.md | 7 ++ .../packages/ibm-mas-predict/8.9.7.md | 18 +++ .../packages/ibm-mas-predict/9.0.4.md | 5 + .../ibm-mas-visualinspection/8.8.4.md | 5 + .../ibm-mas-visualinspection/8.9.9.md | 5 + .../ibm-mas-visualinspection/9.0.6.md | 5 + docs/catalogs/packages/ibm-mas/8.10.21.md | 9 ++ docs/catalogs/packages/ibm-mas/8.10.22.md | 7 ++ docs/catalogs/packages/ibm-mas/8.11.18.md | 9 ++ docs/catalogs/packages/ibm-mas/8.11.19.md | 11 ++ docs/catalogs/packages/ibm-mas/9.0.7.md | 10 ++ docs/catalogs/packages/ibm-mas/9.0.8.md | 13 ++ 30 files changed, 489 insertions(+) diff --git a/docs/catalogs/packages/ibm-mas-aibroker/9.0.5.md b/docs/catalogs/packages/ibm-mas-aibroker/9.0.5.md index 9622cc3657..fa68812e0d 100644 --- a/docs/catalogs/packages/ibm-mas-aibroker/9.0.5.md +++ b/docs/catalogs/packages/ibm-mas-aibroker/9.0.5.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo AiBroker v9.0.5 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-arcgis/9.0.0.md b/docs/catalogs/packages/ibm-mas-arcgis/9.0.0.md index fb35de19a1..27726dcb99 100644 --- a/docs/catalogs/packages/ibm-mas-arcgis/9.0.0.md +++ b/docs/catalogs/packages/ibm-mas-arcgis/9.0.0.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Location Service for Esri v9.0.0 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-assist/8.7.8.md b/docs/catalogs/packages/ibm-mas-assist/8.7.8.md index 30efa7af91..8b877cf776 100644 --- a/docs/catalogs/packages/ibm-mas-assist/8.7.8.md +++ b/docs/catalogs/packages/ibm-mas-assist/8.7.8.md @@ -6,6 +6,89 @@ nav_title: Operator Catalog IBM MAS Assist v8.7.8 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Merge Maint87xdev to 8.7.x (#146) +- update810image into maint87xdev at 2024-01-07T14-18Z (#188) +- update87ximgtags into maint87xdev at 2024-01-07T14-14Z (#187) +- update810image into maint87xdev at 2024-01-18T19-07Z (#261) +- update87ximgtags into maint87xdev at 2024-01-25T19-04Z (#289) +- update810image into maint87xdev at 2024-01-25T19-14Z (#290) +- update87ximgtags into maint87xdev at 2024-01-30T19-07Z (#315) +- update87ximgtags into maint87xdev at 2024-02-01T02-12Z (#320) +- update810image into maint87xdev at 2024-02-01T02-15Z (#321) +- update Grafana Dashboard to v5 (#309) +- update810image into maint87xdev at 2024-02-01T19-06Z (#326) +- update87ximgtags into maint87xdev at 2024-02-02T19-02Z (#327) +- update810image into maint87xdev at 2024-02-25T19-16Z (#375) +- update810image into maint87xdev at 2024-02-29T19-21Z (#401) +- update87ximgtags into maint87xdev at 2024-02-29T19-15Z (#400) +- update810image into maint87xdev at 2024-03-03T19-21Z (#419) +- update87ximgtags into maint87xdev at 2024-03-03T19-16Z (#418) +- update810image into maint87xdev at 2024-03-04T19-29Z (#425) +- update87ximgtags into maint87xdev at 2024-03-04T19-18Z (#424) +- update810image into maint87xdev at 2024-03-05T19-29Z (#431) +- update87ximgtags into maint87xdev at 2024-03-05T19-19Z (#430) +- update87ximgtags into maint87xdev at 2024-03-07T19-20Z (#439) +- update87ximgtags into maint87xdev at 2024-03-20T19-14Z (#482) +- update810image into maint87xdev at 2024-03-25T19-18Z (#516) +- update87ximgtags into maint87xdev at 2024-04-01T06-10Z (#546) +- update87ximgtags into maint87xdev at 2024-04-02T19-07Z (#556) +- update87ximgtags into maint87xdev at 2024-04-07T19-10Z (#576) +- update87ximgtags into maint87xdev at 2024-04-08T19-11Z (#581) +- update87ximage into maint87xdev at 2024-04-09T19-25Z (#587) +- update87ximgtags into maint87xdev at 2024-04-09T19-12Z (#586) +- update87ximage into maint87xdev at 2024-04-11T19-21Z (#599) +- update87ximgtags into maint87xdev at 2024-04-11T19-13Z (#598) +- upgrade follow-redirects version to 1.15.6 (#621) +- update87ximgtags into maint87xdev at 2024-04-23T19-22Z (#650) +- update87ximgtags into maint87xdev at 2024-04-24T19-23Z (#653) +- update87ximgtags into maint87xdev at 2024-04-28T19-25Z (#663) +- update87ximgtags into maint87xdev at 2024-05-05T19-29Z (#683) +- update87ximgtags into maint87xdev at 2024-05-08T19-29Z (#693) +- update87ximage into maint87xdev at 2024-05-10T19-37Z (#711) +- update87ximgtags into maint87xdev at 2024-05-10T19-29Z (#710) +- update87ximgtags into maint87xdev at 2024-05-11T19-30Z (#713) +- update87ximage into maint87xdev at 2024-05-13T19-40Z (#722) +- update87ximgtags into maint87xdev at 2024-05-13T19-31Z (#721) +- update87ximage into maint87xdev at 2024-05-26T19-09Z (#794) +- update87ximgtags into maint87xdev at 2024-05-26T19-03Z (#793) +- update87ximage into maint87xdev at 2024-05-30T19-10Z (#814) +- update87ximgtags into maint87xdev at 2024-05-30T19-02Z (#813) +- update87ximgtags into maint87xdev at 2024-06-06T19-02Z (#828) +- update87ximgtags into maint87xdev at 2024-06-11T08-50Z (#843) +- update87ximgtags into maint87xdev at 2024-06-13T19-03Z (#854) +- update87ximage into maint87xdev at 2024-06-26T02-08Z (#896) +- update87ximgtags into maint87xdev at 2024-06-26T02-02Z (#895) +- update87ximgtags into maint87xdev at 2024-06-27T02-01Z (#904) +- update87ximgtags into maint87xdev at 2024-07-01T05-22Z (#913) +- fix valkey redis sentinel start issue (#903) (#915) +- update87ximgtags into maint87xdev at 2024-07-02T02-02Z (#918) +- update87ximgtags into maint87xdev at 2024-07-05T02-02Z (#931) +- update87ximgtags into maint87xdev at 2024-07-05T08-16Z (#935) +- update87ximgtags into maint87xdev at 2024-07-08T06-28Z (#938) +- update87ximage into maint87xdev at 2024-07-09T02-17Z (#944) +- update87ximgtags into maint87xdev at 2024-07-09T05-46Z (#951) +- update87ximgtags into maint87xdev at 2024-07-12T02-02Z (#960) +- update87ximage into maint87xdev at 2024-07-14T02-10Z (#968) +- update87ximgtags into maint87xdev at 2024-07-17T03-46Z (#978) +- update87ximgtags into maint87xdev at 2024-07-29T04-22Z (#1016) +- update87ximgtags into maint87xdev at 2024-07-30T07-35Z (#1021) +- update87ximgtags into maint87xdev at 2024-07-31T02-01Z (#1023) +- update87ximage into maint87xdev at 2024-07-31T02-03Z (#1024) +- update87ximgtags into maint87xdev at 2024-08-05T02-02Z (#1043) +- update87ximage into maint87xdev at 2024-08-07T02-03Z (#1048) +- update87ximgtags into maint87xdev at 2024-08-07T02-02Z (#1047) +- update87ximgtags into maint87xdev at 2024-08-08T02-02Z (#1056) +- update87ximgtags into maint87xdev at 2024-08-09T02-02Z (#1059) +- update87ximgtags into maint87xdev at 2024-08-12T02-02Z (#1072) +- update87ximage into maint87xdev at 2024-08-13T09-10Z (#1076) +- update87ximgtags into maint87xdev at 2024-08-14T02-02Z (#1079) +- update87ximgtags into maint87xdev at 2024-08-23T02-03Z (#1093) +- update87ximgtags into maint87xdev at 2024-11-22T09-41Z (#1502) +- update87ximage into maint87xdev at 2024-11-22T09-44Z (#1505) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-assist/8.8.7.md b/docs/catalogs/packages/ibm-mas-assist/8.8.7.md index 7af58b7318..b836aa0bc0 100644 --- a/docs/catalogs/packages/ibm-mas-assist/8.8.7.md +++ b/docs/catalogs/packages/ibm-mas-assist/8.8.7.md @@ -6,6 +6,92 @@ nav_title: Operator Catalog IBM MAS Assist v8.8.7 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- updateimgtags into maint88xdev at 2024-01-03T02-04Z (#168) +- update811image into maint88xdev at 2024-01-03T02-11Z (#169) +- update811image into maint88xdev at 2024-01-07T14-10Z (#186) +- update88xmgtags into maint88xdev at 2024-01-07T14-07Z (#185) +- update811image into maint88xdev at 2024-01-18T18-08Z (#259) +- update88xmgtags into maint88xdev at 2024-01-22T18-02Z (#271) +- update88xmgtags into maint88xdev at 2024-01-23T08-38Z (#274) +- update811image into maint88xdev at 2024-01-24T18-09Z (#285) +- update88xmgtags into maint88xdev at 2024-01-24T18-02Z (#284) +- update811image into maint88xdev at 2024-01-31T18-06Z (#319) +- update88xmgtags into maint88xdev at 2024-02-01T02-19Z (#322) +- update Grafana Dashboard to v5 (#307) +- update811image into maint88xdev at 2024-02-01T18-08Z (#325) +- update811image into maint88xdev at 2024-02-25T18-16Z (#373) +- update88xmgtags into maint88xdev at 2024-02-25T18-11Z (#372) +- update811image into maint88xdev at 2024-02-29T18-20Z (#399) +- update88xmgtags into maint88xdev at 2024-02-29T18-15Z (#398) +- update811image into maint88xdev at 2024-03-03T18-21Z (#417) +- update88xmgtags into maint88xdev at 2024-03-03T18-16Z (#416) +- update811image into maint88xdev at 2024-03-04T18-29Z (#423) +- update811image into maint88xdev at 2024-03-05T18-28Z (#429) +- update88xmgtags into maint88xdev at 2024-03-05T18-18Z (#428) +- update88xmgtags into maint88xdev at 2024-03-10T18-02Z (#447) +- update88xmgtags into maint88xdev at 2024-03-17T18-07Z (#466) +- update88xmgtags into maint88xdev at 2024-03-20T18-18Z (#480) +- update88xmgtags into maint88xdev at 2024-03-28T18-11Z (#528) +- update811image into maint88xdev at 2024-03-28T18-17Z (#529) +- update88ximgtags into maint88xdev at 2024-03-31T18-05Z (#541) +- update88ximgtags into maint88xdev at 2024-04-01T06-10Z (#545) +- tough-cookie package version upgrade from 2.5.0 to 4.1.3 (#550) +- update88ximgtags into maint88xdev at 2024-04-02T18-07Z (#555) +- update88ximgtags into maint88xdev at 2024-04-07T18-10Z (#575) +- update88ximgtags into maint88xdev at 2024-04-08T18-11Z (#580) +- update88ximage into maint88xdev at 2024-04-09T18-25Z (#585) +- update88ximgtags into maint88xdev at 2024-04-09T18-12Z (#584) +- update88ximage into maint88xdev at 2024-04-11T18-21Z (#597) +- update88ximgtags into maint88xdev at 2024-04-11T18-13Z (#596) +- upgrade follow-redirects version to 1.15.6 (#622) +- update88ximgtags into maint88xdev at 2024-04-23T18-22Z (#649) +- update88ximgtags into maint88xdev at 2024-04-24T18-23Z (#652) +- update88ximgtags into maint88xdev at 2024-05-05T18-29Z (#682) +- update88ximgtags into maint88xdev at 2024-05-08T18-35Z (#692) +- update88ximage into maint88xdev at 2024-05-10T18-38Z (#709) +- update node and npm version to be same as MAS core (#704) +- update88ximgtags into maint88xdev at 2024-05-12T18-32Z (#714) +- update88ximage into maint88xdev at 2024-05-13T18-40Z (#720) +- update88ximgtags into maint88xdev at 2024-05-13T18-32Z (#719) +- update88ximage into maint88xdev at 2024-05-26T18-09Z (#792) +- update88ximage into maint88xdev at 2024-05-30T18-11Z (#812) +- update88ximgtags into maint88xdev at 2024-05-30T18-02Z (#811) +- update88ximgtags into maint88xdev at 2024-06-06T18-04Z (#827) +- update88ximgtags into maint88xdev at 2024-06-11T08-50Z (#844) +- update88ximgtags into maint88xdev at 2024-06-13T18-02Z (#853) +- update88ximage into maint88xdev at 2024-06-26T03-08Z (#898) +- update88ximgtags into maint88xdev at 2024-06-26T03-02Z (#897) +- update88ximgtags into maint88xdev at 2024-06-27T03-02Z (#905) +- update88ximgtags into maint88xdev at 2024-06-28T03-02Z (#909) +- fix valkey redis sentinel start issue (#903) (#914) +- update88ximgtags into maint88xdev at 2024-07-02T03-02Z (#919) +- update88ximgtags into maint88xdev at 2024-07-05T03-02Z (#932) +- update88ximgtags into maint88xdev at 2024-07-05T08-12Z (#934) +- update88ximgtags into maint88xdev at 2024-07-08T06-28Z (#939) +- update88ximage into maint88xdev at 2024-07-09T03-17Z (#946) +- update88ximgtags into maint88xdev at 2024-07-09T05-46Z (#949) +- update88ximgtags into maint88xdev at 2024-07-12T03-02Z (#961) +- update88ximage into maint88xdev at 2024-07-14T03-10Z (#969) +- update88ximgtags into maint88xdev at 2024-07-17T03-46Z (#979) +- update88ximgtags into maint88xdev at 2024-07-29T03-02Z (#1014) +- update88ximgtags into maint88xdev at 2024-07-30T07-35Z (#1020) +- update88ximage into maint88xdev at 2024-07-31T03-03Z (#1026) +- update88ximgtags into maint88xdev at 2024-07-31T03-02Z (#1025) +- update88ximgtags into maint88xdev at 2024-08-05T03-02Z (#1044) +- update88ximgtags into maint88xdev at 2024-08-07T03-02Z (#1049) +- update88ximage into maint88xdev at 2024-08-07T03-03Z (#1050) +- update88ximgtags into maint88xdev at 2024-08-08T03-10Z (#1057) +- update88ximgtags into maint88xdev at 2024-08-09T03-02Z (#1060) +- update88ximgtags into maint88xdev at 2024-08-11T03-02Z (#1068) +- update88ximage into maint88xdev at 2024-08-13T09-10Z (#1075) +- update88ximgtags into maint88xdev at 2024-08-14T02-14Z (#1080) +- update88ximgtags into maint88xdev at 2024-08-23T03-03Z (#1094) +- update88ximgtags into maint88xdev at 2024-11-22T09-43Z (#1504) +- update88ximage into maint88xdev at 2024-11-22T09-46Z (#1507) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-assist/9.0.3.md b/docs/catalogs/packages/ibm-mas-assist/9.0.3.md index ee40e6a05d..12fdc07719 100644 --- a/docs/catalogs/packages/ibm-mas-assist/9.0.3.md +++ b/docs/catalogs/packages/ibm-mas-assist/9.0.3.md @@ -6,6 +6,124 @@ nav_title: Operator Catalog IBM MAS Assist v9.0.3 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- updated openshift version due security vulnerabilities (#63) +- add api customer scale code in (#76) +- Upgrade CronJob to batch/v1 for OCP 4.12 compatibility (#83) +- Fix digital issue (#99) +- fix 2 bugs for OM3.1 and OM 3.2 (#100) +- add serviceability dashboard (#112) +- add healthping rate limit into settings.common (#122) +- Add molecule test cases for OM 3.1 and OM 3.2 (#134) +- fix security issue 6126 (#141) +- fix uninstall error (#152) +- dev into stable (#154) +- updatedevimage into dev at 2023-12-30T12-32Z (#164) +- updateimgtags into dev at 2024-01-03T23-04Z (#173) +- updatedevimage into dev at 2024-01-07T14-07Z (#184) +- updatedevimgtags into dev at 2024-01-07T14-03Z (#182) +- updatedevimage into dev at 2024-01-08T13-53Z (#192) +- updatedevimgtags into dev at 2024-01-08T13-43Z (#190) +- updatedevimgtags into dev at 2024-01-10T04-19Z (#206) +- updatedevimgtags into dev at 2024-01-11T13-46Z (#217) +- updatedevimage into dev at 2024-01-16T17-12Z (#247) +- updatedevimgtags into dev at 2024-01-18T06-30Z (#257) +- updatedevimgtags into dev at 2024-01-22T17-03Z (#270) +- updatedevimgtags into dev at 2024-01-24T17-02Z (#282) +- updatedevimage into dev at 2024-01-24T17-08Z (#283) +- updatedevimage into dev at 2024-01-30T17-12Z (#313) +- updatedevimgtags into dev at 2024-02-01T02-19Z (#323) +- update Grafana Dashboard to v5 (#288) +- updatedevimage into dev at 2024-02-01T17-11Z (#324) +- updatedevimgtags into dev at 2024-02-25T17-11Z (#370) +- updatedevimage into dev at 2024-02-25T17-16Z (#371) +- updatedevimgtags into dev at 2024-02-29T17-18Z (#396) +- updatedevimage into dev at 2024-03-03T17-21Z (#415) +- updatedevimgtags into dev at 2024-03-03T17-16Z (#414) +- updatedevimage into dev at 2024-03-04T17-28Z (#422) +- updatedevimgtags into dev at 2024-03-04T17-17Z (#421) +- updatedevimgtags into dev at 2024-03-10T17-02Z (#445) +- updatedevimage into dev at 2024-03-10T17-08Z (#446) +- Hide voice from Assist (#451) +- updatedevimgtags into dev at 2024-03-12T17-07Z (#450) +- updatedevimgtags into dev at 2024-03-17T17-07Z (#465) +- updatedevimgtags into dev at 2024-03-20T17-29Z (#478) +- workaround studio login issue (#484) +- updatedevimgtags into dev at 2024-03-24T17-11Z (#503) +- updatedevimgtags into dev at 2024-03-25T17-13Z (#511) +- updatedevimage into dev at 2024-03-25T17-19Z (#512) +- Rollback (#522) +- updatedevimgtags into dev at 2024-03-29T03-35Z (#531) +- updatedevimgtags into dev at 2024-03-31T17-05Z (#540) +- updatedevimgtags into dev at 2024-04-01T06-10Z (#544) +- updatedevimgtags into dev at 2024-04-02T17-07Z (#554) +- use operator name as ibm-mas-assist (#559) +- updatedevimgtags into dev at 2024-04-07T17-10Z (#574) +- update operator name (#577) +- updatedevimgtags into dev at 2024-04-08T17-11Z (#579) +- updatedevimgtags into dev at 2024-04-09T17-12Z (#582) +- updatedevimage into dev at 2024-04-09T17-20Z (#583) +- add livenessprobe for pem (#600) +- updatedevimgtags into dev at 2024-04-11T17-13Z (#594) +- upgrade follow-redirects version to 1.15.6 (#620) +- updatedevimgtags into dev at 2024-04-21T17-20Z (#639) +- updatedevimage into dev at 2024-04-21T17-24Z (#640) +- updatedevimgtags into dev at 2024-04-22T17-20Z (#644) +- updatedevimgtags into dev at 2024-04-23T17-22Z (#648) +- GRAPHITE-75683: remove query roles (#647) +- updatedevimgtags into dev at 2024-04-24T17-23Z (#651) +- updatedevimgtags into dev at 2024-04-28T17-24Z (#662) +- updatedevimgtags into dev at 2024-04-29T17-25Z (#664) +- updatedevimgtags into dev at 2024-05-05T17-29Z (#681) +- Remove the rollback test build (#665) +- updatedevimgtags into dev at 2024-05-06T17-29Z (#684) +- remove query - part 2 (#685) +- updatedevimgtags into dev at 2024-05-08T17-30Z (#691) +- updatedevimage into dev at 2024-05-10T17-34Z (#707) +- updatedevimgtags into dev at 2024-05-10T17-30Z (#706) +- UseSepatae db for different branch (#716) +- updatedevimgtags into dev at 2024-05-13T17-32Z (#717) +- updatedevimage into dev at 2024-05-13T17-36Z (#718) +- updatedevimgtags into dev at 2024-05-14T17-32Z (#727) +- updatedevimgtags into dev at 2024-05-15T17-32Z (#730) +- updatedevimage into dev at 2024-05-15T17-35Z (#731) +- GRAPHITE-76959: remove query and hide diagnosis (#743) +- updatedevimgtags into dev at 2024-05-16T17-13Z (#738) +- updatedevimgtags into dev at 2024-05-27T17-02Z (#795) +- updatedevimgtags into dev at 2024-05-29T17-02Z (#803) +- updatedevimage into dev at 2024-05-29T17-05Z (#804) +- updatedevimgtags into dev at 2024-05-30T17-03Z (#809) +- updatedevimage into dev at 2024-05-30T17-07Z (#810) +- updatedevimgtags into dev at 2024-06-03T13-23Z (#815) +- updatedevimgtags into dev at 2024-06-03T15-18Z (#816) +- updatedevimgtags into dev at 2024-06-05T13-07Z (#820) +- update900image into maint90xdev at 2024-06-26T04-06Z (#900) +- update90ximgtags into maint90xdev at 2024-06-26T04-02Z (#899) +- update90ximgtags into maint90xdev at 2024-06-27T04-02Z (#906) +- fix valkey redis sentinel start issue (#903) (#921) +- update90ximgtags into maint90xdev at 2024-07-02T04-02Z (#922) +- update90ximgtags into maint90xdev at 2024-07-05T08-26Z (#936) +- update900image into maint90xdev at 2024-07-09T04-11Z (#948) +- update90ximgtags into maint90xdev at 2024-07-09T05-46Z (#950) +- update900image into maint90xdev at 2024-07-14T04-05Z (#970) +- update90ximgtags into maint90xdev at 2024-07-17T04-02Z (#980) +- update90ximgtags into maint90xdev at 2024-07-29T04-02Z (#1015) +- update90ximgtags into maint90xdev at 2024-07-30T07-34Z (#1019) +- update900image into maint90xdev at 2024-07-31T04-03Z (#1027) +- update90ximgtags into maint90xdev at 2024-08-04T04-01Z (#1038) +- update90ximgtags into maint90xdev at 2024-08-07T04-02Z (#1051) +- update900image into maint90xdev at 2024-08-07T04-03Z (#1052) +- update90ximgtags into maint90xdev at 2024-08-08T04-02Z (#1058) +- update90ximgtags into maint90xdev at 2024-08-09T04-02Z (#1061) +- update90ximgtags into maint90xdev at 2024-08-11T04-01Z (#1069) +- update90ximgtags into maint90xdev at 2024-08-13T09-04Z (#1073) +- update900image into maint90xdev at 2024-08-14T02-17Z (#1081) +- update90ximgtags into maint90xdev at 2024-08-23T04-09Z (#1096) +- update90ximgtags into maint90xdev at 2024-11-22T09-42Z (#1503) +- update900image into maint90xdev at 2024-11-22T09-44Z (#1506) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-hputilities/8.6.7.md b/docs/catalogs/packages/ibm-mas-hputilities/8.6.7.md index b3bae51f45..6f3220b600 100644 --- a/docs/catalogs/packages/ibm-mas-hputilities/8.6.7.md +++ b/docs/catalogs/packages/ibm-mas-hputilities/8.6.7.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM MAS HPUtilities v8.6.7 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-iot/8.7.19.md b/docs/catalogs/packages/ibm-mas-iot/8.7.19.md index bffcb65787..30e3095b10 100644 --- a/docs/catalogs/packages/ibm-mas-iot/8.7.19.md +++ b/docs/catalogs/packages/ibm-mas-iot/8.7.19.md @@ -6,6 +6,13 @@ nav_title: Operator Catalog IBM Maximo IoT v8.7.19 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- IBMIOT-656 Update the Baseimage, Requirements and Operators (#539) +- upgrade datapower (#551) +- IBMIOT-737 Update the baseimage, operators and services (#567) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-iot/8.8.15.md b/docs/catalogs/packages/ibm-mas-iot/8.8.15.md index cc0fdbef1a..abbe6c40ed 100644 --- a/docs/catalogs/packages/ibm-mas-iot/8.8.15.md +++ b/docs/catalogs/packages/ibm-mas-iot/8.8.15.md @@ -6,6 +6,14 @@ nav_title: Operator Catalog IBM Maximo IoT v8.8.15 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- IBMIOT-656 Update the Baseimage, Operators and Requirement (#536) +- upgrade datapower (#552) +- IBMIOT-737 Update the Baseimage, Operators and Services (#563) +- IBMIOT-737 Update mbgx version to latest (#565) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-iot/9.0.5.md b/docs/catalogs/packages/ibm-mas-iot/9.0.5.md index faf75961cf..ae73d6681d 100644 --- a/docs/catalogs/packages/ibm-mas-iot/9.0.5.md +++ b/docs/catalogs/packages/ibm-mas-iot/9.0.5.md @@ -6,6 +6,17 @@ nav_title: Operator Catalog IBM Maximo IoT v9.0.5 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Update mas-utils to v7.18.4 (#531) (#533) +- IBMIOT-656 Update the Baseimage, Operators and Services (#535) +- IBMIOT-656 Update license files for FT (90x) (#537) +- upgrade datapower (#553) +- IBMIOT-737 Update the Baseimage, Operators and Services (#560) +- Update mbgx version to latest (#564) +- Update EDC operator (#568) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-manage/8.6.22.md b/docs/catalogs/packages/ibm-mas-manage/8.6.22.md index 93c0015bff..bef5863373 100644 --- a/docs/catalogs/packages/ibm-mas-manage/8.6.22.md +++ b/docs/catalogs/packages/ibm-mas-manage/8.6.22.md @@ -6,6 +6,12 @@ nav_title: Operator Catalog IBM Maximo Manage v8.6.22 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Changes for Spatial 8.6.18 (#2165) +- Initial DCUT changes for 8.6.22 Feb patch (#2167) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-manage/8.7.16.md b/docs/catalogs/packages/ibm-mas-manage/8.7.16.md index cf0a728aca..8657de7723 100644 --- a/docs/catalogs/packages/ibm-mas-manage/8.7.16.md +++ b/docs/catalogs/packages/ibm-mas-manage/8.7.16.md @@ -6,6 +6,15 @@ nav_title: Operator Catalog IBM Maximo Manage v8.7.16 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- IS 8.7.16 (#2152) +- Initial changes for 1st DCUT for 8.7.16 Feb 2025 patch (#2161) +- Update for 8.7.x (#2159) +- Health 8.9.12 Feb release for Manage 8.7.16 (#2166) +- Spatial 8.7.15 and Utilities 8.1.14 (#2163) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-manage/9.0.9.md b/docs/catalogs/packages/ibm-mas-manage/9.0.9.md index 7522e95a0e..63d92ba5d6 100644 --- a/docs/catalogs/packages/ibm-mas-manage/9.0.9.md +++ b/docs/catalogs/packages/ibm-mas-manage/9.0.9.md @@ -6,6 +6,18 @@ nav_title: Operator Catalog IBM Maximo Manage v9.0.9 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Add addon placeholders for 9.0.9 release (#2155) +- fix to MASCORE-5013 (#2156) +- Health version update 9.0.68 (#2171) +- Manual image updates - 9.0.9 patch (#2175) +- manual image version update for hse and oilandgas (#2178) +- manual update manage base 9.0.81 (#2180) +- MAXMF-1426 - onlineUpgrade causes bundle server restart during online phase on second update (#2172) +- add final image for 9.0.9 release (#2182) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-monitor/8.10.16.md b/docs/catalogs/packages/ibm-mas-monitor/8.10.16.md index b567d14757..82b476fc74 100644 --- a/docs/catalogs/packages/ibm-mas-monitor/8.10.16.md +++ b/docs/catalogs/packages/ibm-mas-monitor/8.10.16.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Monitor v8.10.16 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-monitor/8.11.14.md b/docs/catalogs/packages/ibm-mas-monitor/8.11.14.md index 816e8934b6..74a8636c83 100644 --- a/docs/catalogs/packages/ibm-mas-monitor/8.11.14.md +++ b/docs/catalogs/packages/ibm-mas-monitor/8.11.14.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Monitor v8.11.14 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-monitor/9.0.6.md b/docs/catalogs/packages/ibm-mas-monitor/9.0.6.md index 890da7e9d1..58ddd12080 100644 --- a/docs/catalogs/packages/ibm-mas-monitor/9.0.6.md +++ b/docs/catalogs/packages/ibm-mas-monitor/9.0.6.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Monitor v9.0.6 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-optimizer/8.4.14.md b/docs/catalogs/packages/ibm-mas-optimizer/8.4.14.md index ccc115239d..2096e2d4ef 100644 --- a/docs/catalogs/packages/ibm-mas-optimizer/8.4.14.md +++ b/docs/catalogs/packages/ibm-mas-optimizer/8.4.14.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Optimizer v8.4.14 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-optimizer/8.5.13.md b/docs/catalogs/packages/ibm-mas-optimizer/8.5.13.md index 5a0f779209..2d49c4f502 100644 --- a/docs/catalogs/packages/ibm-mas-optimizer/8.5.13.md +++ b/docs/catalogs/packages/ibm-mas-optimizer/8.5.13.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Optimizer v8.5.13 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-optimizer/9.0.7.md b/docs/catalogs/packages/ibm-mas-optimizer/9.0.7.md index c0a5817044..d67496ca1e 100644 --- a/docs/catalogs/packages/ibm-mas-optimizer/9.0.7.md +++ b/docs/catalogs/packages/ibm-mas-optimizer/9.0.7.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Optimizer v9.0.7 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-predict/8.8.5.md b/docs/catalogs/packages/ibm-mas-predict/8.8.5.md index 8d2d3d2550..829c4bd5ae 100644 --- a/docs/catalogs/packages/ibm-mas-predict/8.8.5.md +++ b/docs/catalogs/packages/ibm-mas-predict/8.8.5.md @@ -6,6 +6,13 @@ nav_title: Operator Catalog IBM Maximo Predict v8.8.5 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- update predictapi: 5.8.1 in images.yml (#368) +- Backport fix for recocile 4 times issue to predict 8.8.x #14863 (#380) +- fix health compatibility (#387) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-predict/8.9.7.md b/docs/catalogs/packages/ibm-mas-predict/8.9.7.md index 91e5dbbf3b..4aa86f9bdd 100644 --- a/docs/catalogs/packages/ibm-mas-predict/8.9.7.md +++ b/docs/catalogs/packages/ibm-mas-predict/8.9.7.md @@ -6,6 +6,24 @@ nav_title: Operator Catalog IBM Maximo Predict v8.9.7 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- change to status.versions to avoid workarounds in the playbooks (#320) +- update preload notebook status shortly after operator starts: 8.9 release (#325) +- disable HPA for MAS 8.11 (#326) +- fix travis yaml (#361) +- change predictapi to 5.9.0-pre.stable (#362) +- add MAT-SERVICE-URL (#366) +- fix typo of domain (#375) +- fix the MAT_URL and AIX_URL (#376) +- SRE - Add serviceability dashboard with OpenTelemetry (#381) +- move opentelemetry related from main operator to ws operator (#384) +- Predict - upgrade ansible operator base image to 7.5.13 #15179 (#390) +- update pmlib version (#392) +- update pmlib version (#392) (#393) +- upgrade PMLIB version (#396) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-predict/9.0.4.md b/docs/catalogs/packages/ibm-mas-predict/9.0.4.md index 518e9d5394..7365a9a50b 100644 --- a/docs/catalogs/packages/ibm-mas-predict/9.0.4.md +++ b/docs/catalogs/packages/ibm-mas-predict/9.0.4.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog IBM Maximo Predict v9.0.4 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-visualinspection/8.8.4.md b/docs/catalogs/packages/ibm-mas-visualinspection/8.8.4.md index 1b9b03e102..07144b0904 100644 --- a/docs/catalogs/packages/ibm-mas-visualinspection/8.8.4.md +++ b/docs/catalogs/packages/ibm-mas-visualinspection/8.8.4.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog Maximo Visual Inspection v8.8.4 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +No release notes available for this update + + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-visualinspection/8.9.9.md b/docs/catalogs/packages/ibm-mas-visualinspection/8.9.9.md index 48aae3c987..ff52f32f76 100644 --- a/docs/catalogs/packages/ibm-mas-visualinspection/8.9.9.md +++ b/docs/catalogs/packages/ibm-mas-visualinspection/8.9.9.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog Maximo Visual Inspection v8.9.9 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Fix issue where client cache failed to find API group - backport 89x (#690) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas-visualinspection/9.0.6.md b/docs/catalogs/packages/ibm-mas-visualinspection/9.0.6.md index 57381093c8..bb6aa3c315 100644 --- a/docs/catalogs/packages/ibm-mas-visualinspection/9.0.6.md +++ b/docs/catalogs/packages/ibm-mas-visualinspection/9.0.6.md @@ -6,6 +6,11 @@ nav_title: Operator Catalog Maximo Visual Inspection v9.0.6 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Fix issue where client cache failed to find API group - backport 90x (#689) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas/8.10.21.md b/docs/catalogs/packages/ibm-mas/8.10.21.md index e4ea2047ca..7b71d22805 100644 --- a/docs/catalogs/packages/ibm-mas/8.10.21.md +++ b/docs/catalogs/packages/ibm-mas/8.10.21.md @@ -6,6 +6,15 @@ nav_title: Operator Catalog IBM Maximo Application Suite v8.10.21 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Concatenate strings safely for conditional 810x (#3319) +- Update mobileapi version (#3331) +- Update coreapi version for MAS 8.10 (#3355) +- Allow modification of driverOptions in JdbcCfg instances (#3337) +- Revert - Add support to check if env is airgap (#3375) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas/8.10.22.md b/docs/catalogs/packages/ibm-mas/8.10.22.md index d1019a0d76..6de1652771 100644 --- a/docs/catalogs/packages/ibm-mas/8.10.22.md +++ b/docs/catalogs/packages/ibm-mas/8.10.22.md @@ -6,6 +6,13 @@ nav_title: Operator Catalog IBM Maximo Application Suite v8.10.22 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Fix a problem in the GET /applications API where the application is not included in the response if installPlanApproval is not set in the app subscription (#3379) +- Fix a security issue where the error_description of a failed login could be tampered with in the URL query parameter (810x) (#3389) +- update mobileapi version (#3393) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas/8.11.18.md b/docs/catalogs/packages/ibm-mas/8.11.18.md index a5e5255a49..6400d10986 100644 --- a/docs/catalogs/packages/ibm-mas/8.11.18.md +++ b/docs/catalogs/packages/ibm-mas/8.11.18.md @@ -6,6 +6,15 @@ nav_title: Operator Catalog IBM Maximo Application Suite v8.11.18 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Concatenate strings safely for conditional (#3318) +- Update mobileapi version (#3332) +- Add ibm-mas-suite 8.11.17 digest to support img (#3357) +- Allow modification of driverOptions in JdbcCfg instances (#3336) +- Revert - Add support to check if env is airgap (#3376) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas/8.11.19.md b/docs/catalogs/packages/ibm-mas/8.11.19.md index 3cccd9fcf7..b162aa2f23 100644 --- a/docs/catalogs/packages/ibm-mas/8.11.19.md +++ b/docs/catalogs/packages/ibm-mas/8.11.19.md @@ -6,6 +6,17 @@ nav_title: Operator Catalog IBM Maximo Application Suite v8.11.19 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Fix a security issue where the error_description of a failed login could be tampered with in the URL query parameter (811x) (#3388) +- update mobileapi version (#3394) +- Update Suite CRD to support hostAliases under podTemplates (#3402) +- Update ScimCfg and PushNotificationCfg CRD to support hostAliases under podTemplates (#3405) +- Update SlsCfg and SmtpCfg CRD to support hostAliases under podTemplates (#3408) +- Update BasCfg CRD to support hostAliases under podTemplates (#3409) +- add ibm-mas-suite 8.11.18 digest to support img: maint811xdev (#3411) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas/9.0.7.md b/docs/catalogs/packages/ibm-mas/9.0.7.md index 751b41d3c5..67494ccd0f 100644 --- a/docs/catalogs/packages/ibm-mas/9.0.7.md +++ b/docs/catalogs/packages/ibm-mas/9.0.7.md @@ -6,6 +6,16 @@ nav_title: Operator Catalog IBM Maximo Application Suite v9.0.7 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Update mobileapi version (#3333) +- Modify supported-images structure for multiarch changes (#3341) +- Allow modification of driverOptions in JdbcCfg instances (#3247) +- Add ibm-mas-suite 9.0.6 digest to support img (#3358) +- Update mobileapi version (#3367) +- Remove trailing spaces from supported-img to remove lint error (#3373) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | diff --git a/docs/catalogs/packages/ibm-mas/9.0.8.md b/docs/catalogs/packages/ibm-mas/9.0.8.md index bb3b9b2c71..7b40aacbf4 100644 --- a/docs/catalogs/packages/ibm-mas/9.0.8.md +++ b/docs/catalogs/packages/ibm-mas/9.0.8.md @@ -6,6 +6,19 @@ nav_title: Operator Catalog IBM Maximo Application Suite v9.0.8 ================================================================================ +Release Notes +-------------------------------------------------------------------------------- +### Bug Fixes and Security Updates +- Fix a security issue where the error_description of a failed login could be tampered with in the URL query parameter (90x) (#3387) +- update mobileapi version (#3395) +- Update Suite CRD to support hostAliases under podTemplates (#3401) +- Update ScimCfg and PushNotificationCfg CRD to support hostAliases under podTemplates (#3404) +- Update SlsCfg and SmtpCfg CRD to support hostAliases under podTemplates (#3407) +- Update BasCfg CRD to support hostAliases under podTemplates (#3410) +- Temporarily disable broken ibm-mas-cfg-idp molecule scenario (#3420) +- add 9.0.7 and 9.11.18 mas suite img digest (#3424) +- Fix the execution order of ibm-mas-cfg-idp molecule tasks (#3426) + Install Modes -------------------------------------------------------------------------------- | Mode | Supported | From bd643def7f26ea33f46cc38a5c2474d9a5f09ddd Mon Sep 17 00:00:00 2001 From: leo-miran <105313348+leo-miran@users.noreply.github.com> Date: Fri, 21 Feb 2025 12:33:46 -0300 Subject: [PATCH 4/6] [patch] Mobile FVT Pytest focus (#1479) --- tekton/src/pipelines/fvt-mobile-testng.yml.j2 | 7 +-- .../testng/phase10-apps-desktop.yml.j2 | 31 ------------ .../fvt-mobile/testng/phase2-civil.yml.j2 | 28 ----------- .../fvt-mobile/testng/phase3-mobfound.yml.j2 | 4 +- .../testng/phase4-apps-android.yml.j2 | 39 ++------------- .../testng/phase5-apps-android.yml.j2 | 44 ++--------------- .../testng/phase6-apps-android.yml.j2 | 47 ------------------- .../fvt-mobile/testng/phase6-apps-ios.yml.j2 | 13 +++++ .../fvt-mobile/testng/phase7-apps-ios.yml.j2 | 44 ++--------------- .../fvt-mobile/testng/phase8-apps-ios.yml.j2 | 47 ------------------- ...ase11-final.yml.j2 => phase8-final.yml.j2} | 2 - .../fvt-mobile/testng/phase9-apps-ios.yml.j2 | 47 ------------------- 12 files changed, 32 insertions(+), 321 deletions(-) delete mode 100644 tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase10-apps-desktop.yml.j2 delete mode 100644 tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-android.yml.j2 create mode 100644 tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-ios.yml.j2 delete mode 100644 tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-apps-ios.yml.j2 rename tekton/src/pipelines/taskdefs/fvt-mobile/testng/{phase11-final.yml.j2 => phase8-final.yml.j2} (94%) delete mode 100644 tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase9-apps-ios.yml.j2 diff --git a/tekton/src/pipelines/fvt-mobile-testng.yml.j2 b/tekton/src/pipelines/fvt-mobile-testng.yml.j2 index e8245430f9..893d693827 100644 --- a/tekton/src/pipelines/fvt-mobile-testng.yml.j2 +++ b/tekton/src/pipelines/fvt-mobile-testng.yml.j2 @@ -60,9 +60,6 @@ spec: {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2') | indent(4) }} {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2') | indent(4) }} {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase5-apps-android.yml.j2') | indent(4) }} - {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase6-apps-android.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase6-apps-ios.yml.j2') | indent(4) }} {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase7-apps-ios.yml.j2') | indent(4) }} - {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase8-apps-ios.yml.j2') | indent(4) }} - {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase9-apps-ios.yml.j2') | indent(4) }} - {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase10-apps-desktop.yml.j2') | indent(4) }} - {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase11-final.yml.j2') | indent(4) }} + {{ lookup('template', 'taskdefs/fvt-mobile/testng/phase8-final.yml.j2') | indent(4) }} diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase10-apps-desktop.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase10-apps-desktop.yml.j2 deleted file mode 100644 index 40429a9c07..0000000000 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase10-apps-desktop.yml.j2 +++ /dev/null @@ -1,31 +0,0 @@ -# inventory counting desktop tasks -- name: fvt-mob-desktop-ic - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: ic-automation-testcases - - name: mobile_device_type - value: chrome - - name: fvt_test_suite - value: inventory-counting-mvt-desktop - runAfter: - - fvt-mob-ios-supervisor - - fvt-mob-ios-calibration - - fvt-mob-ios-it - -# inspections form desktop tasks -- name: fvt-mob-desktop-inspforms - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: inspection-forms-app - - name: mobile_device_type - value: chrome - - name: fvt_test_suite - value: inspection-forms-mvt-desktop - runAfter: - - fvt-mob-ios-supervisor - - fvt-mob-ios-calibration - - fvt-mob-ios-it diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase2-civil.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase2-civil.yml.j2 index 7d56c7194e..d8e0fe35c8 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase2-civil.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase2-civil.yml.j2 @@ -7,31 +7,3 @@ value: civil-bvt runAfter: - fvt-mob-schema-pre - -## Minimum Verification Test for Mobile Defects MAS test suites -- name: fvt-mob-android-defects - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: civil-defects-app - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: civil-defects-mvt-android - runAfter: - - fvt-manage-selenium-civil - -# Minimum Verification Test for Mobile Defects MAS test suites -- name: fvt-mob-ios-defects - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: civil-defects-app - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: civil-defects-mvt-ios - runAfter: - - fvt-mob-android-defects \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2 index 699b10edec..1fb8e0369f 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase3-mobfound.yml.j2 @@ -10,7 +10,7 @@ - name: fvt_test_suite value: mobfoundation-mvt-android runAfter: - - fvt-mob-schema-pre + - fvt-manage-selenium-civil ## Minimum Verification Test for Mobile Foundation MAS test suites - name: fvt-mob-ios-mobfound @@ -24,4 +24,4 @@ - name: fvt_test_suite value: mobfoundation-mvt-ios runAfter: - - fvt-mob-schema-pre + - fvt-manage-selenium-civil diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2 index 89cb76c5e7..22a7627a66 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase4-apps-android.yml.j2 @@ -1,44 +1,15 @@ -## Minimum Verification Test for Mobile Inspection MAS test suites -- name: fvt-mob-android-inspections +## Minimum Verification Test for Mobile calibration MAS test suites +- name: fvt-mob-android-calibration {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} params: {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - name: fvt_mobile_app - value: conduct-inspection-app + value: calibration-app - name: mobile_device_type value: android - name: fvt_test_suite - value: inspections-mvt-android - runAfter: - - fvt-mob-android-mobfound - - fvt-mob-ios-mobfound - -## Minimum Verification Test for Mobile Asset Manager MAS test suites -- name: fvt-mob-android-assetmng - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: asset-manager - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: asset-manager-mvt-android - runAfter: - - fvt-mob-android-mobfound - - fvt-mob-ios-mobfound - -## Mobile FVT - Inventory Counting Android -- name: fvt-mob-android-ic - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: ic-automation-testcases - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: inventory-counting-mvt-android + value: calibration-mvt-android runAfter: - fvt-mob-android-mobfound - fvt-mob-ios-mobfound + \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase5-apps-android.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase5-apps-android.yml.j2 index 71e5c8b49e..eb43f5e3e4 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase5-apps-android.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase5-apps-android.yml.j2 @@ -1,47 +1,13 @@ -## Minimum Verification Test for Mobile Service Request MAS test suites -- name: fvt-mob-android-sr +## Minimum Verification Test for Mobile Defects MAS test suites +- name: fvt-mob-android-defects {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} params: {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - name: fvt_mobile_app - value: service-request-app + value: civil-defects-app - name: mobile_device_type value: android - name: fvt_test_suite - value: service-request-mvt-android + value: civil-defects-mvt-android runAfter: - - fvt-mob-android-inspections - - fvt-mob-android-assetmng - - fvt-mob-android-ic - -## Mobile FVT - Inventory Receiving Android -- name: fvt-mob-android-ir - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: ir-automation-testcases - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: inventory-receiving-mvt-android - runAfter: - - fvt-mob-android-inspections - - fvt-mob-android-assetmng - - fvt-mob-android-ic - -## Minimum Verification Test for Mobile Technician MAS test suites -- name: fvt-mob-android-technician - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: technician-app - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: technician-mvt-android - runAfter: - - fvt-mob-android-inspections - - fvt-mob-android-assetmng - - fvt-mob-android-ic + - fvt-mob-android-calibration \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-android.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-android.yml.j2 deleted file mode 100644 index 96027eb4e2..0000000000 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-android.yml.j2 +++ /dev/null @@ -1,47 +0,0 @@ -## Minimum Verification Test for Mobile Supervisor MAS test suites -- name: fvt-mob-android-supervisor - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: supervisor-app - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: supervisor-mvt-android - runAfter: - - fvt-mob-android-sr - - fvt-mob-android-ir - - fvt-mob-android-technician - -## Minimum Verification Test for Mobile calibration MAS test suites -- name: fvt-mob-android-calibration - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: calibration-app - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: calibration-mvt-android - runAfter: - - fvt-mob-android-sr - - fvt-mob-android-ir - - fvt-mob-android-technician - -## Mobile FVT - Issues and Transfers Android -- name: fvt-mob-android-it - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: it-automation-testcases - - name: mobile_device_type - value: android - - name: fvt_test_suite - value: issues-transfer-mvt-android - runAfter: - - fvt-mob-android-sr - - fvt-mob-android-ir - - fvt-mob-android-technician diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-ios.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-ios.yml.j2 new file mode 100644 index 0000000000..b08d555677 --- /dev/null +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase6-apps-ios.yml.j2 @@ -0,0 +1,13 @@ +## Minimum Verification Test for Mobile Technician MAS test suites +- name: fvt-mob-ios-calibration + {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} + params: + {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} + - name: fvt_mobile_app + value: calibration-app + - name: mobile_device_type + value: ios + - name: fvt_test_suite + value: calibration-mvt-ios + runAfter: + - fvt-mob-android-defects \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase7-apps-ios.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase7-apps-ios.yml.j2 index f8933e597e..b95e5944a1 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase7-apps-ios.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase7-apps-ios.yml.j2 @@ -1,47 +1,13 @@ -## Minimum Verification Test for Mobile Inspections MAS test suites -- name: fvt-mob-ios-inspections +# Minimum Verification Test for Mobile Defects MAS test suites +- name: fvt-mob-ios-defects {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} params: {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - name: fvt_mobile_app - value: conduct-inspection-app + value: civil-defects-app - name: mobile_device_type value: ios - name: fvt_test_suite - value: inspections-mvt-ios + value: civil-defects-mvt-ios runAfter: - - fvt-mob-android-supervisor - - fvt-mob-android-calibration - - fvt-mob-android-it - -## Minimum Verification Test for Mobile Asset Manager MAS test suites -- name: fvt-mob-ios-assetmng - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: asset-manager - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: asset-manager-mvt-ios - runAfter: - - fvt-mob-android-supervisor - - fvt-mob-android-calibration - - fvt-mob-android-it - -# Mobile FVT - Inventory Counting IOS -- name: fvt-mob-ios-ic - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: ic-automation-testcases - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: inventory-counting-mvt-ios # xml for Mobile IC - runAfter: - - fvt-mob-android-supervisor - - fvt-mob-android-calibration - - fvt-mob-android-it + - fvt-mob-ios-calibration \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-apps-ios.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-apps-ios.yml.j2 deleted file mode 100644 index f2830d7c98..0000000000 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-apps-ios.yml.j2 +++ /dev/null @@ -1,47 +0,0 @@ -## Minimum Verification Test for Mobile Service Request MAS test suites -- name: fvt-mob-ios-sr - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: service-request-app - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: service-request-mvt-ios - runAfter: - - fvt-mob-ios-inspections - - fvt-mob-ios-assetmng - - fvt-mob-ios-ic - -# Mobile FVT - Inventory Receiving IOS -- name: fvt-mob-ios-ir - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: ir-automation-testcases - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: inventory-receiving-mvt-ios - runAfter: - - fvt-mob-ios-inspections - - fvt-mob-ios-assetmng - - fvt-mob-ios-ic - -## Minimum Verification Test for Mobile Technician MAS test suites -- name: fvt-mob-ios-technician - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: technician-app - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: technician-mvt-ios - runAfter: - - fvt-mob-ios-inspections - - fvt-mob-ios-assetmng - - fvt-mob-ios-ic diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase11-final.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-final.yml.j2 similarity index 94% rename from tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase11-final.yml.j2 rename to tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-final.yml.j2 index 91f394a008..6c413a96df 100644 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase11-final.yml.j2 +++ b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase8-final.yml.j2 @@ -34,6 +34,4 @@ operator: notin values: [""] runAfter: - - fvt-mob-desktop-ic - - fvt-mob-desktop-inspforms - fvt-mob-ios-defects \ No newline at end of file diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase9-apps-ios.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase9-apps-ios.yml.j2 deleted file mode 100644 index 560c741980..0000000000 --- a/tekton/src/pipelines/taskdefs/fvt-mobile/testng/phase9-apps-ios.yml.j2 +++ /dev/null @@ -1,47 +0,0 @@ -## Minimum Verification Test for Mobile Supervisor MAS test suites -- name: fvt-mob-ios-supervisor - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: supervisor-app - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: supervisor-mvt-ios - runAfter: - - fvt-mob-ios-sr - - fvt-mob-ios-ir - - fvt-mob-ios-technician - -## Minimum Verification Test for Mobile Technician MAS test suites -- name: fvt-mob-ios-calibration - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: calibration-app - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: calibration-mvt-ios - runAfter: - - fvt-mob-ios-sr - - fvt-mob-ios-ir - - fvt-mob-ios-technician - -# Mobile FVT - Issues and Transfers IOS -- name: fvt-mob-ios-it - {{ lookup('template', 'taskdefs/fvt-mobile/common/taskref-testng.yml.j2') | indent(2) }} - params: - {{ lookup('template', 'taskdefs/fvt-mobile/common/params-testng.yml.j2') | indent(4) }} - - name: fvt_mobile_app - value: it-automation-testcases - - name: mobile_device_type - value: ios - - name: fvt_test_suite - value: issues-transfer-mvt-ios - runAfter: - - fvt-mob-ios-sr - - fvt-mob-ios-ir - - fvt-mob-ios-technician From d9aa8065ba68f2ad71fdf1c8f2f6cd9e47ad7263 Mon Sep 17 00:00:00 2001 From: Joe Harte Date: Tue, 25 Feb 2025 08:53:13 +0000 Subject: [PATCH 5/6] [minor] migrate to Jinjanator (#1469) --- .secrets.baseline | 4 +-- docs/examples/minimal-rbac.md | 4 ++- image/cli/mascli/functions/gitops_bootstrap | 6 ++--- .../mascli/functions/gitops_cis_compliance | 2 +- image/cli/mascli/functions/gitops_cluster | 26 +++++++++---------- image/cli/mascli/functions/gitops_cp4d | 2 +- .../cli/mascli/functions/gitops_cp4d_service | 4 +-- image/cli/mascli/functions/gitops_db2u | 2 +- .../cli/mascli/functions/gitops_db2u_database | 4 +-- image/cli/mascli/functions/gitops_dro | 2 +- image/cli/mascli/functions/gitops_mas_config | 4 +-- image/cli/mascli/functions/gitops_nvidia_gpu | 2 +- image/cli/mascli/functions/gitops_suite | 6 ++--- .../mascli/functions/gitops_suite_app_config | 6 ++--- .../mascli/functions/gitops_suite_app_install | 4 +-- .../mascli/functions/gitops_suite_workspace | 4 +-- image/cli/mascli/functions/internal/utils | 14 ++++++++++ image/cli/mascli/templates/filters/yaml.py | 6 +++++ .../cluster/group-sync-operator.yaml.j2 | 18 +------------ .../appset-configs/cluster/ibm-rbac.yaml.j2 | 11 +------- 20 files changed, 64 insertions(+), 67 deletions(-) create mode 100644 image/cli/mascli/templates/filters/yaml.py diff --git a/.secrets.baseline b/.secrets.baseline index eb81451757..739c4c9df9 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2025-02-12T12:31:53Z", + "generated_at": "2025-02-19T10:22:06Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -424,7 +424,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 22, + "line_number": 7, "type": "Secret Keyword", "verified_result": null } diff --git a/docs/examples/minimal-rbac.md b/docs/examples/minimal-rbac.md index 66075dffec..d5c50278e4 100644 --- a/docs/examples/minimal-rbac.md +++ b/docs/examples/minimal-rbac.md @@ -40,7 +40,9 @@ MAS_INSTANCE_ID=dev1 export SERVER=https://myocp.net # Install the minimal RBAC for the MAS install (as OpenShift administrator) oc login --token xxx --server=$SERVER -kustomize build rbac/install | jinja -D mas_instance_id $MAS_INSTANCE_ID | oc apply -f - +export mas_instance_id=$MAS_INSTANCE_ID +kustomize build rbac/install > rbac-install.yaml +jinjanate rbac-install.yaml | oc apply -f - # Get the access token for the user export INSTALL_TOKEN=$(oc -n mas-${MAS_INSTANCE_ID}-pipelines get secret mas-${MAS_INSTANCE_ID}-install-token -o jsonpath="{.data.token}" | base64 -d) diff --git a/image/cli/mascli/functions/gitops_bootstrap b/image/cli/mascli/functions/gitops_bootstrap index 6f1d0cca00..9131c68bf9 100644 --- a/image/cli/mascli/functions/gitops_bootstrap +++ b/image/cli/mascli/functions/gitops_bootstrap @@ -179,7 +179,7 @@ function gitops_bootstrap() { # 2. Create Secret Manager secret echo 'Create Secret Manager Backend Secret' - jinja -X .+ ${CLI_DIR}/templates/gitops/bootstrap/secret-${AVP_TYPE}.yaml.j2 | oc apply -f - + jinjanate_commmon ${CLI_DIR}/templates/gitops/bootstrap/secret-${AVP_TYPE}.yaml.j2 | oc apply -f - # 3. Create repo server SA echo 'Create ArgoCD repo server service account' @@ -204,11 +204,11 @@ function gitops_bootstrap() { oc wait --for=jsonpath='{.status.applicationController}'=Running argocd/openshift-gitops -n openshift-gitops --timeout=30m # 6. Add the GitHub PAT secret (used to authenticate to your environment repository, which is assumed to be private) - jinja -X .+ ${CLI_DIR}/templates/gitops/bootstrap/secret-github.yaml.j2 | oc apply -f - + jinjanate_commmon ${CLI_DIR}/templates/gitops/bootstrap/secret-github.yaml.j2 | oc apply -f - # 7. Add the root project and application oc apply -f ${CLI_DIR}/templates/gitops/bootstrap/mas-appproject.yaml - jinja -X .+ ${CLI_DIR}/templates/gitops/bootstrap/root-application.yaml.j2 | oc apply -f - + jinjanate_commmon ${CLI_DIR}/templates/gitops/bootstrap/root-application.yaml.j2 | oc apply -f - # 8. Patch openshift-marketplace and kube-system to allow GitOps to manage resources in the namespace echo 'Patch standard namespaces to enable GitOps management' diff --git a/image/cli/mascli/functions/gitops_cis_compliance b/image/cli/mascli/functions/gitops_cis_compliance index 4a6ad59a7a..66835bc990 100644 --- a/image/cli/mascli/functions/gitops_cis_compliance +++ b/image/cli/mascli/functions/gitops_cis_compliance @@ -202,7 +202,7 @@ function gitops_cis_compliance() { echo echo_h2 "Generating Argo Applications" echo "- IBM Cis Compliance" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/cis-compliance.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/cis-compliance.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/cis-compliance.yaml.j2 ${GITOPS_CLUSTER_DIR}/cis-compliance.yaml # Commit and push to github target repo # --------------------------------------------------------------------------- diff --git a/image/cli/mascli/functions/gitops_cluster b/image/cli/mascli/functions/gitops_cluster index 0e8e3151d2..ce9dedea2f 100644 --- a/image/cli/mascli/functions/gitops_cluster +++ b/image/cli/mascli/functions/gitops_cluster @@ -587,7 +587,7 @@ function gitops_cluster() { export ICR_AUTH_TOKEN=$(echo -n $ICR_USERNAME:$ICR_PASSWORD | base64 -w 0) echo "- Generate image pull secret" - jinja -X .+ $CLI_DIR/templates/gitops/ibm-entitlement-with-artifactory.json.j2 -o ${GITOPS_CLUSTER_DIR}/ibm-entitlement-with-artifactory.json + jinjanate_commmon $CLI_DIR/templates/gitops/ibm-entitlement-with-artifactory.json.j2 ${GITOPS_CLUSTER_DIR}/ibm-entitlement-with-artifactory.json IBM_ENTITLEMENT_WITH_ARTIFACTORY=${GITOPS_CLUSTER_DIR}/ibm-entitlement-with-artifactory.json IBM_ENTITLEMENT_WITH_ARTIFACTORY=$(cat $IBM_ENTITLEMENT_WITH_ARTIFACTORY) @@ -620,63 +620,63 @@ function gitops_cluster() { echo_h2 "Generating Argo Applications" echo "- Base Config" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/ibm-mas-cluster-base.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 ${GITOPS_CLUSTER_DIR}/ibm-mas-cluster-base.yaml echo "- IBM Operator Catalog" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/ibm-operator-catalog.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/ibm-operator-catalog.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/ibm-operator-catalog.yaml.j2 ${GITOPS_CLUSTER_DIR}/ibm-operator-catalog.yaml echo "- Redhat Cert Manager" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/redhat-cert-manager.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/redhat-cert-manager.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/redhat-cert-manager.yaml.j2 ${GITOPS_CLUSTER_DIR}/redhat-cert-manager.yaml if [[ "$INSTALL_SELENIUM_GRID" == "true" ]]; then echo "- Selenium Grid" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/selenium-grid.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/selenium-grid.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/selenium-grid.yaml.j2 ${GITOPS_CLUSTER_DIR}/selenium-grid.yaml fi if [[ "$CLUSTER_PROMOTION" == "true" ]]; then ESCAPED_CLUSTER_VALUES=${CLUSTER_PROMOTION_CLUSTER_VALUES//\"/\\\"} export ESCAPED_CLUSTER_VALUES=${ESCAPED_CLUSTER_VALUES//$'\n'/\\n} echo "- Cluster Promotion" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/cluster-promotion.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/cluster-promotion.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/cluster-promotion.yaml.j2 ${GITOPS_CLUSTER_DIR}/cluster-promotion.yaml fi if [[ -n "$CUSTOM_SA_NAMESPACE" ]]; then echo "- Custom Cluster Service Accounts" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/custom-sa.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/custom-sa.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/custom-sa.yaml.j2 ${GITOPS_CLUSTER_DIR}/custom-sa.yaml fi if [[ -n "$DNS_PROVIDER" ]]; then echo "- IBM CIS Cert Manager" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/ibm-cis-cert-manager.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/ibm-cis-cert-manager.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/phase1/ibm-cis-cert-manager.yaml.j2 ${GITOPS_CLUSTER_DIR}/ibm-cis-cert-manager.yaml fi if [[ "$INSTALL_GROUP_SYNC_OPERATOR" == "true" ]]; then echo "- Group Sync Operator" sm_verify_secret_exists $SECRET_NAME_ISV_CLIENT "client_secret,client_id" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/group-sync-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/group-sync-operator.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/group-sync-operator.yaml.j2 ${GITOPS_CLUSTER_DIR}/group-sync-operator.yaml fi if [[ "$INSTALL_IBM_RBAC" == "true" ]]; then echo "- IBM RBAC" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/ibm-rbac.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/ibm-rbac.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/ibm-rbac.yaml.j2 ${GITOPS_CLUSTER_DIR}/ibm-rbac.yaml fi if [[ "$INSTALL_FALCON_OPERATOR" == "true" ]]; then echo "- CrowdStrike Falcon Operator" sm_verify_secret_exists $SECRET_NAME_FALCON_CLIENT "client_secret,client_id" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/falcon-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/falcon-operator.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/falcon-operator.yaml.j2 ${GITOPS_CLUSTER_DIR}/falcon-operator.yaml fi if [[ -n "$CLUSTER_LOGGING_OPERATOR_INSTALL" ]]; then echo "- Cluster Logging Operator" sm_verify_secret_exists $SECRET_NAME_CLOUDWATCH "aws_access_key_id,aws_secret_access_key" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/cluster-logging-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/cluster-logging-operator.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/cluster-logging-operator.yaml.j2 ${GITOPS_CLUSTER_DIR}/cluster-logging-operator.yaml fi if [[ -n "$INSTANA_AGENT_OPERATOR_INSTALL" ]]; then echo "- Instana Agent Operator" sm_verify_secret_exists $SECRET_NAME_INSTANA "key" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/instana-agent-operator.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2 ${GITOPS_CLUSTER_DIR}/instana-agent-operator.yaml fi # Commit and push to github target repo diff --git a/image/cli/mascli/functions/gitops_cp4d b/image/cli/mascli/functions/gitops_cp4d index f4f2ce9969..c0160a0b48 100644 --- a/image/cli/mascli/functions/gitops_cp4d +++ b/image/cli/mascli/functions/gitops_cp4d @@ -312,7 +312,7 @@ function gitops_cp4d() { echo "- CP4D operator" echo "Generating IBM CP4D file ${GITOPS_INSTANCE_DIR}/ibm-cp4d.yaml" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-cp4d.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-cp4d.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-cp4d.yaml.j2 ${GITOPS_INSTANCE_DIR}/ibm-cp4d.yaml # Commit and push to github target repo diff --git a/image/cli/mascli/functions/gitops_cp4d_service b/image/cli/mascli/functions/gitops_cp4d_service index 88d71b4fce..592af8abbe 100644 --- a/image/cli/mascli/functions/gitops_cp4d_service +++ b/image/cli/mascli/functions/gitops_cp4d_service @@ -372,14 +372,14 @@ function gitops_cp4d_service() { if [[ "$CPD_SERVICE_NAME" == "wsl" || "$CPD_SERVICE_NAME" == "wml" || "$CPD_SERVICE_NAME" == "spss" ]]; then echo "Generating IBM CPD Service file ${GITOPS_INSTANCE_DIR}/ibm-cp4d-services-base.yaml" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-cp4d-services-base.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-cp4d-services-base.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-cp4d-services-base.yaml.j2 ${GITOPS_INSTANCE_DIR}/ibm-cp4d-services-base.yaml fi echo echo "- ${CPD_SERVICE_NAME} operator" echo "Generating IBM CPD Service file ${GITOPS_INSTANCE_DIR}/ibm-${CPD_SERVICE_NAME}.yaml" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-${CPD_SERVICE_NAME}.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-${CPD_SERVICE_NAME}.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-${CPD_SERVICE_NAME}.yaml.j2 ${GITOPS_INSTANCE_DIR}/ibm-${CPD_SERVICE_NAME}.yaml # Commit and push to github target repo # --------------------------------------------------------------------------- diff --git a/image/cli/mascli/functions/gitops_db2u b/image/cli/mascli/functions/gitops_db2u index 3823f82573..b52775d278 100644 --- a/image/cli/mascli/functions/gitops_db2u +++ b/image/cli/mascli/functions/gitops_db2u @@ -262,7 +262,7 @@ function gitops_db2u() { export IBM_ENTITLEMENT_KEY=$SECRET_KEY_IBM_ENTITLEMENT echo "Generating DB2U file ${GITOPS_INSTANCE_DIR}/ibm-db2u.yaml" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-db2u.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-db2u.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-db2u.yaml.j2 ${GITOPS_INSTANCE_DIR}/ibm-db2u.yaml # Commit and push to github target repo # --------------------------------------------------------------------------- diff --git a/image/cli/mascli/functions/gitops_db2u_database b/image/cli/mascli/functions/gitops_db2u_database index 94820b736c..1d0c7bfd2d 100644 --- a/image/cli/mascli/functions/gitops_db2u_database +++ b/image/cli/mascli/functions/gitops_db2u_database @@ -730,7 +730,7 @@ DB2_WORKLOAD: '${DB2_WORKLOAD}'" # If the file doesn't exist, create a blank one if ! [ -f ${CONFIGS_FILE} ]; then - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/db2-databases/ibm-db2u-database-common.yaml.j2 > $CONFIGS_FILE + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/db2-databases/ibm-db2u-database-common.yaml.j2 $CONFIGS_FILE fi # Remove any existing config with this name @@ -740,7 +740,7 @@ DB2_WORKLOAD: '${DB2_WORKLOAD}'" echo -n "" > ${TEMP_DIR}/newconfig.yaml # Render the appropriate template for the config into a new file. For standby database, it will be generated only if it is a replica task and replica is enabled. if [[ (${IS_REPLICA_TASK} == 'false') || (${IS_REPLICA_TASK} == 'true' && ${REPLICA_DB} == 'true') ]]; then - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/db2-databases/ibm-db2u-database.yaml.j2 | yq '{"ibm_db2u_databases": [] + .}' > ${TEMP_DIR}/newconfig.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/db2-databases/ibm-db2u-database.yaml.j2 | yq '{"ibm_db2u_databases": [] + .}' > ${TEMP_DIR}/newconfig.yaml fi # Merge the two files diff --git a/image/cli/mascli/functions/gitops_dro b/image/cli/mascli/functions/gitops_dro index d0a6e3d497..5c36ab667a 100644 --- a/image/cli/mascli/functions/gitops_dro +++ b/image/cli/mascli/functions/gitops_dro @@ -292,7 +292,7 @@ function gitops_dro() { export IBM_ENTITLEMENT_KEY=$SECRET_KEY_IBM_ENTITLEMENT echo "Generating dro file ${GITOPS_CLUSTER_DIR}/ibm-dro.yaml" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/ibm-dro.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/ibm-dro.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/ibm-dro.yaml.j2 ${GITOPS_CLUSTER_DIR}/ibm-dro.yaml # Commit and push to github target repo # --------------------------------------------------------------------------- diff --git a/image/cli/mascli/functions/gitops_mas_config b/image/cli/mascli/functions/gitops_mas_config index 0bda9a950e..01cb58e6e9 100644 --- a/image/cli/mascli/functions/gitops_mas_config +++ b/image/cli/mascli/functions/gitops_mas_config @@ -839,14 +839,14 @@ function gitops_mas_config() { # If the file doesn't exist, create a blank one if ! [ -f ${CONFIGS_FILE} ]; then - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-config-common.yaml.j2 > $CONFIGS_FILE + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-config-common.yaml.j2 $CONFIGS_FILE fi # Remove any existing config with this name yq 'del(.ibm_mas_suite_configs[] | select(.mas_config_name == "'${MAS_CONFIG_NAME}'"))' $CONFIGS_FILE > $TEMP_DIR/configs.yaml # Render the appropriate template for the config into a new file - jinja -X .+ -d $ADDITIONAL_JINJA_PARAMS_FILE $CLI_DIR/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-${MAS_CONFIG_TYPE}-config.yaml.j2 | yq '{"ibm_mas_suite_configs": [] + .}' > ${TEMP_DIR}/newconfig.yaml + jinjanate --quiet --undefined --import-env='' $CLI_DIR/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-${MAS_CONFIG_TYPE}-config.yaml.j2 $ADDITIONAL_JINJA_PARAMS_FILE | yq '{"ibm_mas_suite_configs": [] + .}' > ${TEMP_DIR}/newconfig.yaml # Merge the two files yq eval-all '. as $item ireduce ({}; . *+ $item)' $TEMP_DIR/configs.yaml ${TEMP_DIR}/newconfig.yaml > $CONFIGS_FILE diff --git a/image/cli/mascli/functions/gitops_nvidia_gpu b/image/cli/mascli/functions/gitops_nvidia_gpu index 98e99e100b..7d9c2b1fa9 100644 --- a/image/cli/mascli/functions/gitops_nvidia_gpu +++ b/image/cli/mascli/functions/gitops_nvidia_gpu @@ -285,7 +285,7 @@ function gitops_nvidia_gpu() { echo "- Nvidia GPU Operator" echo "Generating Nvidia GPU operator file ${GITOPS_CLUSTER_DIR}/nvidia-gpu-operator.yaml" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/nvidia-gpu-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/nvidia-gpu-operator.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/nvidia-gpu-operator.yaml.j2 ${GITOPS_CLUSTER_DIR}/nvidia-gpu-operator.yaml # Commit and push to github target repo # --------------------------------------------------------------------------- diff --git a/image/cli/mascli/functions/gitops_suite b/image/cli/mascli/functions/gitops_suite index 2f13c14bf2..1f8bb3d229 100644 --- a/image/cli/mascli/functions/gitops_suite +++ b/image/cli/mascli/functions/gitops_suite @@ -692,13 +692,13 @@ function gitops_suite() { echo_h2 "Generating Argo Project and Applications" echo "- Base Config" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-mas-instance-base.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 ${GITOPS_INSTANCE_DIR}/ibm-mas-instance-base.yaml echo "- IBM Suite License Service" - jinja -X .+ -d $MONGO_CONFIG_FILE $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-sls.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-sls.yaml + jinjanate --quiet --undefined --import-env='' $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-sls.yaml.j2 $MONGO_CONFIG_FILE -o ${GITOPS_INSTANCE_DIR}/ibm-sls.yaml echo "- IBM Maximo Application Suite Core Platform" - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 -o ${GITOPS_INSTANCE_DIR}/ibm-mas-suite.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-suite.yaml.j2 ${GITOPS_INSTANCE_DIR}/ibm-mas-suite.yaml # Commit and push to github target repo diff --git a/image/cli/mascli/functions/gitops_suite_app_config b/image/cli/mascli/functions/gitops_suite_app_config index 2523257a70..add5dd5943 100644 --- a/image/cli/mascli/functions/gitops_suite_app_config +++ b/image/cli/mascli/functions/gitops_suite_app_config @@ -512,7 +512,7 @@ function gitops_suite_app_config() { else echo echo_h2 "Using default application spec for $MAS_APP_ID" - jinja -X .+ $CLI_DIR/templates/gitops/app-ws-spec-defaults/${MAS_APP_ID}.yaml.j2 -o ${TEMP_DIR}/${MAS_APP_ID}-appws-spec.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/app-ws-spec-defaults/${MAS_APP_ID}.yaml.j2 ${TEMP_DIR}/${MAS_APP_ID}-appws-spec.yaml export MAS_APPWS_SPEC=$(cat ${TEMP_DIR}/${MAS_APP_ID}-appws-spec.yaml | yq '.' --output-format yaml) fi echo @@ -562,7 +562,7 @@ function gitops_suite_app_config() { # If the file doesn't exist, create a blank one if ! [ -f ${CONFIGS_FILE} ]; then - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-config-common.yaml.j2 > $CONFIGS_FILE + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-config-common.yaml.j2 $CONFIGS_FILE fi @@ -570,7 +570,7 @@ function gitops_suite_app_config() { yq 'del(.ibm_mas_masapp_configs[] | select(.mas_app_id == "'${MAS_APP_ID}'" and .mas_workspace_id == "'${MAS_WORKSPACE_ID}'"))' $CONFIGS_FILE > $TEMP_DIR/configs.yaml # Render the appropriate template for the config into a new file - jinja -X .+ -d $ADDITIONAL_JINJA_PARAMS_FILE $CLI_DIR/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-config.yaml.j2 | yq '{"ibm_mas_masapp_configs": [] + .}' > ${TEMP_DIR}/newconfig.yaml + jinjanate --quiet --undefined --import-env='' $CLI_DIR/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-config.yaml.j2 $ADDITIONAL_JINJA_PARAMS_FILE | yq '{"ibm_mas_masapp_configs": [] + .}' > ${TEMP_DIR}/newconfig.yaml # Merge the two files yq eval-all '. as $item ireduce ({}; . *+ $item)' $TEMP_DIR/configs.yaml ${TEMP_DIR}/newconfig.yaml > $CONFIGS_FILE diff --git a/image/cli/mascli/functions/gitops_suite_app_install b/image/cli/mascli/functions/gitops_suite_app_install index 1d9011d253..adb0f1d002 100644 --- a/image/cli/mascli/functions/gitops_suite_app_install +++ b/image/cli/mascli/functions/gitops_suite_app_install @@ -363,7 +363,7 @@ function gitops_suite_app_install() { else echo echo_h2 "Using default application spec for $MAS_APP_ID" - jinja -X .+ $CLI_DIR/templates/gitops/app-spec-defaults/${MAS_APP_ID}.yaml.j2 -o ${TEMP_DIR}/${MAS_APP_ID}-app-spec.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/app-spec-defaults/${MAS_APP_ID}.yaml.j2 ${TEMP_DIR}/${MAS_APP_ID}-app-spec.yaml export MAS_APP_SPEC=$(cat ${TEMP_DIR}/${MAS_APP_ID}-app-spec.yaml | yq '.' --output-format yaml) fi echo_reset_dim "MAS_APP_SPEC ............................ ${COLOR_MAGENTA}${MAS_APP_SPEC}" @@ -428,7 +428,7 @@ function gitops_suite_app_install() { echo "- IBM MAS Application Install" CONFIG_FILE=${GITOPS_INSTANCE_DIR}/ibm-mas-masapp-${MAS_APP_ID}-install.yaml - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-install.yaml.j2 -o ${CONFIG_FILE} + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/masapp/ibm-mas-masapp-install.yaml.j2 ${CONFIG_FILE} echo_h2 "Generated configuration file (${CONFIG_FILE})" diff --git a/image/cli/mascli/functions/gitops_suite_workspace b/image/cli/mascli/functions/gitops_suite_workspace index a5cb1a542e..c908d5bd15 100644 --- a/image/cli/mascli/functions/gitops_suite_workspace +++ b/image/cli/mascli/functions/gitops_suite_workspace @@ -236,14 +236,14 @@ function gitops_suite_workspace() { # If the file doesn't exist, create a blank one if ! [ -f ${CONFIGS_FILE} ]; then - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-workspaces-common.yaml.j2 > $CONFIGS_FILE + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-workspaces-common.yaml.j2 $CONFIGS_FILE fi # Remove any existing config with this name yq 'del(.ibm_mas_workspaces[] | select(.mas_workspace_id == "'${MAS_WORKSPACE_ID}'"))' $CONFIGS_FILE > $TEMP_DIR/configs.yaml # Render the appropriate template for the config into a new file - jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-workspace.yaml.j2 | yq '{"ibm_mas_workspaces": [] + .}' > ${TEMP_DIR}/newconfig.yaml + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/instance/ibm-mas-workspace.yaml.j2 | yq '{"ibm_mas_workspaces": [] + .}' > ${TEMP_DIR}/newconfig.yaml # Merge the two files yq eval-all '. as $item ireduce ({}; . *+ $item)' $TEMP_DIR/configs.yaml ${TEMP_DIR}/newconfig.yaml > $CONFIGS_FILE diff --git a/image/cli/mascli/functions/internal/utils b/image/cli/mascli/functions/internal/utils index aeb4a5533f..b01a2536de 100644 --- a/image/cli/mascli/functions/internal/utils +++ b/image/cli/mascli/functions/internal/utils @@ -347,3 +347,17 @@ function ocp_version_check() { exit 1 fi } + +# Calls jinjanate with common arguments. Call jinjanate directly if this does not suit your use case. +function jinjanate_commmon() { + local template_path=$1 + local output_path=$2 + local filter_files=$(ls $CLI_DIR/templates/filters/*.py) + for file in $filter_files; do + local filter_params="${filter_params} --filters ${file}" + done + if [ -n "$output_path" ]; then + local output_opts="-o ${output_path}" + fi + jinjanate --quiet --undefined $filter_params $template_path $output_opts +} diff --git a/image/cli/mascli/templates/filters/yaml.py b/image/cli/mascli/templates/filters/yaml.py new file mode 100644 index 0000000000..2aa564cbbe --- /dev/null +++ b/image/cli/mascli/templates/filters/yaml.py @@ -0,0 +1,6 @@ +import yaml + + +# Convert a string representation of YAML to actual YAML +def toYaml(value: str) -> dict: + return yaml.safe_load(value) diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/group-sync-operator.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/group-sync-operator.yaml.j2 index e28d599c2d..8975cb134a 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/group-sync-operator.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/group-sync-operator.yaml.j2 @@ -1,24 +1,8 @@ merge-key: "{{ ACCOUNT_ID }}/{{ CLUSTER_ID }}" -{#- Parses the ISV groups from a string representation of a list of maps #} -{#- Example: "- name: 'admin'\n id: 645001Z1WP\n- name: 'developer'\n id: 645001Z1WR\n" #} -{%- set group_namespace = namespace(isv_groups = []) %} -{%- set group_strs = GROUP_SYNC_OPERATOR_ISV_GROUPS.split('-') %} -{%- set _ = group_strs.remove('') %} -{%- for group_str in group_strs %} - {%- set group_loop = loop %} - {%- set _ = group_namespace.isv_groups.append(dict()) %} - {%- set pairs = group_str.strip('\n').split('\n') %} - {%- for pair in pairs %} - {%- set items = pair.split(':') %} - {%- set _ = group_namespace.isv_groups[group_loop.index - 1].__setitem__(items[0].strip().strip("'"), items[1].strip().strip("'")) %} - {%- endfor %} -{%- endfor %} - group_sync_operator: cron_schedule: "{{ GROUP_SYNC_OPERATOR_CRON_SCHEDULE }}" isv_tenant_url: "{{ GROUP_SYNC_OPERATOR_ISV_TENANT_URL }}" isv_client_id: "" isv_client_secret: "" - isv_groups: - {{ group_namespace.isv_groups }} + isv_groups: {{ GROUP_SYNC_OPERATOR_ISV_GROUPS | toYaml }} diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/ibm-rbac.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/ibm-rbac.yaml.j2 index 22b861f0d3..f69256e562 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/ibm-rbac.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/ibm-rbac.yaml.j2 @@ -1,13 +1,4 @@ merge-key: "{{ ACCOUNT_ID }}/{{ CLUSTER_ID }}" -{#- Parses the IBM RBAC binding-to-group mapping from a string representation to a map #} -{#- Example: "a: b\nc: d\n" #} -{%- set rbac_namespace = namespace(binding_mappings = dict()) %} -{%- set item_strs = IBM_RBAC_BINDING_TO_GROUP.split('\n') %} -{%- for item_str in item_strs %} - {%- set pair = item_str.strip('\n').split(':') %} - {%- set _ = rbac_namespace.binding_mappings.__setitem__(pair[0].strip().strip("'"), pair[1].strip().strip("'")) %} -{%- endfor %} - ibm_rbac: - binding_to_group: {{ rbac_namespace.binding_mappings }} + binding_to_group: {{ IBM_RBAC_BINDING_TO_GROUP | toYaml }} From 967a0494b2b9496ec65b86cbb2def25909c562c8 Mon Sep 17 00:00:00 2001 From: Anil Prajapati <169060963+anilprajapatiibm@users.noreply.github.com> Date: Tue, 25 Feb 2025 17:44:28 +0530 Subject: [PATCH 6/6] [doc] add new tab-panel 2025 (#1481) --- docs/catalogs/index.md | 52 ++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/docs/catalogs/index.md b/docs/catalogs/index.md index 06975091bd..812f60879f 100644 --- a/docs/catalogs/index.md +++ b/docs/catalogs/index.md @@ -19,13 +19,47 @@ The MAS CLI maintains a rolling window of approximately four months worth of sup ### Catalog Directory - + + 2025 Catalogs 2024 Catalogs 2023 Catalogs 2022 Catalogs
+ +