[PATCH] add service mesh stuff for the apps

README.md

@@ -18,4 +18,4 @@ Documentation
 Want to contribute to MAS Command Line Interface?
 -------------------------------------------------------------------------------
 We welcome every Maximo Application Suite users, developers and enthusiasts to contribute to the MAS Command Line Interface while fixing code issues and implementing new automated functionalities.
-You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.
+You can contribute to this collection by raising [a new issue](https://github.com/ibm-mas/cli/issues) with suggestions on how to make our MAS automation engine even better, or if you want to become a new code contributor, please refer to the [Contributing Guidelines](CONTRIBUTING.md) and learn more about how to get started.

catalogs/v9-260527-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 (v9-260527-amd64)
+  publisher: IBM
+  description: Static Catalog Source for IBM Maximo Application Suite
+  sourceType: grpc
+  image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:1a26902193f1d49fb37e4741e9a8f67e6e87c4db754013ec8247b5f0c689333b
+  priority: 90

catalogs/v9-260527-ppc64le.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 (v9-260527-ppc64le)
+  publisher: IBM
+  description: Static Catalog Source for IBM Maximo Application Suite
+  sourceType: grpc
+  image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:12a44d0fba01c0bc0f4f8447cc59331d60d5032b38e2e788e892d33f9ab3ad25
+  priority: 90

catalogs/v9-260527-s390x.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 (v9-260527-s390x)
+  publisher: IBM
+  description: Static Catalog Source for IBM Maximo Application Suite
+  sourceType: grpc
+  image: icr.io/cpopen/ibm-maximo-operator-catalog@sha256:090ab4b9736a6b7747fe91ca5038150321acb4b51704a0f7a3768e5423206360
+  priority: 90

docs/catalogs/v9-260527-ppc64le.md

@@ -0,0 +1,102 @@
+IBM Maximo Operator Catalog v9 (260527)
+===============================================================================
+
+:::mas-catalog-details
+
+
+
+:::mas-catalog-whats-new
+
+:::mas-catalog-known-issues
+:::mas-catalog-install
+
+:::mas-catalog-source
+
+Red Hat OpenShift Container Platform Support
+-------------------------------------------------------------------------------
+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/).
+
+IBM Maximo Application Suite customers receive a standard Red Hat OpenShift Container Platform subscription as part of their purchase. This includes 18 months of maintenance support for each OpenShift minor release.  A further 6 months support is available to purchase as an Extended Update Support (EUS) Add-on to x86-64 versions of Red Hat OpenShift Kubernetes Engine, Red Hat OpenShift Container Platform, and Red Hat OpenShift Platform Plus Standard subscriptions.
+
+:::mas-catalog-ocp-compatibility-matrix
+
+### Red Hat Operators
+The following packages from the `registry.redhat.io/redhat/redhat-operator-index` catalog are used in the Maximo Application Suite install:
+
+- **openshift-pipelines-operator-rh** required by the MAS CLI
+
+Package Manifest
+-------------------------------------------------------------------------------
+
+### IBM Maximo Application Suite
+| Package        | Default Channel   | Channel       | Latest Version                                                              |
+|----------------|-------------------|---------------|-----------------------------------------------------------------------------|
+| ibm-mas        | 9.1.x             | 9.2.x-feature | [9.2.0-pre.stable-21734](packages/ibm-mas/9.2.0-pre.stable-21734.md)        |
+|                |                   | 9.1.x         | [9.1.16](packages/ibm-mas/9.1.16.md)                                        |
+|                |                   | 9.0.x         | [9.0.24](packages/ibm-mas/9.0.24.md)                                        |
+| ibm-mas-manage | 9.1.x             | 9.2.x-feature | [9.2.0-pre.stable-21956](packages/ibm-mas-manage/9.2.0-pre.stable-21956.md) |
+|                |                   | 9.1.x         | [9.1.17](packages/ibm-mas-manage/9.1.17.md)                                 |
+|                |                   | 9.0.x         | [9.0.25](packages/ibm-mas-manage/9.0.25.md)                                 |
+
+### IBM Utilities
+| Package            | Default Channel   | Channel   | Latest Version                                |
+|--------------------|-------------------|-----------|-----------------------------------------------|
+| ibm-sls            | 3.x               | 3.x       | [3.12.8](packages/ibm-sls/3.12.8.md)          |
+| ibm-truststore-mgr | 1.x               | 1.x       | [1.7.6](packages/ibm-truststore-mgr/1.7.6.md) |
+
+### IBM Cloud Pak Foundational Services
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### IBM Cloud Pak for Data
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### IBM Db2 Universal Operator
+| Package       | Default Channel   | Channel   | Latest Version                                     |
+|---------------|-------------------|-----------|----------------------------------------------------|
+| db2u-operator | v110509.0         | v7.8      | [7.8.0](packages/db2u-operator/7.8.0.md)           |
+|               |                   | v7.7      | [7.7.0](packages/db2u-operator/7.7.0.md)           |
+|               |                   | v7.6      | [7.6.0](packages/db2u-operator/7.6.0.md)           |
+|               |                   | v7.5      | [7.5.0](packages/db2u-operator/7.5.0.md)           |
+|               |                   | v7.4      | [7.3.2](packages/db2u-operator/7.3.2.md)           |
+|               |                   | v7.3      | [7.3.0](packages/db2u-operator/7.3.0.md)           |
+|               |                   | v7.2      | [7.2.0](packages/db2u-operator/7.2.0.md)           |
+|               |                   | v7.1      | [7.1.0](packages/db2u-operator/7.1.0.md)           |
+|               |                   | v6.1      | [6.1.0](packages/db2u-operator/6.1.0.md)           |
+|               |                   | v6.0      | [6.0.0](packages/db2u-operator/6.0.0.md)           |
+|               |                   | v5.4      | [5.4.0](packages/db2u-operator/5.4.0.md)           |
+|               |                   | v5.3      | [5.3.0](packages/db2u-operator/5.3.0.md)           |
+|               |                   | v5.2      | [5.2.0](packages/db2u-operator/5.2.0.md)           |
+|               |                   | v5.1      | [5.1.0](packages/db2u-operator/5.1.0.md)           |
+|               |                   | v5.0      | [5.0.0](packages/db2u-operator/5.0.0.md)           |
+|               |                   | v4.2      | [4.2.0](packages/db2u-operator/4.2.0.md)           |
+|               |                   | v4.1      | [4.1.0](packages/db2u-operator/4.1.0.md)           |
+|               |                   | v4.0      | [4.0.0](packages/db2u-operator/4.0.0.md)           |
+|               |                   | v3.2      | [3.2.0](packages/db2u-operator/3.2.0.md)           |
+|               |                   | v3.1      | [3.1.0](packages/db2u-operator/3.1.0.md)           |
+|               |                   | v3.0      | [3.0.0](packages/db2u-operator/3.0.0.md)           |
+|               |                   | v2.2      | [2.2.0](packages/db2u-operator/2.2.0.md)           |
+|               |                   | v2.1      | [2.1.0](packages/db2u-operator/2.1.0.md)           |
+|               |                   | v2.0      | [2.0.0](packages/db2u-operator/2.0.0.md)           |
+|               |                   | v120104.0 | 120104.0.0                                         |
+|               |                   | v120103.0 | [120103.0.1](packages/db2u-operator/120103.0.1.md) |
+|               |                   | v120102.0 | [120102.0.1](packages/db2u-operator/120102.0.1.md) |
+|               |                   | v120101.0 | [120101.0.1](packages/db2u-operator/120101.0.1.md) |
+|               |                   | v120100.0 | [120100.0.0](packages/db2u-operator/120100.0.0.md) |
+|               |                   | v110509.0 | [110509.0.6](packages/db2u-operator/110509.0.6.md) |
+|               |                   | v110508.0 | [110508.0.3](packages/db2u-operator/110508.0.3.md) |
+|               |                   | v1.1      | [1.1.13](packages/db2u-operator/1.1.13.md)         |
+|               |                   | v1.0      | [1.0.11](packages/db2u-operator/1.0.11.md)         |
+
+### IBM AppConnect
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### Eclipse Amlen
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### Open Data Hub
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|

docs/catalogs/v9-260527-s390x.md

@@ -0,0 +1,102 @@
+IBM Maximo Operator Catalog v9 (260527)
+===============================================================================
+
+:::mas-catalog-details
+
+
+
+:::mas-catalog-whats-new
+
+:::mas-catalog-known-issues
+:::mas-catalog-install
+
+:::mas-catalog-source
+
+Red Hat OpenShift Container Platform Support
+-------------------------------------------------------------------------------
+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/).
+
+IBM Maximo Application Suite customers receive a standard Red Hat OpenShift Container Platform subscription as part of their purchase. This includes 18 months of maintenance support for each OpenShift minor release.  A further 6 months support is available to purchase as an Extended Update Support (EUS) Add-on to x86-64 versions of Red Hat OpenShift Kubernetes Engine, Red Hat OpenShift Container Platform, and Red Hat OpenShift Platform Plus Standard subscriptions.
+
+:::mas-catalog-ocp-compatibility-matrix
+
+### Red Hat Operators
+The following packages from the `registry.redhat.io/redhat/redhat-operator-index` catalog are used in the Maximo Application Suite install:
+
+- **openshift-pipelines-operator-rh** required by the MAS CLI
+
+Package Manifest
+-------------------------------------------------------------------------------
+
+### IBM Maximo Application Suite
+| Package        | Default Channel   | Channel       | Latest Version                                                              |
+|----------------|-------------------|---------------|-----------------------------------------------------------------------------|
+| ibm-mas        | 9.1.x             | 9.2.x-feature | [9.2.0-pre.stable-21734](packages/ibm-mas/9.2.0-pre.stable-21734.md)        |
+|                |                   | 9.1.x         | [9.1.16](packages/ibm-mas/9.1.16.md)                                        |
+|                |                   | 9.0.x         | [9.0.24](packages/ibm-mas/9.0.24.md)                                        |
+| ibm-mas-manage | 9.1.x             | 9.2.x-feature | [9.2.0-pre.stable-21956](packages/ibm-mas-manage/9.2.0-pre.stable-21956.md) |
+|                |                   | 9.1.x         | [9.1.17](packages/ibm-mas-manage/9.1.17.md)                                 |
+|                |                   | 9.0.x         | [9.0.25](packages/ibm-mas-manage/9.0.25.md)                                 |
+
+### IBM Utilities
+| Package            | Default Channel   | Channel   | Latest Version                                |
+|--------------------|-------------------|-----------|-----------------------------------------------|
+| ibm-sls            | 3.x               | 3.x       | [3.12.8](packages/ibm-sls/3.12.8.md)          |
+| ibm-truststore-mgr | 1.x               | 1.x       | [1.7.6](packages/ibm-truststore-mgr/1.7.6.md) |
+
+### IBM Cloud Pak Foundational Services
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### IBM Cloud Pak for Data
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### IBM Db2 Universal Operator
+| Package       | Default Channel   | Channel   | Latest Version                                     |
+|---------------|-------------------|-----------|----------------------------------------------------|
+| db2u-operator | v110509.0         | v7.8      | [7.8.0](packages/db2u-operator/7.8.0.md)           |
+|               |                   | v7.7      | [7.7.0](packages/db2u-operator/7.7.0.md)           |
+|               |                   | v7.6      | [7.6.0](packages/db2u-operator/7.6.0.md)           |
+|               |                   | v7.5      | [7.5.0](packages/db2u-operator/7.5.0.md)           |
+|               |                   | v7.4      | [7.3.2](packages/db2u-operator/7.3.2.md)           |
+|               |                   | v7.3      | [7.3.0](packages/db2u-operator/7.3.0.md)           |
+|               |                   | v7.2      | [7.2.0](packages/db2u-operator/7.2.0.md)           |
+|               |                   | v7.1      | [7.1.0](packages/db2u-operator/7.1.0.md)           |
+|               |                   | v6.1      | [6.1.0](packages/db2u-operator/6.1.0.md)           |
+|               |                   | v6.0      | [6.0.0](packages/db2u-operator/6.0.0.md)           |
+|               |                   | v5.4      | [5.4.0](packages/db2u-operator/5.4.0.md)           |
+|               |                   | v5.3      | [5.3.0](packages/db2u-operator/5.3.0.md)           |
+|               |                   | v5.2      | [5.2.0](packages/db2u-operator/5.2.0.md)           |
+|               |                   | v5.1      | [5.1.0](packages/db2u-operator/5.1.0.md)           |
+|               |                   | v5.0      | [5.0.0](packages/db2u-operator/5.0.0.md)           |
+|               |                   | v4.2      | [4.2.0](packages/db2u-operator/4.2.0.md)           |
+|               |                   | v4.1      | [4.1.0](packages/db2u-operator/4.1.0.md)           |
+|               |                   | v4.0      | [4.0.0](packages/db2u-operator/4.0.0.md)           |
+|               |                   | v3.2      | [3.2.0](packages/db2u-operator/3.2.0.md)           |
+|               |                   | v3.1      | [3.1.0](packages/db2u-operator/3.1.0.md)           |
+|               |                   | v3.0      | [3.0.0](packages/db2u-operator/3.0.0.md)           |
+|               |                   | v2.2      | [2.2.0](packages/db2u-operator/2.2.0.md)           |
+|               |                   | v2.1      | [2.1.0](packages/db2u-operator/2.1.0.md)           |
+|               |                   | v2.0      | [2.0.0](packages/db2u-operator/2.0.0.md)           |
+|               |                   | v120104.0 | 120104.0.0                                         |
+|               |                   | v120103.0 | [120103.0.1](packages/db2u-operator/120103.0.1.md) |
+|               |                   | v120102.0 | [120102.0.1](packages/db2u-operator/120102.0.1.md) |
+|               |                   | v120101.0 | [120101.0.1](packages/db2u-operator/120101.0.1.md) |
+|               |                   | v120100.0 | [120100.0.0](packages/db2u-operator/120100.0.0.md) |
+|               |                   | v110509.0 | [110509.0.6](packages/db2u-operator/110509.0.6.md) |
+|               |                   | v110508.0 | [110508.0.3](packages/db2u-operator/110508.0.3.md) |
+|               |                   | v1.1      | [1.1.13](packages/db2u-operator/1.1.13.md)         |
+|               |                   | v1.0      | [1.0.11](packages/db2u-operator/1.0.11.md)         |
+
+### IBM AppConnect
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### Eclipse Amlen
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|
+
+### Open Data Hub
+| Package   | Default Channel   | Channel   | Latest Version   |
+|-----------|-------------------|-----------|------------------|

python/src/mas/cli/install/catalogs.py

@@ -9,21 +9,21 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-260527-amd64",
         "v9-260430-amd64",
         "v9-260326-amd64",
         "v9-260226-amd64",
-        "v9-260216-amd64",
     ],
     "s390x": [
+        "v9-260527-s390x",
         "v9-260430-s390x",
         "v9-260326-s390x",
         "v9-260226-s390x",
-        "v9-260216-s390x",
     ],
     "ppc64le": [
+        "v9-260527-ppc64le",
         "v9-260430-ppc64le",
         "v9-260326-ppc64le",
         "v9-260226-ppc64le",
-        "v9-260216-ppc64le",
     ],
 }

tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2

@@ -24,6 +24,8 @@ spec:
       type: string
     - name: avp_aws_secret_region
       type: string
+    - name: mas-use-service-mesh
+      type: string
 
     # 1. Gitops git Parameters
     # -------------------------------------------------------------------------
@@ -3208,4 +3210,4 @@ spec:
       when:
         - input: "$(params.cp4d_action)"
           operator: in
-          values: ["uninstall", ""]
+          values: ["uninstall", ""]

tekton/src/pipelines/taskdefs/apps/assist-app.yml.j2

@@ -17,6 +17,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
 
     # Workspace
     - name: mas_workspace_id

tekton/src/pipelines/taskdefs/apps/facilities-app.yml.j2

@@ -20,6 +20,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
 
     # Workspace
     - name: mas_workspace_id

tekton/src/pipelines/taskdefs/apps/iot-app.yml.j2

@@ -20,6 +20,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
     - name: mas_app_settings_iot_deployment_size
       value: $(params.mas_app_settings_iot_deployment_size)
     - name: mas_app_settings_iot_mqttbroker_pvc_storage_class

tekton/src/pipelines/taskdefs/apps/manage-app.yml.j2

@@ -27,6 +27,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
 
     # Workspace
     - name: mas_workspace_id

tekton/src/pipelines/taskdefs/apps/monitor-app.yml.j2

@@ -20,6 +20,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
 
     # Workspace
     - name: mas_workspace_id

tekton/src/pipelines/taskdefs/apps/optimizer-app.yml.j2

@@ -21,6 +21,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
 
     # Workspace
     - name: mas_workspace_id

tekton/src/pipelines/taskdefs/apps/predict-app.yml.j2

@@ -19,6 +19,8 @@
       value: $(params.ibm_entitlement_key)
     - name: custom_labels
       value: $(params.custom_labels)
+    - name: mas_use_service_mesh
+      value: $(params.mas_use_service_mesh)
 
     # Workspace
     - name: mas_workspace_id