DA cleanup

.catalog-onboard-pipeline.yaml

@@ -4,7 +4,7 @@ offerings:
   - name: deploy-arch-ibm-watsonx-self-managed
     kind: solution
     catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
-    offering_id: 86425cf1-a763-4d17-9bb9-75276274a5f6
+    offering_id: 3b9ffe49-80e7-417b-9179-a2882d3c2517
     variations:
       - name: fully-configurable
         mark_ready: true

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-02-11T22:49:04Z",
+  "generated_at": "2025-06-27T16:17:07Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -76,7 +76,46 @@
       "name": "TwilioKeyDetector"
     }
   ],
-  "results": {},
+  "results": {
+    "README.md": [
+      {
+        "hashed_secret": "bcf22dfc6fb76b7366b1f1675baf2332a0e6a7ce",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 43,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 105,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "modules/cpd-image-build/README.md": [
+      {
+        "hashed_secret": "49901d945ad6da0f0af47691f305daf994d9d2c9",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 11,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "solutions/fully-configurable/DA-types.md": [
+      {
+        "hashed_secret": "fdd55a32cde0ab9bbb89037c7ab4203633cf5558",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 21,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ]
+  },
   "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,

examples/basic/main.tf

@@ -1,8 +1,10 @@
 ##############################################################################
+# Locals
+##############################################################################
+
 locals {
   cluster_name = var.existing_cluster_name != null ? var.existing_cluster_name : module.ocp_base[0].cluster_name
 }
-###############################################################################
 
 ##############################################################################
 # Resource Group
@@ -93,7 +95,7 @@ module "ocp_base" {
   vpc_id                              = ibm_is_vpc.vpc.id
   vpc_subnets                         = local.cluster_vpc_subnets
   worker_pools                        = local.worker_pools
-  disable_outbound_traffic_protection = true # set as True to enable outbound traffic
+  disable_outbound_traffic_protection = true # set as True to enable outbound traffic to allow image to be pulled from quay.io
 }
 
 ##############################################################################
@@ -103,13 +105,9 @@ module "ocp_base" {
 module "watsonx_self_managed_ocp" {
   source                    = "../.."
   ibmcloud_api_key          = var.ibmcloud_api_key
-  prefix                    = var.prefix
   region                    = var.region
   cluster_name              = local.cluster_name
-  cluster_rg_id             = module.resource_group.resource_group_id
-  cloud_pak_deployer_image  = "quay.io/cloud-pak-deployer/cloud-pak-deployer"
-  cpd_admin_password        = "Passw0rd" #pragma: allowlist secret
-  cpd_entitlement_key       = "entitlementKey"
-  install_odf_cluster_addon = var.install_odf_cluster_addon
-  watsonx_ai_install        = false
+  cluster_resource_group_id = module.resource_group.resource_group_id
+  cpd_admin_password        = var.cpd_admin_password
+  cpd_entitlement_key       = var.cpd_entitlement_key
 }

examples/basic/variables.tf

@@ -31,20 +31,26 @@ variable "resource_tags" {
   default     = []
 }
 
-variable "install_odf_cluster_addon" {
-  description = "Install the odf cluster addon"
-  type        = bool
-  default     = false
-}
-
 variable "existing_cluster_name" {
   description = "Existing cluster name"
   type        = string
   default     = null
 }
 
 variable "resource_group" {
-  description = "Existing resource group name"
   type        = string
+  description = "The name of an existing resource group to provision resources in to. If not set a new resource group will be created using the prefix variable."
   default     = null
 }
+
+variable "cpd_admin_password" {
+  description = "Password for the Cloud Pak for Data admin user."
+  sensitive   = true
+  type        = string
+}
+
+variable "cpd_entitlement_key" {
+  description = "Cloud Pak for Data entitlement key for access to the IBM Entitled Registry. Can be fetched from https://myibm.ibm.com/products-services/containerlibrary."
+  sensitive   = true
+  type        = string
+}

ibm_catalog.json

@@ -1,7 +1,7 @@
 {
   "products": [
     {
-      "label": "Watsonx (Self-Managed) on Red Hat OpenShift",
+      "label": "watsonx self-managed on Red Hat OpenShift",
       "name": "deploy-arch-ibm-watsonx-self-managed",
       "product_kind": "solution",
       "tags": [
@@ -28,6 +28,7 @@
       "long_description": "Solution that deploys Watsonx services (watsonx.ai, watsonx.data, Watson Assistant, Watson Discovery) on an existing Red Hat OpenShift cluster.",
       "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-watsonx-self-managed-ocp/blob/main/solutions/fully-configurable/README.md",
       "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-watsonx-self-managed-ocp/main/images/watsonx-self-managed-ocp.svg",
+      "support_details": "This product is in the community registry, as such support is handled through the originated repo. If you experience issues please open an issue in the following [issues repository](https://github.com/terraform-ibm-modules/terraform-ibm-watsonx-self-managed-ocp/issues). Please note this product is not supported via the IBM Cloud Support Center.",
       "features": [
         {
           "title": "Flexible Cluster Deployment",
@@ -52,23 +53,41 @@
           "name": "fully-configurable",
           "working_directory": "solutions/fully-configurable",
           "iam_permissions": [
+            {
+              "role_crns": [
+                "crn:v1:bluemix:public:iam::::role:Viewer"
+              ],
+              "service_name": "Resource group only",
+              "notes": "Viewer access is required in the resource group you want to provision in."
+            },
             {
               "service_name": "containers-kubernetes",
               "role_crns": [
                 "crn:v1:bluemix:public:iam::::serviceRole:Manager",
                 "crn:v1:bluemix:public:iam::::role:Viewer"
               ]
+            },
+            {
+              "role_crns": [
+                "crn:v1:bluemix:public:iam::::role:Editor"
+              ],
+              "service_name": "codeengine",
+              "notes": "[Optional] Required if building image."
+            },
+            {
+              "role_crns": [
+                "crn:v1:bluemix:public:iam::::serviceRole:Manager",
+                "crn:v1:bluemix:public:iam::::role:Editor"
+              ],
+              "service_name": "container-registry",
+              "notes": "[Optional] Required if building image."
             }
           ],
           "architecture": {
             "features": [
               {
-                "title": "Cluster must meet minimum requirements to install any Watson services you wish to add.",
-                "description": "Yes"
-              },
-              {
-                "title": "Deploys Watsonx services on an existing cluster.",
-                "description": "Yes"
+                "title": " ",
+                "description": "Configured to use IBM secure by default standards, but can be edited to fit your use case."
               }
             ],
             "diagrams": [
@@ -92,52 +111,57 @@
               "required": true
             },
             {
-              "key": "region",
-              "required": true
-            },
-            {
-              "key": "existing_cluster_name",
-              "required": true
+              "key": "existing_cluster_id",
+              "display_name": "existing_cluster",
+              "required": true,
+              "custom_config": {
+                "type": "cluster_var",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
-              "key": "existing_resource_group_name",
+              "key": "existing_cluster_resource_group_name",
               "custom_config": {
                 "type": "resource_group",
                 "grouping": "deployment",
                 "original_grouping": "deployment",
                 "config_constraints": {
-                  "identifier": "rg_id"
+                  "identifier": "rg_name"
                 }
               },
               "required": true
             },
             {
-              "key": "install_odf_cluster_addon",
+              "key": "cpd_entitlement_key",
               "required": true
             },
             {
-              "key": "cpd_entitlement_key",
-              "required": true
+              "key": "cpd_accept_license"
             },
             {
-              "key": "watsonx_ai_install",
-              "required": true
+              "key": "cpd_admin_password"
             },
             {
-              "key": "watsonx_ai_models",
-              "required": true
+              "key": "cpd_version"
             },
             {
-              "key": "watsonx_data_install",
-              "required": true
+              "key": "watsonx_ai_install"
             },
             {
-              "key": "watson_discovery_install",
-              "required": true
+              "key": "watsonx_ai_models"
             },
             {
-              "key": "watson_assistant_install",
-              "required": true
+              "key": "watsonx_data_install"
+            },
+            {
+              "key": "watson_discovery_install"
+            },
+            {
+              "key": "watson_assistant_install"
+            },
+            {
+              "key": "cloud_pak_deployer_image"
             },
             {
               "key": "code_engine_project_name"
@@ -146,28 +170,43 @@
               "key": "code_engine_project_id"
             },
             {
-              "key": "cloud_pak_deployer_image"
+              "key": "existing_resource_group_name",
+              "custom_config": {
+                "type": "resource_group",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "identifier": "rg_name"
+                }
+              }
             },
             {
-              "key": "cloud_pak_deployer_release"
+              "key": "container_registry_namespace"
             },
             {
-              "key": "cloud_pak_deployer_secret"
+              "key": "region"
             },
             {
-              "key": "odf_version"
+              "key": "use_global_container_registry_location"
             },
             {
-              "key": "odf_config"
+              "key": "cloud_pak_deployer_release"
             },
             {
-              "key": "cpd_accept_license"
+              "key": "cloud_pak_deployer_secret"
             },
             {
-              "key": "cpd_admin_password"
+              "key": "install_odf_cluster_addon"
             },
             {
-              "key": "cpd_version"
+              "key": "odf_version"
+            },
+            {
+              "key": "odf_config"
+            },
+            {
+              "key": "provider_visibility",
+              "hidden": true
             }
           ],
           "install_type": "fullstack"