Skip to content

Commit cd1e7ea

Browse files
ocofaighocofaigh
authored
feat: DA cleanup (#43)
1 parent 5af4169 commit cd1e7ea

28 files changed

+756
-694
lines changed

‎.catalog-onboard-pipeline.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ offerings:
44
- name: deploy-arch-ibm-watsonx-self-managed
55
kind: solution
66
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
7-
offering_id: 86425cf1-a763-4d17-9bb9-75276274a5f6
7+
offering_id: 3b9ffe49-80e7-417b-9179-a2882d3c2517
88
variations:
99
- name: fully-configurable
1010
mark_ready: true

‎.secrets.baseline‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-02-11T22:49:04Z",
6+
"generated_at": "2025-06-27T16:17:07Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -76,7 +76,46 @@
7676
"name": "TwilioKeyDetector"
7777
}
7878
],
79-
"results": {},
79+
"results": {
80+
"README.md": [
81+
{
82+
"hashed_secret": "bcf22dfc6fb76b7366b1f1675baf2332a0e6a7ce",
83+
"is_secret": false,
84+
"is_verified": false,
85+
"line_number": 43,
86+
"type": "Secret Keyword",
87+
"verified_result": null
88+
},
89+
{
90+
"hashed_secret": "2254481e1661d8f017a712b0d1ad9a14fd9460a3",
91+
"is_secret": false,
92+
"is_verified": false,
93+
"line_number": 105,
94+
"type": "Secret Keyword",
95+
"verified_result": null
96+
}
97+
],
98+
"modules/cpd-image-build/README.md": [
99+
{
100+
"hashed_secret": "49901d945ad6da0f0af47691f305daf994d9d2c9",
101+
"is_secret": false,
102+
"is_verified": false,
103+
"line_number": 11,
104+
"type": "Secret Keyword",
105+
"verified_result": null
106+
}
107+
],
108+
"solutions/fully-configurable/DA-types.md": [
109+
{
110+
"hashed_secret": "fdd55a32cde0ab9bbb89037c7ab4203633cf5558",
111+
"is_secret": false,
112+
"is_verified": false,
113+
"line_number": 21,
114+
"type": "Secret Keyword",
115+
"verified_result": null
116+
}
117+
]
118+
},
80119
"version": "0.13.1+ibm.62.dss",
81120
"word_list": {
82121
"file": null,

‎README.md‎

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

‎examples/basic/main.tf‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
##############################################################################
2+
# Locals
3+
##############################################################################
4+
25
locals {
36
cluster_name = var.existing_cluster_name != null ? var.existing_cluster_name : module.ocp_base[0].cluster_name
47
}
5-
###############################################################################
68

79
##############################################################################
810
# Resource Group
@@ -93,7 +95,7 @@ module "ocp_base" {
9395
vpc_id = ibm_is_vpc.vpc.id
9496
vpc_subnets = local.cluster_vpc_subnets
9597
worker_pools = local.worker_pools
96-
disable_outbound_traffic_protection = true # set as True to enable outbound traffic
98+
disable_outbound_traffic_protection = true # set as True to enable outbound traffic to allow image to be pulled from quay.io
9799
}
98100

99101
##############################################################################
@@ -103,13 +105,9 @@ module "ocp_base" {
103105
module "watsonx_self_managed_ocp" {
104106
source = "../.."
105107
ibmcloud_api_key = var.ibmcloud_api_key
106-
prefix = var.prefix
107108
region = var.region
108109
cluster_name = local.cluster_name
109-
cluster_rg_id = module.resource_group.resource_group_id
110-
cloud_pak_deployer_image = "quay.io/cloud-pak-deployer/cloud-pak-deployer"
111-
cpd_admin_password = "Passw0rd" #pragma: allowlist secret
112-
cpd_entitlement_key = "entitlementKey"
113-
install_odf_cluster_addon = var.install_odf_cluster_addon
114-
watsonx_ai_install = false
110+
cluster_resource_group_id = module.resource_group.resource_group_id
111+
cpd_admin_password = var.cpd_admin_password
112+
cpd_entitlement_key = var.cpd_entitlement_key
115113
}

‎examples/basic/variables.tf‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,26 @@ variable "resource_tags" {
3131
default = []
3232
}
3333

34-
variable "install_odf_cluster_addon" {
35-
description = "Install the odf cluster addon"
36-
type = bool
37-
default = false
38-
}
39-
4034
variable "existing_cluster_name" {
4135
description = "Existing cluster name"
4236
type = string
4337
default = null
4438
}
4539

4640
variable "resource_group" {
47-
description = "Existing resource group name"
4841
type = string
42+
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."
4943
default = null
5044
}
45+
46+
variable "cpd_admin_password" {
47+
description = "Password for the Cloud Pak for Data admin user."
48+
sensitive = true
49+
type = string
50+
}
51+
52+
variable "cpd_entitlement_key" {
53+
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."
54+
sensitive = true
55+
type = string
56+
}

‎ibm_catalog.json‎

Lines changed: 71 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"products": [
33
{
4-
"label": "Watsonx (Self-Managed) on Red Hat OpenShift",
4+
"label": "watsonx self-managed on Red Hat OpenShift",
55
"name": "deploy-arch-ibm-watsonx-self-managed",
66
"product_kind": "solution",
77
"tags": [
@@ -28,6 +28,7 @@
2828
"long_description": "Solution that deploys Watsonx services (watsonx.ai, watsonx.data, Watson Assistant, Watson Discovery) on an existing Red Hat OpenShift cluster.",
2929
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-watsonx-self-managed-ocp/blob/main/solutions/fully-configurable/README.md",
3030
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-watsonx-self-managed-ocp/main/images/watsonx-self-managed-ocp.svg",
31+
"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.",
3132
"features": [
3233
{
3334
"title": "Flexible Cluster Deployment",
@@ -52,23 +53,41 @@
5253
"name": "fully-configurable",
5354
"working_directory": "solutions/fully-configurable",
5455
"iam_permissions": [
56+
{
57+
"role_crns": [
58+
"crn:v1:bluemix:public:iam::::role:Viewer"
59+
],
60+
"service_name": "Resource group only",
61+
"notes": "Viewer access is required in the resource group you want to provision in."
62+
},
5563
{
5664
"service_name": "containers-kubernetes",
5765
"role_crns": [
5866
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
5967
"crn:v1:bluemix:public:iam::::role:Viewer"
6068
]
69+
},
70+
{
71+
"role_crns": [
72+
"crn:v1:bluemix:public:iam::::role:Editor"
73+
],
74+
"service_name": "codeengine",
75+
"notes": "[Optional] Required if building image."
76+
},
77+
{
78+
"role_crns": [
79+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
80+
"crn:v1:bluemix:public:iam::::role:Editor"
81+
],
82+
"service_name": "container-registry",
83+
"notes": "[Optional] Required if building image."
6184
}
6285
],
6386
"architecture": {
6487
"features": [
6588
{
66-
"title": "Cluster must meet minimum requirements to install any Watson services you wish to add.",
67-
"description": "Yes"
68-
},
69-
{
70-
"title": "Deploys Watsonx services on an existing cluster.",
71-
"description": "Yes"
89+
"title": " ",
90+
"description": "Configured to use IBM secure by default standards, but can be edited to fit your use case."
7291
}
7392
],
7493
"diagrams": [
@@ -92,29 +111,27 @@
92111
"required": true
93112
},
94113
{
95-
"key": "region",
96-
"required": true
97-
},
98-
{
99-
"key": "existing_cluster_name",
100-
"required": true
114+
"key": "existing_cluster_id",
115+
"display_name": "existing_cluster",
116+
"required": true,
117+
"custom_config": {
118+
"type": "cluster_var",
119+
"grouping": "deployment",
120+
"original_grouping": "deployment"
121+
}
101122
},
102123
{
103-
"key": "existing_resource_group_name",
124+
"key": "existing_cluster_resource_group_name",
104125
"custom_config": {
105126
"type": "resource_group",
106127
"grouping": "deployment",
107128
"original_grouping": "deployment",
108129
"config_constraints": {
109-
"identifier": "rg_id"
130+
"identifier": "rg_name"
110131
}
111132
},
112133
"required": true
113134
},
114-
{
115-
"key": "install_odf_cluster_addon",
116-
"required": true
117-
},
118135
{
119136
"key": "cpd_entitlement_key",
120137
"required": true
@@ -139,35 +156,62 @@
139156
"key": "watson_assistant_install",
140157
"required": true
141158
},
159+
{
160+
"key": "cpd_accept_license"
161+
},
162+
{
163+
"key": "cpd_admin_password"
164+
},
165+
{
166+
"key": "cpd_version"
167+
},
168+
{
169+
"key": "cloud_pak_deployer_image"
170+
},
142171
{
143172
"key": "code_engine_project_name"
144173
},
145174
{
146175
"key": "code_engine_project_id"
147176
},
148177
{
149-
"key": "cloud_pak_deployer_image"
178+
"key": "existing_resource_group_name",
179+
"custom_config": {
180+
"type": "resource_group",
181+
"grouping": "deployment",
182+
"original_grouping": "deployment",
183+
"config_constraints": {
184+
"identifier": "rg_name"
185+
}
186+
}
150187
},
151188
{
152-
"key": "cloud_pak_deployer_release"
189+
"key": "container_registry_namespace"
153190
},
154191
{
155-
"key": "cloud_pak_deployer_secret"
192+
"key": "region"
156193
},
157194
{
158-
"key": "odf_version"
195+
"key": "use_global_container_registry_location"
159196
},
160197
{
161-
"key": "odf_config"
198+
"key": "cloud_pak_deployer_release"
162199
},
163200
{
164-
"key": "cpd_accept_license"
201+
"key": "cloud_pak_deployer_secret"
165202
},
166203
{
167-
"key": "cpd_admin_password"
204+
"key": "install_odf_cluster_addon"
168205
},
169206
{
170-
"key": "cpd_version"
207+
"key": "odf_version"
208+
},
209+
{
210+
"key": "odf_config"
211+
},
212+
{
213+
"key": "provider_visibility",
214+
"hidden": true
171215
}
172216
],
173217
"install_type": "fullstack"

0 commit comments

Comments
 (0)