Skip to content

Commit

Permalink
[minor] Support February 2024 Catalog Update (#805)
Browse files Browse the repository at this point in the history
Co-authored-by: Paul Stone <STONEPD@uk.ibm.com>
Co-authored-by: Andre Ricardo De Campos Marcelino <andrercm@br.ibm.com>
Co-authored-by: Sanjay Prabhakar <sanjay.prabhakar@uk.ibm.com>
Co-authored-by: Daniel Istrate <16302386+istrate@users.noreply.github.com>
Co-authored-by: Daniel Istrate <Daniel.Istrate1@ibm.com>
Co-authored-by: Terence Quinn <quinnt@us.ibm.com>
  • Loading branch information
7 people committed Feb 24, 2024
1 parent 19a209f commit 55fc294
Show file tree
Hide file tree
Showing 6 changed files with 188 additions and 57 deletions.
12 changes: 12 additions & 0 deletions catalogs/v8-240227-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-240227-amd64)
publisher: IBM
description: Static Catalog Source for IBM Maximo Application Suite
sourceType: grpc
image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:8a2f2226b4aa47d42ccb564083d2a6e365fc4b116fb9a82ea83e269383a1efa1
priority: 90
139 changes: 139 additions & 0 deletions docs/catalogs/v8-240227-amd64.md
@@ -0,0 +1,139 @@
IBM Maximo Operator Catalog v8 (240227)
===============================================================================

Details
-------------------------------------------------------------------------------

<table>
<tr><td>Image</td><td>icr.io/cpopen/ibm-maximo-operator-catalog</tr></tr>
<tr><td>Tag</td><td>v8-240227-amd64</tr></tr>
<tr><td>Digest</td><td>sha256:8a2f2226b4aa47d42ccb564083d2a6e365fc4b116fb9a82ea83e269383a1efa1</tr></tr>
</table>


What's New
-------------------------------------------------------------------------------
- **Removal of Maximo Application Suite v8.9 Channels** Maximo Application Suite v8.9 support ended with the release of v8.11, customers must upgrade to MAS 8.10 before applying this catalog update.
- **Migration from IBM User Data Services Operator (UDS) to IBM Data Reporter Operator (DRO)** TODO: Lokesh to write a high-level summary.
- **Upgrade from Grafana v4 Operator to v5** Grafana Operator v4 is no longer receiving bug fixes and security updates. As a default v5 will be installed, starting with the [February 2024](v8-240227-amd64.md) Maximo Operator Catalog. Running `mas update` will automatically install Grafana Operator v5, uninstall v4 and update all MAS grafana dashboards to be compatible with v5.
- **Security updates and bug fixes**
- IBM Maximo Application Suite Core Platform v8.10 and v8.11
- Security updates in base image and python modules
- [DT260164](https://www.ibm.com/mysupport/aCI3p000000LIZn) - MAS LDAP Groups with Time_out status not been synced
- [DT259636](https://www.ibm.com/mysupport/aCI3p0000000HwA) - Forgot password should be able to work with username != userID
- [DT247391](https://www.ibm.com/mysupport/aCI3p0000004Lhy) - Increase public Lets Encrypt key length to 4096
- [DT260685](https://www.ibm.com/mysupport/aCI3p0000008e2y) - The API v2/bulk/users/manageuseridmigrate fails with status 413


Manual Installation
-------------------------------------------------------------------------------
`oc apply -f https://raw.githubusercontent.com/ibm-mas/cli/master/catalogs/v8-240227-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-240227-amd64)
publisher: IBM
description: Static Catalog Source for IBM Maximo Application Suite
sourceType: grpc
image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:8a2f2226b4aa47d42ccb564083d2a6e365fc4b116fb9a82ea83e269383a1efa1
priority: 90
```

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/).

<table class="compatabilityMatrix">
<tr>
<th>OCP</th><td rowspan="3" class="spacer"></td>
<th>General Availability</th>
<th>End of Support</th>
<th>Supported MAS Releases</th>
</tr>
<tr>
<td class="firstColumn">4.12</td>
<td>January 17, 2023</td>
<td>January 17, 2025</td>
<td>8.10 - 8.11</td>
</tr>
</table>


### Certified Operators
- `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.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.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
-------------------------------------------------------------------------------
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

<table class="compatabilityMatrix">
<tr>
<th class="firstColumn" rowspan="2">OCP</th>
<td rowspan="8" class="spacer"></td>
<th colspan="3">Cloud Pak for Data</th>
<td rowspan="9" class="spacer"></td>
<th rowspan="2">Supported MAS Releases</th>
</tr>
<tr>
<th class="firstColumn">Release</th>
<th>General Availability</th>
<th>End of Support</th>
</tr>
<tr> <td class="firstColumn" rowspan="1">4.12</td><td>4.6.6</td> <td>February, 2023</td> <td>TBD</td> <td>8.9 - 8.11</td> </tr>
</table>


Package Manifest
-------------------------------------------------------------------------------

TBD
70 changes: 35 additions & 35 deletions image/cli/mascli/functions/internal/catalog_utils
Expand Up @@ -7,35 +7,35 @@
# 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-240130-amd64
MOST_RECENT_CATALOG=v8-240227-amd64

# Choose a catalog only
# -----------------------------------------------------------------------------
# Currently only used in the mas update function. The user does not need to select
# 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) January 30 2024 Update (MAS 8.11.6 & 8.10.9)"
echo " 2) December 28 2023 Update (MAS 8.11.5 & 8.10.8)"
echo " 3) November 28 2023 Update (MAS 8.11.3 & 8.10.7)"
echo " 4) October 31 2023 Update (MAS 8.11.2 & 8.10.6)"
echo " 1) February 27 2024 Update (MAS 8.11.7 & 8.10.10)"
echo " 2) January 30 2024 Update (MAS 8.11.6 & 8.10.9)"
echo " 3) December 28 2023 Update (MAS 8.11.5 & 8.10.8)"
echo " 4) November 28 2023 Update (MAS 8.11.3 & 8.10.7)"
reset_colors

echo
prompt_for_input "Select Catalog Version" MAS_CATALOG_SELECTION "1"

case $MAS_CATALOG_SELECTION in
1)
MAS_CATALOG_VERSION=v8-240130-amd64
MAS_CATALOG_VERSION=v8-240227-amd64
;;
2)
MAS_CATALOG_VERSION=v8-231228-amd64
MAS_CATALOG_VERSION=v8-240130-amd64
;;
3)
MAS_CATALOG_VERSION=v8-231128-amd64
MAS_CATALOG_VERSION=v8-231228-amd64
;;
4)
MAS_CATALOG_VERSION=v8-231031-amd64
MAS_CATALOG_VERSION=v8-231128-amd64
;;
*)
echo_warning "Invalid selection"
Expand All @@ -57,60 +57,60 @@ function choose_mas_version() {
footer=" └───┴──────────────┴────────┴────────┴───────┴────────┴─────────┴───────────┴─────────┴────────────┘"
echo ""
echo -e "$header"
echo -e " $b # $b Catalog $b Core $b Assist $b IoT $b Manage $b Monitor $b Optimizer $b Predict $b Inspection $b"
echo -e " $b # $b Catalog $b Core $b Assist $b IoT $b Manage $b Monitor $b Optimizer $b Predict $b Inspection $b"
echo -e "$divider"
echo -e " $b 1 $b Feb 27 2024 $b 8.11.7 $b 8.8.2 $b 8.8.5 $b 8.7.5 $b 8.11.4 $b 8.5.2 $b 8.9.2 $b 8.9.1 $b"
echo -e " $b 2 $b $b 8.10.10 $b 8.7.3 $b 8.7.9 $b 8.6.10 $b 8.10.7 $b 8.4.3 $b 8.8.2 $b 8.8.2 $b"
echo -e "$divider"
echo -e " $b 1 $b Jan 30 2024 $b 8.11.6 $b 8.8.1 $b 8.8.4 $b 8.7.4 $b 8.11.2 $b 8.5.1 $b 8.9.0 $b 8.9.0 $b"
echo -e " $b 2 $b $b 8.10.9 $b 8.7.2 $b 8.7.8 $b 8.6.9 $b 8.10.6 $b 8.4.2 $b 8.8.2 $b 8.8.1 $b"
echo -e " $b 3 $b Jan 30 2024 $b 8.11.6 $b 8.8.1 $b 8.8.4 $b 8.7.4 $b 8.11.3 $b 8.5.1 $b 8.9.1 $b 8.9.0 $b"
echo -e " $b 4 $b $b 8.10.9 $b 8.7.2 $b 8.7.8 $b 8.6.9 $b 8.10.6 $b 8.4.2 $b 8.8.2 $b 8.8.1 $b"
echo -e "$divider"
echo -e " $b 3 $b Dec 28 2023 $b 8.11.5 $b 8.8.1 $b 8.8.3 $b 8.7.3 $b 8.11.2 $b 8.5.1 $b 8.9.0 $b 8.9.0 $b"
echo -e " $b 4 $b $b 8.10.8 $b 8.7.2 $b 8.7.7 $b 8.6.8 $b 8.10.6 $b 8.4.2 $b 8.8.2 $b 8.8.1 $b"
echo -e " $b 5 $b Dec 28 2023 $b 8.11.5 $b 8.8.1 $b 8.8.3 $b 8.7.3 $b 8.11.2 $b 8.5.1 $b 8.9.0 $b 8.9.0 $b"
echo -e " $b 6 $b $b 8.10.8 $b 8.7.2 $b 8.7.7 $b 8.6.8 $b 8.10.6 $b 8.4.2 $b 8.8.2 $b 8.8.1 $b"
echo -e "$divider"
echo -e " $b 5 $b Nov 28 2023 $b 8.11.3 $b 8.8.1 $b 8.8.2 $b 8.7.2 $b 8.11.2 $b 8.5.0 $b 8.9.0 $b 8.9.0 $b"
echo -e " $b 6 $b $b 8.10.7 $b 8.7.2 $b 8.7.6 $b 8.6.7 $b 8.10.6 $b 8.4.1 $b 8.8.2 $b 8.8.1 $b"
echo -e " $b 7 $b Nov 28 2023 $b 8.11.3 $b 8.8.1 $b 8.8.2 $b 8.7.2 $b 8.11.2 $b 8.5.0 $b 8.9.0 $b 8.9.0 $b"
echo -e " $b 8 $b $b 8.10.7 $b 8.7.2 $b 8.7.6 $b 8.6.7 $b 8.10.6 $b 8.4.1 $b 8.8.2 $b 8.8.1 $b"
echo -e "$divider"
echo -e " $b 7 $b Oct 31 2023 $b 8.11.2 $b 8.8.1 $b 8.8.1 $b 8.7.1 $b 8.11.1 $b 8.5.0 $b 8.9.0 $b 8.9.0 $b"
echo -e " $b 8 $b $b 8.10.6 $b 8.7.2 $b 8.7.5 $b 8.6.6 $b 8.10.4 $b 8.4.1 $b 8.8.2 $b 8.8.1 $b"
echo -e "$footer"
reset_colors
echo
prompt_for_input "Select Catalog Source" MAS_CHANNEL_SELECTION "1"

case $MAS_CHANNEL_SELECTION in
# January 2024
# February 2024
1)
MAS_CHANNEL=8.11.x
MAS_CATALOG_VERSION=v8-240130-amd64
MAS_CATALOG_VERSION=v8-240227-amd64
;;
2)
MAS_CHANNEL=8.10.x
MAS_CATALOG_VERSION=v8-240130-amd64
MAS_CATALOG_VERSION=v8-240227-amd64
;;
# December 2023
# January 2024
3)
MAS_CHANNEL=8.11.x
MAS_CATALOG_VERSION=v8-231228-amd64
MAS_CATALOG_VERSION=v8-240130-amd64
;;
4)
MAS_CHANNEL=8.10.x
MAS_CATALOG_VERSION=v8-231228-amd64
MAS_CATALOG_VERSION=v8-240130-amd64
;;
# November 2023
# December 2023
5)
MAS_CHANNEL=8.11.x
MAS_CATALOG_VERSION=v8-231128-amd64
MAS_CATALOG_VERSION=v8-231228-amd64
;;
6)
MAS_CHANNEL=8.10.x
MAS_CATALOG_VERSION=v8-231128-amd64
MAS_CATALOG_VERSION=v8-231228-amd64
;;
# October 2023
# November 2023
7)
MAS_CHANNEL=8.11.x
MAS_CATALOG_VERSION=v8-231031-amd64
MAS_CATALOG_VERSION=v8-231128-amd64
;;
8)
MAS_CHANNEL=8.10.x
MAS_CATALOG_VERSION=v8-231031-amd64
MAS_CATALOG_VERSION=v8-231128-amd64
;;
# Invalid Selection
*)
Expand Down Expand Up @@ -144,7 +144,7 @@ function db2_channel_selection() {
case $MAS_CATALOG_VERSION in
# Db2 Channel selection
# -------------------------------------------------------------------------
v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64|v8-231228-amd64|v8-240130-amd64)
v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64|v8-231228-amd64|v8-240130-amd64|v8-240227-amd64)
DB2_CHANNEL=v110508.0
;;
v8-230111-amd64|v8-230217-amd64|v8-230314-amd64|v8-230328-amd64)
Expand All @@ -164,7 +164,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-231128-amd64|v8-231228-amd64|v8-240130-amd64)
v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64|v8-231228-amd64|v8-240130-amd64|v8-240227-amd64)
CP4D_VERSION=4.6.6
;;
# CP4D v4.6.4 was added in the June 2023 catalog update
Expand Down Expand Up @@ -199,7 +199,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-231128-amd64|v8-231228-amd64|v8-240130-amd64)
v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64|v8-231228-amd64|v8-240130-amd64|v8-240227-amd64)
SLS_PROMPT_LICENSE_ID="false"
SLS_PROMPT_ICR_CP="false"
;;
Expand All @@ -226,7 +226,7 @@ function cert_manager_selection() {
case $MAS_CATALOG_VERSION in
# Cert-Manager Channel selection
# -------------------------------------------------------------------------
v8-amd64|v8-240130-amd64) # TODO: update here to include v8-amd64 when january catalog is released so that online catalog also installs redhat cert manager
v8-amd64|v8-240130-amd64|v8-240227-amd64)
CERT_MANAGER_PROVIDER=redhat
CERT_MANAGER_ACTION=install
;;
Expand Down
2 changes: 1 addition & 1 deletion image/cli/mascli/functions/update
Expand Up @@ -521,4 +521,4 @@ function update() {
echo -e "\nView progress:\n ${COLOR_CYAN}${TEXT_UNDERLINE}https://${OCP_CONSOLE_ROUTE}/pipelines/ns/mas-pipelines${TEXT_RESET}${TEXT_RESET}"
echo

}
}
2 changes: 1 addition & 1 deletion mkdocs.yml
Expand Up @@ -36,10 +36,10 @@ nav:
- "must-gather": commands/must-gather.md
- "Catalogs":
- "All Catalogs": catalogs/index.md
- "Feb 27 2024": catalogs/v8-240227-amd64.md
- "Jan 30 2024": catalogs/v8-240130-amd64.md
- "Dec 28 2023": catalogs/v8-231228-amd64.md
- "Nov 28 2023": catalogs/v8-231128-amd64.md
- "Oct 31 2023": catalogs/v8-231031-amd64.md
- "Reference":
- "Topology": reference/topology.md
- "Cluster Extensions": reference/cluster-extensions.md
Expand Down
20 changes: 0 additions & 20 deletions tekton/src/pipelines/update.yml.j2
Expand Up @@ -348,23 +348,3 @@ spec:
kind: Task
name: mas-fvt-finalize
{% endif %}

{% if wait_for_install == true %}
# 7. Test for outages during mongo update
# -------------------------------------------------------------------------
- name: fvt-mongo-update
taskRef:
kind: Task
name: mas-ivt-core
params:
- name: fvt_image_registry
value: $(params.fvt_image_registry)
- name: fvt_image_digest
value: $(params.fvt_image_digest)
- name: mas_instance_id
value: $(params.mas_instance_id)
- name: mas_workspace_id
value: "NOT_USED"
- name: fvt_test_suite
value: "mongohealth"
{% endif %}

0 comments on commit 55fc294

Please sign in to comment.