[minor] Support May Catalog update (#953)

Co-authored-by: Sanjay Prabhakar <[email protected]>
ibm-mas · Jun 5, 2024 · 5301e8f · 5301e8f
1 parent c8eff24
commit 5301e8f
Show file tree

Hide file tree

Showing 7 changed files with 629 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# IBM Maximo Application Suite CLI Utility
+# IBM Maximo Application Suite CLI Utility 
 [![GitHub release](https://img.shields.io/github/v/release/ibm-mas/cli)](https://github.com/ibm-mas/cli/releases/latest)
 [![Build CLI](https://github.com/ibm-mas/cli/actions/workflows/build-cli.yml/badge.svg)](https://github.com/ibm-mas/cli/actions/workflows/build-cli.yml)
 

diff --git a/catalogs/v8-240528-amd64.yaml b/catalogs/v8-240528-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-240528-amd64)
+  publisher: IBM
+  description: Static Catalog Source for IBM Maximo Application Suite
+  sourceType: grpc
+  image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:5ca51934b3aec978e261e6dc9704fd3d46a308010bd6c86252788d69aac3fa9f
+  priority: 90
diff --git a/docs/catalogs/index.md b/docs/catalogs/index.md
@@ -46,9 +46,10 @@ To receive security updates and bug fixes you must periodically update the versi
 #### 2024
 | Catalog                               | OCP Support | Recommended CLI | End of Support                  |
 | ------------------------------------- | ----------- | --------------- | ------------------------------- |
-| [v8-240430-amd64](v8-240430-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.12 EOS January 17, 2025   |
-| [v8-240405-amd64](v8-240405-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.12 EOS January 17, 2025   |
-| [v8-240326-amd64](v8-240326-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.12 EOS January 17, 2025   |
+| [v8-240528-amd64](v8-240528-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.14 EOS October 31, 2025   |
+| [v8-240430-amd64](v8-240430-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.14 EOS October 31, 2025   |
+| [v8-240405-amd64](v8-240405-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.14 EOS October 31, 2025   |
+| [v8-240326-amd64](v8-240326-amd64.md) | 4.12 - 4.14 | latest          | OCP 4.14 EOS October 31, 2025   |
 | [v8-240227-amd64](v8-240227-amd64.md) | 4.12        | 8.2.2           | OCP 4.12 EOS January 17, 2025   |
 | [v8-240130-amd64](v8-240130-amd64.md) | 4.12        | 8.2.2           | OCP 4.12 EOS January 17, 2025   |
 

diff --git a/docs/catalogs/v8-240405-amd64.md b/docs/catalogs/v8-240405-amd64.md
@@ -11,9 +11,7 @@ Details
 </table>
 
 !!! important
-    This catalog with MAS Core 8.11.9 resolves [DT378321](https://www.ibm.com/mysupport/aCIKe0000008OiX) which is an edge condition impacting LDAP sync with Extensions that's present in March(v8-240326-amd64) catalog's MAS 8.11.8.
-    We advice to skip ibm-mas 8.11.8 and use ibm-mas 8.11.9.
-    MAS CLI versions v7.19.0 or newer will support this new MAS Core version.
+    This update resolves [DT378321](https://www.ibm.com/mysupport/aCIKe0000008OiX), an edge condition impacting LDAP sync with Extensions introduced in the March update. We advise customers to skip the [March catalog update](https://ibm-mas.github.io/cli/catalogs/v8-240326-amd64/) and go direct to this one.
 
 
 What's New

diff --git a/docs/catalogs/v8-240528-amd64.md b/docs/catalogs/v8-240528-amd64.md
diff --git a/image/cli/mascli/functions/internal/catalog_utils b/image/cli/mascli/functions/internal/catalog_utils
@@ -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-240430-amd64
+MOST_RECENT_CATALOG=v8-240528-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 "Select MAS Catalog:"
-  echo "  1) April 30 2024 Update (MAS 8.11.10 & 8.10.13)"
-  echo "  2) April 05 2024 Update (MAS 8.11.9 & 8.10.11)"
-  echo "  3) February 27 2024 Update (MAS 8.11.7 & 8.10.10)"
-  echo "  4) January 30 2024 Update (MAS 8.11.6 & 8.10.9)"
+  echo "  1) May 28 2024 Update (MAS 8.11.11 & 8.10.14)"
+  echo "  2) April 30 2024 Update (MAS 8.11.10 & 8.10.13)"
+  echo "  3) April 05 2024 Update (MAS 8.11.9 & 8.10.11)"
+  echo "  4) February 27 2024 Update (MAS 8.11.7 & 8.10.10)"
   reset_colors
 
   echo
   prompt_for_input "Select Catalog Version" MAS_CATALOG_SELECTION "1"
 
   case $MAS_CATALOG_SELECTION in
     1)
-      MAS_CATALOG_VERSION=v8-240430-amd64
+      MAS_CATALOG_VERSION=v8-240528-amd64
       ;;
     2)
-      MAS_CATALOG_VERSION=v8-240405-amd64
+      MAS_CATALOG_VERSION=v8-240430-amd64
       ;;
     3)
-      MAS_CATALOG_VERSION=v8-240227-amd64
+      MAS_CATALOG_VERSION=v8-240405-amd64
       ;;
     4)
-      MAS_CATALOG_VERSION=v8-240130-amd64
+      MAS_CATALOG_VERSION=v8-240227-amd64
       ;;
     *)
       echo_warning "Invalid selection"
@@ -44,8 +44,6 @@ function choose_catalog_version() {
   esac
 }
 
-#TODO: UPDATE BELOW
-
 # Choose a catalog and the MAS channel
 # -----------------------------------------------------------------------------
 # Currently only in the mas install and mirror-images functions.  The user must
@@ -59,57 +57,57 @@ function choose_mas_version() {
   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 "$divider"
-  echo -e " $b 1 $b Apr 30 2024  $b 8.11.10 $b 8.8.3  $b 8.8.7   $b 8.7.7  $b 8.11.6  $b   8.5.4   $b  8.9.2  $b   8.9.2    $b"
-  echo -e " $b 2 $b              $b 8.10.13 $b 8.7.4  $b 8.7.11  $b 8.6.13 $b 8.10.9  $b   8.4.5   $b  8.8.2  $b   8.8.3    $b"
+  echo -e " $b 1 $b May 28 2024  $b 8.11.11 $b 8.8.3  $b 8.8.9   $b 8.7.8  $b 8.11.7  $b   8.5.5   $b  8.9.2  $b   8.9.3    $b"
+  echo -e " $b 2 $b              $b 8.10.14 $b 8.7.4  $b 8.7.13  $b 8.6.14 $b 8.10.10 $b   8.4.6   $b  8.8.2  $b   8.8.4    $b"
   echo -e "$divider"
-  echo -e " $b 3 $b Apr 05 2024  $b 8.11.9  $b 8.8.2  $b 8.8.6   $b 8.7.6  $b 8.11.5  $b   8.5.3   $b  8.9.2  $b   8.9.1    $b"
-  echo -e " $b 4 $b              $b 8.10.11 $b 8.7.3  $b 8.7.10  $b 8.6.11 $b 8.10.8  $b   8.4.4   $b  8.8.2  $b   8.8.2    $b"
+  echo -e " $b 3 $b Apr 30 2024  $b 8.11.10 $b 8.8.3  $b 8.8.7   $b 8.7.7  $b 8.11.6  $b   8.5.4   $b  8.9.2  $b   8.9.2    $b"
+  echo -e " $b 4 $b              $b 8.10.13 $b 8.7.4  $b 8.7.11  $b 8.6.13 $b 8.10.9  $b   8.4.5   $b  8.8.2  $b   8.8.3    $b"
   echo -e "$divider"
-  echo -e " $b 5 $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 6 $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 " $b 5 $b Apr 05 2024  $b 8.11.9  $b 8.8.2  $b 8.8.6   $b 8.7.6  $b 8.11.5  $b   8.5.3   $b  8.9.2  $b   8.9.1    $b"
+  echo -e " $b 6 $b              $b 8.10.11 $b 8.7.3  $b 8.7.10  $b 8.6.11 $b 8.10.8  $b   8.4.4   $b  8.8.2  $b   8.8.2    $b"
   echo -e "$divider"
-  echo -e " $b 7 $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 8 $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 7 $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 8 $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 "$footer"
   reset_colors
   echo
   prompt_for_input "Select Catalog Source" MAS_CHANNEL_SELECTION "1"
 
   case $MAS_CHANNEL_SELECTION in
-    # April 2024
+    # May 2024
     1)
       MAS_CHANNEL=8.11.x
-      MAS_CATALOG_VERSION=v8-240430-amd64
+      MAS_CATALOG_VERSION=v8-240528-amd64
       ;;
     2)
       MAS_CHANNEL=8.10.x
-      MAS_CATALOG_VERSION=v8-240430-amd64
+      MAS_CATALOG_VERSION=v8-240528-amd64
       ;;
+    # April 2024
     3)
       MAS_CHANNEL=8.11.x
-      MAS_CATALOG_VERSION=v8-240405-amd64
+      MAS_CATALOG_VERSION=v8-240430-amd64
       ;;
     4)
       MAS_CHANNEL=8.10.x
-      MAS_CATALOG_VERSION=v8-240405-amd64
+      MAS_CATALOG_VERSION=v8-240430-amd64
       ;;
-    # February 2024
     5)
       MAS_CHANNEL=8.11.x
-      MAS_CATALOG_VERSION=v8-240227-amd64
+      MAS_CATALOG_VERSION=v8-240405-amd64
       ;;
     6)
       MAS_CHANNEL=8.10.x
-      MAS_CATALOG_VERSION=v8-240227-amd64
+      MAS_CATALOG_VERSION=v8-240405-amd64
       ;;
-    # January 2024
+    # February 2024
     7)
       MAS_CHANNEL=8.11.x
-      MAS_CATALOG_VERSION=v8-240130-amd64
+      MAS_CATALOG_VERSION=v8-240227-amd64
       ;;
     8)
       MAS_CHANNEL=8.10.x
-      MAS_CATALOG_VERSION=v8-240130-amd64
+      MAS_CATALOG_VERSION=v8-240227-amd64
       ;;
     # Invalid Selection
     *)
@@ -140,7 +138,7 @@ function db2_channel_selection() {
   case $MAS_CATALOG_VERSION in
     # Db2 Channel selection
     # -------------------------------------------------------------------------
-    v8-amd64|v8-240130-amd64|v8-240227-amd64|v8-240326-amd64|v8-240405-amd64|v8-240430-amd64)
+    v8-amd64|v8-240130-amd64|v8-240227-amd64|v8-240326-amd64|v8-240405-amd64|v8-240430-amd64|v8-240528-amd64)
       DB2_CHANNEL=v110509.0
       ;;
     *)
@@ -157,7 +155,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-240227-amd64|v8-240326-amd64|v8-240405-amd64|v8-240430-amd64)
+    v8-amd64|v8-230926-amd64|v8-231004-amd64|v8-231031-amd64|v8-231128-amd64|v8-231228-amd64|v8-240130-amd64|v8-240227-amd64|v8-240326-amd64|v8-240405-amd64|v8-240430-amd64|v8-240528-amd64)
       CP4D_VERSION=4.6.6
       ;;
     *)
@@ -180,7 +178,7 @@ function cert_manager_selection() {
   case $MAS_CATALOG_VERSION in
     # Cert-Manager Channel selection
     # -------------------------------------------------------------------------
-    v8-amd64|v8-240130-amd64|v8-240227-amd64|v8-240326-amd64|v8-240405-amd64|v8-240430-amd64)
+    v8-amd64|v8-240130-amd64|v8-240227-amd64|v8-240326-amd64|v8-240405-amd64|v8-240430-amd64|v8-240528-amd64)
       CERT_MANAGER_PROVIDER=redhat
       CERT_MANAGER_ACTION=install
       ;;

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -36,11 +36,11 @@ nav:
       - "must-gather": commands/must-gather.md
   - "Catalogs":
       - "All Catalogs": catalogs/index.md
+      - "May 28 2024": catalogs/v8-240528-amd64.md
       - "Apr 30 2024": catalogs/v8-240430-amd64.md
       - "Apr 05 2024": catalogs/v8-240405-amd64.md
       - "Mar 26 2024": catalogs/v8-240326-amd64.md
       - "Feb 27 2024": catalogs/v8-240227-amd64.md
-      - "Jan 30 2024": catalogs/v8-240130-amd64.md
   - "Reference":
       - "Dependencies": reference/dependencies.md
       - "Topology": reference/topology.md