[minor] Add support for Dec 2022 catalog (#124)

Co-authored-by: Terence Quinn <[email protected]>
ibm-mas · Dec 29, 2022 · f990e22 · f990e22
1 parent c2854e6
commit f990e22
Show file tree

Hide file tree

Showing 13 changed files with 247 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ There are minimal dependencies to meet on your own computer to use the CLI:
 - OpenShift client
 - Network access to the OpenShift cluster
 
-The best way to use the CLI is via the container image: `docker run -ti -v ~:/home/local --pull always quay.io/ibmmas/cli`.
+The best way to use the CLI is via the container image: `docker run -ti -v ~:/mnt/home --pull always quay.io/ibmmas/cli`.
 
 The install is designed to work on any OCP cluster, but has been specifically tested in these environments:
 - IBMCloud ROKS

diff --git a/catalogs/v8-221228-amd64.yaml b/catalogs/v8-221228-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-221228-amd64)
+  publisher: IBM
+  description: Static Catalog Source for IBM Maximo Application Suite
+  sourceType: grpc
+  image: wiotp-docker-local.artifactory.swg-devops.com/cpopen/ibm-maximo-operator-catalog@sha256:505a135ba1af2cee548703e85b17764074b7479dbbf506b132d5871af793073f
+  priority: 90
diff --git a/docs/catalogs/index.md b/docs/catalogs/index.md
@@ -9,7 +9,7 @@ Catalog Options
 ### Dynamic Catalog
 The dynamic operator catalog is continuously updated, if you use the dynamic catalog you will always have access to the latest operator updates.
 
-This catalog is a **curated** catalog, the Maximo Application Suite team take a snapshot of the online IBM Operator Catalog and test compatibility of all dependant IBM operators with supported releases of Maximo Application suite; this allows the team to intercept any breaking changes that may have evaded other teams' testing before they reach your cluster.
+This catalog is a **curated** catalog, the Maximo Application Suite team take a snapshot of the online IBM Operator Catalog and test compatibility of all dependent IBM operators with supported releases of Maximo Application suite; this allows the team to intercept any breaking changes that may have evaded other teams' testing before they reach your cluster.
 
 No updates are made to this catalog without extensive testing with all in-support version of Maximo Application Suite, so you can trust this dynamic catalog, even in a production environment.
 
@@ -33,10 +33,11 @@ spec:
 ```
 
 ### Static Catalogs
-The static operator catalogs provide a fixed reference point, if you use a static catalog you can rely on the fact that it will never change which allows for 100% reproducable installations no matter how much time has passed between the install.
+The static operator catalogs provide a fixed reference point, if you use a static catalog you can rely on the fact that it will never change which allows for 100% reproducible installations no matter how much time has passed between the install.
 
-To recieve security updates and bug fixes you must periodically update the version of the static catalog that you have installed in the cluster.  Once you do this all operators that you have installed from the catalog will automatically update to the newer version.  We aim to release a catalog update monthly.
+To receive security updates and bug fixes you must periodically update the version of the static catalog that you have installed in the cluster.  Once you do this all operators that you have installed from the catalog will automatically update to the newer version.  We aim to release a catalog update monthly.
 
+- [v8-221228-amd64](v8-221228-amd64.md)
 - [v8-221129-amd64](v8-221129-amd64.md)
 - [v8-221025-amd64](v8-221025-amd64.md)
 - [v8-220927-amd64](v8-220927-amd64.md)

diff --git a/docs/catalogs/v8-221129-amd64.md b/docs/catalogs/v8-221129-amd64.md
@@ -13,7 +13,7 @@ Details
 Other IBM content curated from `icr.io/cpopen/ibm-operator-catalog@sha256:9c7552673a8d90bfe1da16dd8c28288b00cf6ffd6bad6edb26042c2991f266e0`
 
 !!! warning
-    There is a known issue with image digests for Optimizer 8.2.2 and disconnected installation.  If you are running a disconnected install and want to use Optimizer v8.8 it is recommended that you skip this catalog update and wait for the December update.
+    There is a known issue with image digests for Optimizer 8.2.2 and disconnected installation.  If you are running a disconnected install and want to use Optimizer v8.2 it is recommended that you skip this catalog update and wait for the December update.  This issue does not affect Optimizer 8.3.0.
 
 
 Manual Installation

diff --git a/docs/catalogs/v8-221228-amd64.md b/docs/catalogs/v8-221228-amd64.md
@@ -0,0 +1,169 @@
+IBM Maximo Operator Catalog v8 (221228)
+===============================================================================
+
+Details
+-------------------------------------------------------------------------------
+
+<table>
+  <tr><td>Image</td><td>icr.io/cpopen/ibm-maximo-operator-catalog</tr></tr>
+  <tr><td>Tag</td><td>v8-221228-amd64</tr></tr>
+  <tr><td>Digest</td><td>sha256:505a135ba1af2cee548703e85b17764074b7479dbbf506b132d5871af793073f</tr></tr>
+</table>
+
+Other IBM content curated from `icr.io/cpopen/ibm-operator-catalog@sha256:9c7552673a8d90bfe1da16dd8c28288b00cf6ffd6bad6edb26042c2991f266e0`
+
+!!! warning
+    Manage v8.5.0 introduces a regression with air gap support, as such this catalog is unsuitable for customers using Maximo Manage in an air gap environment.
+
+
+Manual Installation
+-------------------------------------------------------------------------------
+`oc apply -f https://raw.githubusercontent.com/ibm-mas/cli/master/catalogs/v8-221228-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-221228-amd64)
+  publisher: IBM
+  description: Static Catalog Source for IBM Maximo Application Suite
+  sourceType: grpc
+  image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:505a135ba1af2cee548703e85b17764074b7479dbbf506b132d5871af793073f
+  priority: 90
+```
+
+
+OpenShift Container Platform Support
+-------------------------------------------------------------------------------
+| Package                      | OCP Release |
+| ---------------------------- | ------------|
+| Maximo Application Suite 8.9 | 4.10        |
+| Maximo Application Suite 8.8 | 4.8-4.10    |
+| Maximo Application Suite 8.7 | 4.6-4.8     |
+| [Cloud Pak Foundational Services 3.20.1](https://www.ibm.com/docs/en/cpfs?topic=operator-supported-openshift-versions-platforms)* | 4.6-4.11 |
+| [Cloud Pak For Data 2.0.8](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.0?topic=requirements-software) | 4.6, 4.8 |
+| [AppConnect 3.1.0](https://www.ibm.com/support/pages/node/6239294) | 4.6-4.8 |
+| [AppConnect 4.2.0](https://www.ibm.com/support/pages/node/6239294) | 4.6-4.8, 4.10 |
+| [AppConnect 5.2.0](https://www.ibm.com/support/pages/node/6239294) | 4.10 |
+
+!!! warning
+    Note the following [limitations](https://www.ibm.com/docs/en/cpfs?topic=operator-supported-openshift-versions-platforms) with Cloud Pak Foundational Services OCP support:
+
+    - User Data Services (UDS) is supported on Linux® x86_64 and OpenShift Container Platform versions 4.6-4.10 only.
+    - DB2, which is installed with ibm-db2u-operator, is supported on OpenShift Container Platform versions 4.6-4.9 only.
+
+
+Hyperscaler Certification
+-------------------------------------------------------------------------------
+IBM Maximo Application Suite will run anywhere that you can run a supported OpenShift release, additionally this catalog is specifically tested and verified compatible with these hyperscaler providers' managed OpenShift offerings.
+
+| Provider                                                                                 | Certified |
+| ---------------------------------------------------------------------------------------- | :--------:|
+| [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)                                         | ✔        |
+
+
+Manifest
+-------------------------------------------------------------------------------
+
+!!! note
+    Changes from previous catalog ([v8-221129-amd64](v8-221129-amd64.md)) are highlighted in **bold**.
+
+### IBM Maximo Application Suite
+| Package                  | Channel | Latest Version  |
+| ------------------------ | ------- | --------------- |
+| ibm-mas                  | 8.9.x   | 8.9.0           |
+| ibm-mas                  | 8.8.x   | **8.8.4**       |
+| ibm-mas                  | 8.7.x   | **8.7.6**       |
+| ibm-mas-assist           | 8.6.x   | 8.6.0           |
+| ibm-mas-assist           | 8.5.x   | **8.5.2**       |
+| ibm-mas-assist           | 8.4.x   | 8.4.0           |
+| ibm-mas-hputilities      | 8.5.x   | 8.5.0           |
+| ibm-mas-hputilities      | 8.4.x   | 8.4.1           |
+| ibm-mas-hputilities      | 8.3.x   | 8.3.1           |
+| ibm-mas-hputilities      | 8.2.x   | 8.2.2           |
+| ibm-mas-iot              | 8.6.x   | 8.6.0           |
+| ibm-mas-iot              | 8.5.x   | **8.5.4**       |
+| ibm-mas-iot              | 8.4.x   | 8.4.6           |
+| ibm-mas-manage           | 8.5.x   | 8.5.0           |
+| ibm-mas-manage           | 8.4.x   | **8.4.4**       |
+| ibm-mas-manage           | 8.3.x   | 8.3.7           |
+| ibm-mas-manage           | 8.2.x   | 8.2.3           |
+| ibm-mas-monitor          | 8.9.x   | 8.9.0           |
+| ibm-mas-monitor          | 8.8.x   | 8.8.2           |
+| ibm-mas-monitor          | 8.7.x   | 8.7.3           |
+| ibm-mas-monitor          | 8.6.x   | 8.6.4           |
+| ibm-mas-mso              | 8.1.x   | 8.1.0           |
+| ibm-mas-optimizer        | 8.3.x   | 8.3.0           |
+| ibm-mas-optimizer        | 8.2.x   | **8.2.3**       |
+| ibm-mas-predict          | 8.7.x   | 8.7.0           |
+| ibm-mas-predict          | 8.6.x   | 8.6.2           |
+| ibm-mas-predict          | 8.5.x   | 8.5.1           |
+| ibm-mas-predict          | 8.4.x   | 8.4.1           |
+| ibm-mas-safety           | 8.3.x   | **8.3.2**       |
+| ibm-mas-safety           | 8.2.x   | 8.2.2           |
+| ibm-mas-visualinspection | 8.7.x   | 8.7.0           |
+| ibm-mas-visualinspection | 8.6.x   | 8.6.1           |
+| ibm-mas-visualinspection | 8.5.x   | 8.5.0           |
+| ibm-mas-visualinspection | 8.4.x   | 8.4.0           |
+
+### IBM Utilities
+| Package                  | Channel | Latest Version |
+| ------------------------ | ------- | -------------- |
+| ibm-data-dictionary      | 1.1.x   | 1.1.1          |
+| ibm-data-dictionary      | 1.0.x   | 1.0.0          |
+| ibm-sls                  | 3.x     | 3.5.0          |
+| ibm-truststore-mgr       | 1.x     | 1.4.0          |
+
+### IBM Cloud Pak Foundational Services
+| Package                         | Channel | Latest Version |
+| ------------------------------- | ------- | -------------- |
+| ibm-common-service-operator     | v3.20   | 3.20.1         |
+| ibm-namespace-scope-operator    | v3.20   | 1.14.0         |
+| ibm-odlm                        | v3.20   | 1.18.0         |
+| ibm-cert-manager-operator       | v3.20   | 3.22.0         |
+| ibm-user-data-services-operator | alpha   | 2.0.8          |
+| ibm-events-operator             | v3      | 4.2.1          |
+| db2u-operator                   | v1.1    | 1.1.13         |
+| ibm-licensing-operator-app      | v3.20   | 1.17.0         |
+| ibm-zen-operator                | v3      | 1.5.4 *        |
+| ibm-zen-operator                | v3.20   | 1.7.1          |
+
+!!! note
+    **ibm-zen-operator** `v3` channel is capped at operator version 1.5.4 due to breaking changes introduced in v1.6.0.
+
+### IBM Cloud Pak for Data
+| Package                       | Channel   | Latest Version |
+| ----------------------------- | --------- | -------------- |
+| cpd-platform-operator         | v2.0      | 2.0.8          |
+| ibm-cpd-wsl                   | v2.0      | 2.0.9          |
+| ibm-cpd-css                   | v1.0      | 1.0.9          |
+| ibm-cpd-datarefinery          | v1.0      | 1.0.10         |
+| ibm-cpd-ws-runtimes           | v1.0      | 1.0.9          |
+| ibm-cpd-wml-operator          | v1.1      | 1.1.8          |
+| analyticsengine-operator      | stable-v1 | 1.0.9          |
+| ibm-cpd-wos                   | v1.0      | 1.5.4          |
+| ibm-watson-discovery-operator | v4.0      | 4.0.9          |
+| ibm-watson-gateway-operator   | v1.0      | 1.0.12         |
+| ibm-rabbitmq-operator         | v1.0      | 1.0.12         |
+| ibm-model-train-operator      | v1.1      | 1.1.3          |
+| ibm-minio-operator            | v1.0      | 1.0.11         |
+| ibm-etcd-operator             | v1.0      | 1.0.10         |
+| ibm-elasticsearch-operator    | v1.1      | 1.1.1080       |
+| ibm-namespace-scope-operator  | v3        | 1.13.3         |
+
+### IBM AppConnect
+| Package                  | Channel   | Latest Version |
+| ------------------------ | --------- | -------------- |
+| ibm-appconnect           | v5.2      | 5.2.0          |
+| ibm-appconnect           | v4.2      | 4.2.0          |
+| ibm-appconnect           | v3.1      | 3.1.0          |
+| couchdb-operator         | v2.2      | 2.2.1          |
diff --git a/docs/changes.md b/docs/changes.md
@@ -1,5 +1,7 @@
 ## Changes
 
+- [`3.7`](https://github.com/ibm-mas/cli/releases/tag/3.7.0) Add support for Dec 2022 catalog
+- [`3.6`](https://github.com/ibm-mas/cli/releases/tag/3.6.0) Support customizable CLI version in tekton
 - [`3.5`](https://github.com/ibm-mas/cli/releases/tag/3.5.0) Add fvt-core test pipeline
 - [`3.4`](https://github.com/ibm-mas/cli/releases/tag/3.4.0) Add support for the FVT enhanced pipeline
 - [`3.3`](https://github.com/ibm-mas/cli/releases/tag/3.3.0) Add support for single node OpenShfit on AWS

diff --git a/docs/commands/install.md b/docs/commands/install.md
@@ -30,14 +30,14 @@ The install is an interactive command.  At present there is no support for an
 unattended install, but this is planned for the future.
 
 ```bash
-docker run -ti --rm -v ~:/home/local --pull always quay.io/ibmmas/cli
+docker run -ti --rm -v ~:/mnt/home --pull always quay.io/ibmmas/cli
 mas install
 ```
 
 !!! important
     We will need the `entitlement.lic` file to perform the installation which is why we mount your home directory into the container.  If you saved the entitlement file elsewhere, mount that directory instead.
 
-    When prompted you will be able to set license file to `/home/local/entitlement.lic`
+    When prompted you will be able to set license file to `/mnt/home/entitlement.lic`
 
 
 Air Gap Support

diff --git a/docs/guides/install.md b/docs/guides/install.md
@@ -71,6 +71,9 @@ Disconnected install for IBM Maximo Application Suite is supported from MAS v8.8
 | Safety                     |  No support                       |
 | Visual Inspection          |  No support                       |
 
+!!! warning
+    Manage v8.5.0 introduces a regression with air gap support in the application, as such the November 2022 and December 2022 catalogs are unsuitable for customers using Maximo Manage in an air gap environment.
+
 
 ### 2.2 Prepare the Private Registry
 If you do not already have a private registry available to use as your mirror then you can use the `setup-mirror` function to deploy a private registry inside a target OpenShift cluster.

diff --git a/docs/index.md b/docs/index.md
@@ -15,13 +15,13 @@ Installation
 The best way to use the CLI is to not install it at all and use the container image we publish:
 
 ```bash
-docker run -ti -v ~:/home/local --pull always quay.io/ibmmas/cli
+docker run -ti -v ~:/mnt/home --pull always quay.io/ibmmas/cli
 ```
 
 !!! tip
     Running `docker pull` before `docker run` will ensure you are using the latest release of the container image.
 
-    If you want to stick with a specific release of the image you can attach a specific version tag to the docker run command: `docker run -ti -v ~:/home/local quay.io/ibmmas/cli:x.y.z`
+    If you want to stick with a specific release of the image you can attach a specific version tag to the docker run command: `docker run -ti -v ~:/mnt/home quay.io/ibmmas/cli:x.y.z`
 
 If you prefer to install the client it can be obtained from the [GitHub releases page](https://github.com/ibm-mas/cli/releases).
 

diff --git a/image/cli/mascli/functions/mirror_to_registry b/image/cli/mascli/functions/mirror_to_registry
@@ -27,7 +27,7 @@ Source Registry Entitlements (Required based on what content you choose to mirro
       --redhat-password ${COLOR_YELLOW}REDHAT_CONNECT_PASSWORD${TEXT_RESET}   Red Hat Connect Password
 
 Maximo Operator Catalog Selection (Optional):
-  -c, --catalog ${COLOR_YELLOW}MAS_CATALOG_VERSION${TEXT_RESET}               Maximo Operator Catalog Version to mirror (e.g. v8-221129-amd64)
+  -c, --catalog ${COLOR_YELLOW}MAS_CATALOG_VERSION${TEXT_RESET}               Maximo Operator Catalog Version to mirror (e.g. v8-deccat-amd64)
   -C, --channel ${COLOR_YELLOW}MAS_CHANNEL${TEXT_RESET}                       Maximo Application Suite Channel to mirror (e.g. 8.9.x)
       --mirror-core                               Mirror images for IBM Maximo Application Suite Core & dependencies
       --mirror-assist                             Mirror images for IBM Maximo Assist
@@ -245,35 +245,41 @@ function mirror_to_registry_interactive() {
   echo_h2 "3. Configure Static Catalog Version"
 
   echo -e "${COLOR_YELLOW}MAS Version:"
-  echo "  1. 8.9.0 (2022-11-29)"
-  echo "  2. 8.8.3 (2022-11-29)"
-  echo "  3. 8.8.2 (2022-10-25)"
-  echo "  4. 8.8.1 (2022-09-27)"
-  echo "  5. 8.8.0 (2022-08-05)"
+  echo "  1. 8.8.4 (2022-12-14)"
+  echo "  2. 8.9.0 (2022-11-29)"
+  echo "  3. 8.8.3 (2022-11-29)"
+  echo "  4. 8.8.2 (2022-10-25)"
+  echo "  5. 8.8.1 (2022-09-27)"
+  echo "  6. 8.8.0 (2022-08-05)"
   prompt_for_input "Select Catalog Source" MAS_CHANNEL_SELECTION "1"
 
   case $MAS_CHANNEL_SELECTION in
-    1|8.9.0)
+    1|8.8.4)
+      MAS_CHANNEL=8.8.x
+      MAS_CATALOG_SOURCE=ibm-operator-catalog
+      MAS_CATALOG_VERSION=v8-deccat-amd64
+      ;;
+    2|8.9.0)
       MAS_CHANNEL=8.9.x
       MAS_CATALOG_SOURCE=ibm-operator-catalog
       MAS_CATALOG_VERSION=v8-221129-amd64
       ;;
-    2|8.8.3)
+    3|8.8.3)
       MAS_CHANNEL=8.8.x
       MAS_CATALOG_SOURCE=ibm-operator-catalog
       MAS_CATALOG_VERSION=v8-221129-amd64
       ;;
-    3|8.8.2)
+    4|8.8.2)
       MAS_CHANNEL=8.8.x
       MAS_CATALOG_SOURCE=ibm-operator-catalog
       MAS_CATALOG_VERSION=v8-221025-amd64
       ;;
-    4|8.8.1)
+    5|8.8.1)
       MAS_CHANNEL=8.8.x
       MAS_CATALOG_SOURCE=ibm-operator-catalog
       MAS_CATALOG_VERSION=v8-220927-amd64
       ;;
-    5|8.8.0)
+    6|8.8.0)
       MAS_CHANNEL=8.8.x
       MAS_CATALOG_SOURCE=ibm-operator-catalog
       MAS_CATALOG_VERSION=v8-220805-amd64
@@ -473,7 +479,7 @@ function mirror_to_registry() {
     fi
     # IoT & Manage Dependencies
     if [[ "$MIRROR_MAS_IOT" == "true" || "$MIRROR_MAS_MANAGE" == "true" ]]; then
-      show_mirror_status " + IBM Db2 .......................... " $MIRROR_DB2U
+      show_mirror_status " + IBM Db2 .........................." $MIRROR_DB2U
     fi
   else
     echo_reset_dim "${COLOR_RED}Skip"