diff --git a/catalogs/v8-231128-amd64.yaml b/catalogs/v8-231128-amd64.yaml new file mode 100644 index 0000000000..804e55f6b2 --- /dev/null +++ b/catalogs/v8-231128-amd64.yaml @@ -0,0 +1,12 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-operator-catalog + namespace: openshift-marketplace +spec: + displayName: IBM Maximo Operators (v8-231128-amd64) + publisher: IBM + description: Static Catalog Source for IBM Maximo Application Suite + sourceType: grpc + image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:01b1cdf421f0228930af9cc057cc7b157840312220dc5b8d59f1d13ee9a9887d + priority: 90 diff --git a/docs/catalogs/index.md b/docs/catalogs/index.md index 4825f8d7c6..b67448bc96 100644 --- a/docs/catalogs/index.md +++ b/docs/catalogs/index.md @@ -46,6 +46,7 @@ To receive security updates and bug fixes you must periodically update the versi #### 2023 | Catalog | OCP Support | Recommended CLI | End of Support | | ------------------------------------- | ----------- | --------------- | ------------------------------- | +| [v8-231128-amd64](v8-231128-amd64.md) | 4.11 - 4.12 | latest | OCP 4.12 EOS January 17, 2025 | | [v8-231031-amd64](v8-231031-amd64.md) | 4.11 - 4.12 | latest | OCP 4.12 EOS January 17, 2025 | | [v8-231004-amd64](v8-231004-amd64.md) | 4.11 - 4.12 | latest | OCP 4.12 EOS January 17, 2025 | | [v8-230926-amd64](v8-230926-amd64.md) | 4.11 - 4.12 | latest | OCP 4.12 EOS January 17, 2025 | diff --git a/docs/catalogs/v8-231004-amd64.md b/docs/catalogs/v8-231004-amd64.md index 9afd1ea33e..8d7ed4ac42 100644 --- a/docs/catalogs/v8-231004-amd64.md +++ b/docs/catalogs/v8-231004-amd64.md @@ -427,5 +427,5 @@ Package Manifest ### Eclipse Amlen | Package | Default Channel | Channel | Latest Version | |------------------------|-------------------|-----------|------------------| -| eclipse-amlen-operator | 1.x | 1.x | 1.0.0 | +| eclipse-amlen-operator | 1.x | 1.x | 1.0.1 | diff --git a/docs/catalogs/v8-231031-amd64.md b/docs/catalogs/v8-231031-amd64.md index 9272c2d9d5..690142ff19 100644 --- a/docs/catalogs/v8-231031-amd64.md +++ b/docs/catalogs/v8-231031-amd64.md @@ -426,5 +426,5 @@ Package Manifest ### Eclipse Amlen | Package | Default Channel | Channel | Latest Version | |------------------------|-------------------|-----------|------------------| -| eclipse-amlen-operator | 1.x | 1.x | 1.0.0 | +| eclipse-amlen-operator | 1.x | 1.x | 1.0.1 | diff --git a/docs/catalogs/v8-231128-amd64.md b/docs/catalogs/v8-231128-amd64.md new file mode 100644 index 0000000000..937209a034 --- /dev/null +++ b/docs/catalogs/v8-231128-amd64.md @@ -0,0 +1,414 @@ +IBM Maximo Operator Catalog v8 (231128) +=============================================================================== + +Details +------------------------------------------------------------------------------- + + + + + +
Imageicr.io/cpopen/ibm-maximo-operator-catalog
Tagv8-231128-amd64
Digestsha256:01b1cdf421f0228930af9cc057cc7b157840312220dc5b8d59f1d13ee9a9887d
+ +Manual Installation +------------------------------------------------------------------------------- +`oc apply -f https://raw.githubusercontent.com/ibm-mas/cli/master/catalogs/v8-231128-amd64.yaml` + + +Source +------------------------------------------------------------------------------- +```yaml +apiVersion: operators.coreos.com/v1alpha1 +kind: CatalogSource +metadata: + name: ibm-operator-catalog + namespace: openshift-marketplace +spec: + displayName: IBM Maximo Operators (v8-231128-amd64) + publisher: IBM + description: Static Catalog Source for IBM Maximo Application Suite + sourceType: grpc + image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:01b1cdf421f0228930af9cc057cc7b157840312220dc5b8d59f1d13ee9a9887d + priority: 90 +``` + +## TODO: UPDATE BELOW CONTENT +Red Hat OpenShift Container Platform Support +------------------------------------------------------------------------------- +IBM Maximo Application Suite will run anywhere that you can run a supported OpenShift release on AMD64 architecture, including: + +- [AWS](https://aws.amazon.com/rosa/) +- [Azure](https://azure.microsoft.com/en-gb/services/openshift/) +- [Google Cloud Platform](https://cloud.google.com/architecture/partners/openshift-on-gcp) +- [IBM Cloud](https://www.ibm.com/cloud/openshift) + +For more information about the OCP lifecycle refer to the [Red Hat OpenShift Container Platform Life Cycle Policy](https://access.redhat.com/support/policy/updates/openshift/). + + + + + + + + + + + + + + + + + + + + +
OCPGeneral AvailabilityEnd of SupportSupported MAS Releases
4.111August 10, 2022February 10, 20248.9 - 8.11
4.12January 17, 2023January 17, 20258.9 - 8.11
+ + +### Certified Operators +- `registry.redhat.io/redhat/certified-operator-index:v4.11` +- `registry.redhat.io/redhat/certified-operator-index:v4.12` + +The following packages from this catalog are used in the Maximo Application Suite install: + +- **crunchy-postgres-operator** required by `ibm.mas_devops.uds` role +- **gpu-operator-certified** required by `ibm.mas_devops.nvidia_gpu` role +- **kubeturbo-certified** required by `ibm.mas_devops.kubeturbo` role + + +### Community Operators +- `registry.redhat.io/redhat/community-operator-index:v4.11` +- `registry.redhat.io/redhat/community-operator-index:v4.12` + +The following packages from this catalog are used in the Maximo Application Suite install: + +- **grafana-operator** required by `ibm.mas_devops.cluster_monitoring` role +- **opentelemetry-operator** required by `ibm.mas_devops.cluster_monitoring` role +- **strimzi-kafka-operator** required by `ibm.mas_devops.kafka` role (if using Strimzi as Kakfa provider) + + +### Red Hat Operators +- `registry.redhat.io/redhat/redhat-operator-index:v4.11` +- `registry.redhat.io/redhat/redhat-operator-index:v4.12` + +The following packages from this catalog are used in the Maximo Application Suite install: + +- **amq-streams** required by `ibm.mas_devops.kafka` role (if using AMQ Streams as Kakfa provider) +- **openshift-pipelines-operator-rh** required by the MAS CLI +- **nfd** required by `ibm.mas_devops.nvidia_gpu` role +- **aws-efs-csi-driver-operator** required by `ibm.mas_devops.ocp_efs` role +- **local-storage-operator** required by `ibm.mas_devops.ocs` role +- **odf-operator** required by `ibm.mas_devops.ocs` role + + +IBM Cloud Pak for Data Compatibility +------------------------------------------------------------------------------- +Maximo application compatibility with Cloud Pak for Data (CP4D) is complicated by limited OpenShift Container Platform support in CP4D (only even numbered OCP releases are supported) and minor updates to CP4D services not always being backwards compatible. For more information on Cloud Pak for Data's support policy review this [IBM Cloud Pak for Data Software Support Lifecycle Addendum](https://www.ibm.com/support/pages/node/6593147). + +Cloud Pak for Data covers the following application's dependencies: + +- **Assist**: Watson Discovery, Watson Text to Speak, Watson Speach to Text, Watson Assistant +- **Predict**: Watson Studio, Watson Machine Learning, Watson Analytics Service, Watson Openscale + + + + + + + + + + + + + + + +
OCPCloud Pak for DataSupported MAS Releases
ReleaseGeneral AvailabilityEnd of Support
4.11 - 4.124.6.6 February, 2023 TBD 8.9 - 8.11
+ + +Package Manifest +------------------------------------------------------------------------------- + + +### IBM Maximo Application Suite +| Package | Default Channel | Channel | Latest Version | +|--------------------------|-------------------|-----------|------------------| +| ibm-mas | 8.11.x | 8.10.x | 8.10.7 | +| | | 8.11.x | 8.11.3 | +| | | 8.9.x | 8.9.10 | +| ibm-mas-assist | 8.8.x | 8.8.x | 8.8.1 | +| | | 8.7.x | 8.7.2 | +| | 8.6.x | 8.6.5 | +| ibm-mas-hputilities | 8.6.x | 8.4.x | 8.4.1 | +| | | 8.5.x | 8.5.3 | +| | | 8.6.x | 8.6.2 | +| ibm-mas-iot | 8.8.x | 8.8.x | 8.8.3 | +| | | 8.6.x | 8.6.9 | +| | | 8.7.x | 8.7.6 | +| ibm-mas-manage | 8.7.x | 8.7.x | 8.7.2 | +| | | 8.5.x | 8.5.9 | +| | | 8.6.x | 8.6.7 | +| ibm-mas-monitor | 8.11.x | 8.10.x | 8.10.5 | +| | | 8.11.x | 8.11.1 | +| | | 8.9.x | 8.9.6 | +| ibm-mas-optimizer | 8.5.x | 8.5.x | 8.5.1 | +| | | 8.3.x | 8.3.3 | +| | | 8.4.x | 8.4.2 | +| ibm-mas-predict | 8.9.x | 8.9.x | 8.9.0 | +| | | 8.7.x | 8.7.2 | +| | | 8.8.x | 8.8.2 | +| ibm-mas-visualinspection | 8.9.x | 8.9.x | 8.9.0 | +| | | 8.7.x | 8.7.1 | +| | | 8.8.x | 8.8.1 | + + +### IBM Utilities +| Package | Default Channel | Channel | Latest Version | +|---------------------|-------------------|-----------|------------------| +| ibm-data-dictionary | 1.1.x | 1.1.x | 1.1.5 | +| ibm-sls | 3.x | 3.x | 3.8.1 | +| ibm-truststore-mgr | 1.x | 1.x | 1.5.1 | + + +### IBM Cloud Pak Foundational Services +| Package | Default Channel | Channel | Latest Version | +|-------------------------------------|-------------------|--------------|------------------| +| cloud-native-postgresql | stable-v1.18 | fast | 1.9.2 | +| | | stable | 1.9.2 | +| | | stable-v1.15 | 1.9.2 | +| | | stable-v1.17 | 1.9.2 | +| | | stable-v1.18 | 1.9.2 | +| db2u-operator | v110508.0 | v1.0 | 1.0.9 | +| | | v1.1 | 1.1.9 | +| | | v110508.0 | 110508.0.2 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| ibm-cert-manager-operator | v3.23 | beta | 3.9.0 | +| | | v3 | 3.9.0 | +| | | v3.20 | 3.22.0 | +| | | v3.21 | 3.23.0 | +| | | v3.22 | 3.24.0 | +| | | v3.23 | 3.25.0 | +| ibm-common-service-operator | v3.23 | beta | 103.103.103 | +| | | v3 | 3.9.0 | +| | | v3.20 | 3.20.1 | +| | | v3.21 | 3.21.0 | +| | | v3.22 | 3.22.0 | +| | | v3.23 | 3.23.0 | +| ibm-commonui-operator-app | v3.23 | beta | 1.5.1 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.18.1 | +| | | v3.21 | 1.19.0 | +| | | v3.22 | 1.20.0 | +| | | v3.23 | 1.21.0 | +| ibm-events-operator | v3 | beta | 3.7.1 | +| | | v3 | 4.4.0 | +| ibm-ingress-nginx-operator-app | v3.23 | beta | 1.5.0 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.17.1 | +| | | v3.21 | 1.18.0 | +| | | v3.22 | 1.19.0 | +| | | v3.23 | 1.20.0 | +| ibm-licensing-operator-app | v3.23 | beta | 1.4.1 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.17.0 | +| | | v3.21 | 1.18.0 | +| | | v3.22 | 1.19.0 | +| | | v3.23 | 1.20.0 | +| ibm-management-ingress-operator-app | v3.23 | beta | 1.5.1 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.17.0 | +| | | v3.21 | 1.18.0 | +| | | v3.22 | 1.19.0 | +| | | v3.23 | 1.20.0 | +| ibm-mongodb-operator-app | v3.23 | beta | 1.3.1 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.15.0 | +| | | v3.21 | 1.16.0 | +| | | v3.22 | 1.17.0 | +| | | v3.23 | 1.18.0 | +| ibm-namespace-scope-operator | v3.23 | beta | 1.1.1 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.14.0 | +| | | v3.21 | 1.15.0 | +| | | v3.22 | 1.16.0 | +| | | v3.23 | 1.17.0 | +| ibm-odlm | v3.23 | beta | 1.5.0 | +| | | v3 | 1.9.0 | +| | | v3.20 | 1.18.0 | +| | | v3.21 | 1.19.0 | +| | | v3.22 | 1.20.0 | +| | | v3.23 | 1.21.0 | +| ibm-platform-api-operator-app | v3.23 | beta | 3.9.1 | +| | | v3 | 3.9.1 | +| | | v3.20 | 3.22.0 | +| | | v3.21 | 3.23.0 | +| | | v3.22 | 3.24.0 | +| | | v3.23 | 3.25.0 | +| ibm-user-data-services-operator | alpha | alpha | 2.0.12 | +| ibm-zen-operator | v3.23 | beta | 1.0.1 | +| | | v3 | 1.6.8 | +| | | v3.20 | 1.7.1 | +| | | v3.21 | 1.7.2 | +| | | v3.22 | 1.8.0 | +| | | v3.23 | 1.8.1 | + + +### IBM Cloud Pak for Data +| Package | Default Channel | Channel | Latest Version | +|-------------------------------|-------------------|-----------|------------------| +| analyticsengine-operator | v3.3 | beta | 1.0.1 | +| | | stable-v1 | 1.0.9 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v2.3 | 2.3.0 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| | | v3.3 | 3.3.0 | +| cpd-platform-operator | v3.6 | beta | 2.0.0 | +| | | stable-v1 | 2.0.0 | +| | | v2.0 | 2.0.8 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| | | v3.2 | 3.2.0 | +| | | v3.3 | 3.3.0 | +| | | v3.4 | 3.4.0 | +| | | v3.5 | 3.5.0 | +| | | v3.6 | 3.6.0 | +| ibm-ca-operator | v23.3 | v22.0 | 22.0.0 | +| | | v22.1 | 22.1.0 | +| | | v22.2 | 22.2.0 | +| | | v22.3 | 22.3.0 | +| | | v23.0 | 23.0.0 | +| | | v23.1 | 23.1.0 | +| | | v23.3 | 23.3.0 | +| | | v4.0 | 4.0.8 | +| ibm-cpd-ccs | v6.3 | v1.0 | 1.0.9 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v2.3 | 2.3.0 | +| | | v6.0 | 6.0.0 | +| | | v6.1 | 6.1.0 | +| | | v6.3 | 6.3.0 | +| ibm-cpd-datarefinery | v6.3 | v1.0 | 1.0.9 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v2.3 | 2.3.0 | +| | | v6.0 | 6.0.0 | +| | | v6.1 | 6.1.0 | +| | | v6.3 | 6.3.0 | +| ibm-cpd-spss | v6.3 | v1.0 | 1.0.9 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v2.3 | 2.3.0 | +| | | v6.0 | 6.0.0 | +| | | v6.1 | 6.1.0 | +| | | v6.3 | 6.3.0 | +| ibm-cpd-wml-operator | v3.3 | alpha | 1.1.0 | +| | | beta | 1.0.1486 | +| | | v1.1 | 1.1.8 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v2.3 | 2.3.0 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| | | v3.3 | 3.3.0 | +| ibm-cpd-wos | v3.3 | alpha | 1.2.0 | +| | | v1 | 1.5.0 | +| | | v1.5 | 1.5.4 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v2.2 | 2.2.0 | +| | | v2.3 | 2.3.0 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| | | v3.3 | 3.3.0 | +| ibm-cpd-ws-runtimes | v6.3 | v1.0 | 1.0.9 | +| | | v5.0 | 5.0.0 | +| | | v5.1 | 5.1.0 | +| | | v5.2 | 5.2.0 | +| | | v5.3 | 5.3.0 | +| | | v6.0 | 6.0.0 | +| | | v6.1 | 6.1.0 | +| | | v6.3 | 6.3.0 | +| ibm-cpd-wsl | v6.3 | v2.0 | 2.0.9 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| | | v3.2 | 3.2.0 | +| | | v3.3 | 3.3.0 | +| | | v6.0 | 6.0.0 | +| | | v6.1 | 6.1.0 | +| | | v6.3 | 6.3.0 | +| ibm-elasticsearch-operator | v1.1 | v1.1 | 1.1.1336 | +| ibm-etcd-operator | v1.0 | v1.0 | 1.0.8 | +| ibm-iam-operator | v3.23 | beta | 3.9.1 | +| | | v3 | 3.9.1 | +| | | v3.20 | 3.20.1 | +| | | v3.21 | 3.21.0 | +| | | v3.22 | 3.22.0 | +| | | v3.23 | 3.23.0 | +| ibm-minio-operator | v1.0 | v1.0 | 1.0.9 | +| ibm-model-train-operator | v1.1 | v1.1 | 1.1.7 | +| ibm-rabbitmq-operator | v1.0 | v1.0 | 1.0.9 | +| ibm-watson-discovery-operator | v5.3 | v4.0 | 4.0.9 | +| | | v4.5 | 4.5.0 | +| | | v4.6 | 4.6.0 | +| | | v4.7 | 4.7.0 | +| | | v5.0 | 5.0.0 | +| | | v5.2 | 5.2.0 | +| | | v5.3 | 5.3.0 | +| ibm-watson-gateway-operator | v1.0 | v1.0 | 1.0.9 | + + +### IBM AppConnect +| Package | Default Channel | Channel | Latest Version | +|------------------|-------------------|-----------|------------------| +| couchdb-operator | v2.2 | beta | 1.4.2 | +| | | stable | 2.2.1 | +| | | v1.0 | 1.0.14 | +| | | v1.1 | 1.1.0 | +| | | v1.2 | 1.2.1 | +| | | v1.3 | 1.3.1 | +| | | v1.4 | 1.4.4 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.0.1 | +| | | v2.2 | 2.2.1 | +| ibm-appconnect | v7.1 | cd | 5.2.0 | +| | | v1.0 | 1.0.5 | +| | | v1.1-eus | 1.1.9 | +| | | v1.2 | 1.2.0 | +| | | v1.3 | 1.3.2 | +| | | v1.4 | 1.4.0 | +| | | v1.5 | 1.5.2 | +| | | v2.0 | 2.0.0 | +| | | v2.1 | 2.1.0 | +| | | v3.0 | 3.0.0 | +| | | v3.1 | 3.1.0 | +| | | v4.0 | 4.0.0 | +| | | v4.1 | 4.1.0 | +| | | v4.2 | 4.2.0 | +| | | v5.0-lts | 5.0.4 | +| | | v5.1 | 5.1.0 | +| | | v5.2 | 5.2.0 | +| | | v6.0 | 6.0.0 | +| | | v6.1 | 6.1.1 | +| | | v6.2 | 6.2.0 | +| | | v7.0 | 7.0.0 | +| | | v7.1 | 7.1.0 | + + +### Eclipse Amlen +| Package | Default Channel | Channel | Latest Version | +|------------------------|-------------------|-----------|------------------| +| eclipse-amlen-operator | 1.x | 1.x | 1.0.1 | + diff --git a/image/cli/install-ansible/ibm-mas_devops.tar.gz b/image/cli/install-ansible/ibm-mas_devops.tar.gz deleted file mode 100644 index 3e3390ef21..0000000000 Binary files a/image/cli/install-ansible/ibm-mas_devops.tar.gz and /dev/null differ diff --git a/image/cli/mascli/functions/internal/catalog_utils b/image/cli/mascli/functions/internal/catalog_utils index b56ea1edb0..d10d4bd2dc 100644 --- a/image/cli/mascli/functions/internal/catalog_utils +++ b/image/cli/mascli/functions/internal/catalog_utils @@ -7,7 +7,7 @@ # a static catalog. We only support converting from v8-amd64 to the latest static catalog # because any other change would be a downgrade and would result in the HEAD bundle in # our packages regressing, which would confuse OLM. -MOST_RECENT_CATALOG=v8-231031-amd64 +MOST_RECENT_CATALOG=v8-231128-amd64 # Choose a catalog only # ----------------------------------------------------------------------------- @@ -15,9 +15,10 @@ MOST_RECENT_CATALOG=v8-231031-amd64 # the version of MAS, only the version of the catalog to update to. function choose_catalog_version() { echo -e "${COLOR_YELLOW}Select MAS Catalog:" - echo " 1) October 31 2023 Update (MAS 8.11.2 & 8.10.6)" - echo " 2) October 04 2023 Update (MAS 8.11.1 & 8.10.5)" - echo " 3) August 29 2023 Update (MAS 8.10.4 & 8.9.9)" + echo " 1) November 28 2023 Update (MAS 8.11.3 & 8.10.7)" + echo " 2) October 31 2023 Update (MAS 8.11.2 & 8.10.6)" + echo " 3) October 04 2023 Update (MAS 8.11.1 & 8.10.5)" + echo " 4) August 29 2023 Update (MAS 8.10.4 & 8.9.9)" reset_colors echo @@ -25,12 +26,15 @@ function choose_catalog_version() { case $MAS_CATALOG_SELECTION in 1) - MAS_CATALOG_VERSION=v8-231031-amd64 + MAS_CATALOG_VERSION=v8-231128-amd64 ;; 2) - MAS_CATALOG_VERSION=v8-231004-amd64 + MAS_CATALOG_VERSION=v8-231031-amd64 ;; 3) + MAS_CATALOG_VERSION=v8-231004-amd64 + ;; + 4) MAS_CATALOG_VERSION=v8-230829-amd64 ;; *) @@ -40,6 +44,7 @@ function choose_catalog_version() { esac } +#TODO: UPDATE BELOW # Choose a catalog and the MAS channel # ----------------------------------------------------------------------------- @@ -50,14 +55,17 @@ function choose_mas_version() { echo " ┌───┬──────────────┬────────┬──────────────────────────────────────────────────────────────────────┐" echo " │ # │ Catalog │ Core │ Assist | IoT | Manage | Monitor | Optimizer | Predict | Inspection |" echo " ├───┼──────────────┼────────┼────────┤───────┼────────┼─────────┼───────────┼─────────┼────────────┤" - echo " │ 1 │ Oct 31 2023 | 8.11.2 │ 8.8.1 | 8.8.1 | 8.7.1 | 8.11.1 | 8.5.0 | 8.9.0 | 8.9.0 |" - echo " │ 2 │ │ 8.10.6 │ 8.7.2 | 8.7.5 | 8.6.6 | 8.10.4 | 8.4.1 | 8.8.2 | 8.8.1 |" + echo " │ 1 │ Nov 28 2023 | 8.11.3 │ 8.8.1 | 8.8.2 | 8.7.2 | 8.11.2 | 8.5.1 | 8.9.0 | 8.9.0 |" + echo " │ 2 │ │ 8.10.7 │ 8.7.2 | 8.7.6 | 8.6.7 | 8.10.6 | 8.4.2 | 8.8.2 | 8.8.1 |" echo " ├───┼──────────────┼────────┼────────┤───────┼────────┼─────────┼───────────┼─────────┼────────────┤" - echo " │ 3 │ Oct 04 2023 | 8.11.1 │ 8.8.0 | 8.8.0 | 8.7.0 | 8.11.0 | 8.5.0 | 8.9.0 | 8.9.0 |" - echo " │ 4 │ │ 8.10.5 │ 8.7.2 | 8.7.4 | 8.6.5 | 8.10.4 | 8.4.1 | 8.8.2 | 8.8.1 |" + echo " │ 3 │ Oct 31 2023 | 8.11.2 │ 8.8.1 | 8.8.1 | 8.7.1 | 8.11.1 | 8.5.0 | 8.9.0 | 8.9.0 |" + echo " │ 4 │ │ 8.10.6 │ 8.7.2 | 8.7.5 | 8.6.6 | 8.10.4 | 8.4.1 | 8.8.2 | 8.8.1 |" echo " ├───┼──────────────┼────────┼────────┤───────┼────────┼─────────┼───────────┼─────────┼────────────┤" - echo " │ 5 │ Aug 29 2023 | 8.10.4 │ 8.7.2 | 8.7.4 | 8.6.4 | 8.10.4 | 8.4.1 | 8.8.2 | 8.8.1 |" - echo " │ 6 │ │ 8.9.9 │ 8.6.5 | 8.6.9 | 8.5.8 | 8.9.6 | 8.3.3 | 8.7.2 | 8.7.1 |" + echo " │ 5 │ Oct 04 2023 | 8.11.1 │ 8.8.0 | 8.8.0 | 8.7.0 | 8.11.0 | 8.5.0 | 8.9.0 | 8.9.0 |" + echo " │ 6 │ │ 8.10.5 │ 8.7.2 | 8.7.4 | 8.6.5 | 8.10.4 | 8.4.1 | 8.8.2 | 8.8.1 |" + echo " ├───┼──────────────┼────────┼────────┤───────┼────────┼─────────┼───────────┼─────────┼────────────┤" + echo " │ 7 │ Aug 29 2023 | 8.10.4 │ 8.7.2 | 8.7.4 | 8.6.4 | 8.10.4 | 8.4.1 | 8.8.2 | 8.8.1 |" + echo " │ 8 │ │ 8.9.9 │ 8.6.5 | 8.6.9 | 8.5.8 | 8.9.6 | 8.3.3 | 8.7.2 | 8.7.1 |" echo " ├───┼──────────────┼────────┼────────┤───────┼────────┼─────────┼───────────┼─────────┼────────────┤" reset_colors echo @@ -66,29 +74,38 @@ function choose_mas_version() { prompt_for_input "Select Catalog Source" MAS_CHANNEL_SELECTION "1" case $MAS_CHANNEL_SELECTION in - # October 2023 + # November 2023 1) MAS_CHANNEL=8.11.x - MAS_CATALOG_VERSION=v8-231031-amd64 + MAS_CATALOG_VERSION=v8-231128-amd64 ;; 2) MAS_CHANNEL=8.10.x - MAS_CATALOG_VERSION=v8-231031-amd64 + MAS_CATALOG_VERSION=v8-231128-amd64 ;; + # October 2023 3) MAS_CHANNEL=8.11.x - MAS_CATALOG_VERSION=v8-231004-amd64 + MAS_CATALOG_VERSION=v8-231031-amd64 ;; 4) + MAS_CHANNEL=8.10.x + MAS_CATALOG_VERSION=v8-231031-amd64 + ;; + 5) + MAS_CHANNEL=8.11.x + MAS_CATALOG_VERSION=v8-231004-amd64 + ;; + 6) MAS_CHANNEL=8.10.x MAS_CATALOG_VERSION=v8-231004-amd64 ;; # August 2023 - 5) + 7) MAS_CHANNEL=8.10.x MAS_CATALOG_VERSION=v8-230829-amd64 ;; - 6) + 8) MAS_CHANNEL=8.9.x MAS_CATALOG_VERSION=v8-230829-amd64 ;; @@ -125,7 +142,7 @@ function db2_channel_selection() { case $MAS_CATALOG_VERSION in # Db2 Channel selection # ------------------------------------------------------------------------- - v8-amd64|v8-230414-amd64|v8-230518-amd64|v8-230526-amd64|v8-230616-amd64|v8-230627-amd64|v8-230721-amd64|v8-230725-amd64|v8-230829-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64) + v8-amd64|v8-230414-amd64|v8-230518-amd64|v8-230526-amd64|v8-230616-amd64|v8-230627-amd64|v8-230721-amd64|v8-230725-amd64|v8-230829-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64) DB2_CHANNEL=v110508.0 ;; v8-230111-amd64|v8-230217-amd64|v8-230314-amd64|v8-230328-amd64) @@ -145,7 +162,7 @@ function db2_channel_selection() { function cp4d_channel_selection() { case $MAS_CATALOG_VERSION in # CP4D v4.6.6 was added in the September 2023 catalog update - v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64) + v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64) CP4D_VERSION=4.6.6 ;; # CP4D v4.6.4 was added in the June 2023 catalog update @@ -180,7 +197,7 @@ function cp4d_channel_selection() { function sls_prompt_selection() { case $MAS_CATALOG_VERSION in # SLS 3.8.x and up - v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64) + v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64) SLS_PROMPT_LICENSE_ID="false" SLS_PROMPT_ICR_CP="false" ;; diff --git a/image/cli/mascli/functions/update b/image/cli/mascli/functions/update index 270d87d1e9..10ccdbc3e8 100644 --- a/image/cli/mascli/functions/update +++ b/image/cli/mascli/functions/update @@ -13,10 +13,11 @@ Maximo Operator Catalog Selection (Required): -c, --catalog ${COLOR_YELLOW}MAS_CATALOG_VERSION${TEXT_RESET} Maximo Operator Catalog Version (e.g. v8-221129) Update Dependencies (Optional): - --db2u-namespace ${COLOR_YELLOW}DB2_NAMESPACE${TEXT_RESET} DB2 namespace where instances update will be performed - --mongodb-namespace ${COLOR_YELLOW}MONGODB_NAMESPACE${TEXT_RESET} Namespace where MongoCE operator and instance will be updated - --kafka-namespace ${COLOR_YELLOW}KAFKA_NAMESPACE${TEXT_RESET} Namespace where Kafka operator and instance will be updated - --kafka-provider ${COLOR_YELLOW}KAFKA_PROVIDER${TEXT_RESET} Set Kafka provider. Supported options are 'redhat' (Red Hat AMQ Streams), or 'strimzi' + --db2u-namespace ${COLOR_YELLOW}DB2_NAMESPACE${TEXT_RESET} DB2 namespace where instances update will be performed + --mongodb-namespace ${COLOR_YELLOW}MONGODB_NAMESPACE${TEXT_RESET} Namespace where MongoCE operator and instance will be updated + --mongodb-v5-upgrade ${COLOR_YELLOW}MONGODB_V5_UPGRADE${TEXT_RESET} Confirms that Mongo can be upgraded to version 5 if needed as part of the update + --kafka-namespace ${COLOR_YELLOW}KAFKA_NAMESPACE${TEXT_RESET} Namespace where Kafka operator and instance will be updated + --kafka-provider ${COLOR_YELLOW}KAFKA_PROVIDER${TEXT_RESET} Set Kafka provider. Supported options are 'redhat' (Red Hat AMQ Streams), or 'strimzi' Other Commands: --no-confirm Launch the update without prompting for confirmation @@ -112,6 +113,9 @@ function update_noninteractive() { --mongodb-namespace) MONGODB_NAMESPACE=$1 && shift ;; + --mongodb-v5-update) + MONGODB_V5_UPGRADE=true + ;; --kafka-namespace) KAFKA_NAMESPACE=$1 && shift ;; @@ -164,6 +168,7 @@ function update_interactive() { oc get Operator db2u-operator.ibm-common-services > /dev/null 2>&1 if [ "$?" == "0" ]; then prompt_for_input "Db2u Universal Operator detected. Db2u namespace to update?" DB2_NAMESPACE "db2u" + echo fi # Auto-detect MongoDb @@ -172,6 +177,23 @@ function update_interactive() { MONGODB_NAMESPACE=`oc get mongodbcommunity.mongodbcommunity.mongodb.com -A -o jsonpath='{.items[0].metadata.namespace}' 2> /dev/null` fi + # Lookup existing MongoDb instance + MONGODB_CURRENT_VERSION=`oc get mongodbcommunity.mongodbcommunity.mongodb.com -A -o jsonpath='{.items[0].status.version}' 2> /dev/null` + MONGODB_REQUIRED_VERSION="5.0.21" # required version for Nov 2023 catalog + + # If existing MongoDb instance version is lower than the minimum version required, then let users know that Mongo will be upgraded + if [ ! "$(printf '%s\n' "$MONGODB_REQUIRED_VERSION" "$MONGODB_CURRENT_VERSION" | sort -V | head -n1)" = "$MONGODB_REQUIRED_VERSION" ]; then + echo -e "${COLOR_YELLOW}MongoDB Community Edition is currently running on version ${MONGODB_CURRENT_VERSION} and will be upgraded to version ${MONGODB_REQUIRED_VERSION}.${COLOR_RESET}" + echo -e "${COLOR_YELLOW}It is recommended that you backup your MongoDB instance before proceeding:${COLOR_RESET}" + echo -e "${COLOR_YELLOW}https://www.ibm.com/docs/en/mas-cd/continuous-delivery?topic=suite-backing-up-mongodb-maximo-application ${COLOR_RESET}" + echo + MONGODB_V5_UPGRADE=true + fi + + MONGODB_CURRENT_VERSION=$(oc get mongodbcommunity.mongodbcommunity.mongodb.com -A -o jsonpath='{.items[0].status.version}' 2> /dev/null) + + + # Detect Kafka in cluster and set namespace # Auto-detect Kafka # --------------------------------------------------------------------------- if [ -z "$KAFKA_NAMESPACE" ]; then @@ -191,6 +213,7 @@ function update_interactive() { fi fi + } @@ -208,6 +231,7 @@ function update() { export MAS_CATALOG_VERSION export DB2_NAMESPACE export MONGODB_NAMESPACE + export MONGODB_V5_UPGRADE export KAFKA_NAMESPACE export KAFKA_PROVIDER diff --git a/mkdocs.yml b/mkdocs.yml index 4dfbe80fa8..44248c1114 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -36,6 +36,7 @@ nav: - "must-gather": commands/must-gather.md - "Catalogs": - "All Catalogs": catalogs/index.md + - "Nov 28 2023": catalogs/v8-231128-amd64.md - "Oct 31 2023": catalogs/v8-231031-amd64.md - "Oct 04 2023": catalogs/v8-231004-amd64.md - "Aug 29 2023": catalogs/v8-230829-amd64.md