Skip to content

Commit 75fa209

Browse files
Jordan-Williams2Jordan-Williams2
Jordan-Williams2
authored and
Jordan-Williams2
committed
feat: onboard cloudpak 4 data
1 parent 8a7cfcc commit 75fa209

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+199
-31
lines changed

‎.catalog-onboard-pipeline.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: v1
3+
offerings:
4+
- name: deploy-arch-ibm-cloudpak-data
5+
kind: solution
6+
catalog_id: _
7+
offering_id: _
8+
variations:
9+
- name: fully-configurable
10+
mark_ready: true
11+
install_type: fullstack
12+
scc:
13+
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
14+
region: us-south

‎.releaserc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
}],
1111
["@semantic-release/exec", {
1212
"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
13+
}],
14+
["@semantic-release/exec",{
15+
"publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
1316
}]
1417
]
1518
}

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎examples/basic/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module "ocp_base" {
9595
##############################################################################
9696

9797
module "cloudpak_data" {
98-
source = "../../solutions/deploy"
98+
source = "../../solutions/fully-configurable"
9999
ibmcloud_api_key = var.ibmcloud_api_key
100100
prefix = var.prefix
101101
region = var.region

‎ibm_catalog.json‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
{
2+
"products": [
3+
{
4+
"label": "Cloud automation for Cloud Pak for Data",
5+
"name": "deploy-arch-ibm-cloudpak-data",
6+
"product_kind": "solution",
7+
"tags": [
8+
"ibm_created",
9+
"terraform",
10+
"target_terraform",
11+
"solution"
12+
],
13+
"keywords": [
14+
"IaC",
15+
"infrastructure as code",
16+
"terraform",
17+
"solution"
18+
],
19+
"provider_name": "IBM",
20+
"short_description": "Deploys Cloud Pak for Data to a cluster",
21+
"long_description": "Solution that deploys Cloud Pak for Data on an existing cluster.",
22+
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/blob/main/solutions/fully-configurable/README.md",
23+
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/main/images/cp4d-icon.svg",
24+
"flavors": [
25+
{
26+
"label": "Fully Configurable",
27+
"name": "fully-configurable",
28+
"working_directory": "solutions/fully-configurable",
29+
"iam_permissions": [
30+
{
31+
"service_name": "containers-kubernetes",
32+
"role_crns": [
33+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
34+
"crn:v1:bluemix:public:iam::::role:Viewer"
35+
]
36+
}
37+
],
38+
"architecture": {
39+
"features": [
40+
{
41+
"title": "Works with any Openshift or k8s cluster",
42+
"description": "No, must meet minimum requirements to install Cloud Pak for Data and Watson services you wish to add."
43+
},
44+
{
45+
"title": "Deploys the Cloud Pak for Data on an existing cluster.",
46+
"description": "Yes"
47+
}
48+
],
49+
"diagrams": [
50+
{
51+
"diagram": {
52+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/refs/heads/main/reference-architecture/deployable-architecture-cp4d.svg",
53+
"caption": "Cloud Pak for Data on a cluster",
54+
"type": "image/svg+xml"
55+
},
56+
"description": "Cloud Pak for Data deployed on a cluster."
57+
}
58+
]
59+
},
60+
"configuration": [
61+
{
62+
"key": "ibmcloud_api_key",
63+
"required": true
64+
},
65+
{
66+
"key": "prefix"
67+
},
68+
{
69+
"key": "region"
70+
},
71+
{
72+
"key": "cluster_name",
73+
"custom_config": {
74+
"type": "cluster_var",
75+
"grouping": "deployment",
76+
"original_grouping": "deployment"
77+
},
78+
"required": true
79+
},
80+
{
81+
"key": "cluster_rg_id",
82+
"custom_config": {
83+
"type": "resource_group",
84+
"grouping": "deployment",
85+
"original_grouping": "deployment",
86+
"config_constraints": {
87+
"identifier": "rg_id"
88+
}
89+
},
90+
"required": true
91+
},
92+
{
93+
"key": "resource_group",
94+
"custom_config": {
95+
"type": "resource_group",
96+
"grouping": "deployment",
97+
"original_grouping": "deployment",
98+
"config_constraints": {
99+
"identifier": "rg_id"
100+
}
101+
}
102+
},
103+
{
104+
"key": "code_engine_project_name"
105+
},
106+
{
107+
"key": "code_engine_project_id"
108+
},
109+
{
110+
"key": "cloud_pak_deployer_image"
111+
},
112+
{
113+
"key": "cloud_pak_deployer_release"
114+
},
115+
{
116+
"key": "cloud_pak_deployer_secret"
117+
},
118+
{
119+
"key": "install_odf_cluster_addon"
120+
},
121+
{
122+
"key": "odf_version"
123+
},
124+
{
125+
"key": "odf_config"
126+
},
127+
{
128+
"key": "cpd_accept_license"
129+
},
130+
{
131+
"key": "cpd_admin_password"
132+
},
133+
{
134+
"key": "cpd_entitlement_key"
135+
},
136+
{
137+
"key": "cpd_version"
138+
},
139+
{
140+
"key": "watsonx_ai_install"
141+
},
142+
{
143+
"key": "watsonx_ai_models"
144+
},
145+
{
146+
"key": "watsonx_data_install"
147+
},
148+
{
149+
"key": "watson_discovery_install"
150+
},
151+
{
152+
"key": "watson_assistant_install"
153+
}
154+
],
155+
"install_type": "fullstack"
156+
}
157+
]
158+
}
159+
]
160+
}

‎solutions/deploy/cloud-pak-deployer/outputs.tf‎ renamed to ‎images/cp4d-icon.svg‎

File renamed without changes.

‎solutions/deploy/watsonx-ai/data.tf‎ renamed to ‎reference-architecture/deployable-architecture-cp4d.svg‎

File renamed without changes.

‎solutions/deploy/README.md‎ renamed to ‎solutions/fully-configurable/README.md‎

Lines changed: 9 additions & 10 deletions

‎solutions/fully-configurable/catalogValidationValues.json.template‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"ibmcloud_api_key": $VALIDATION_APIKEY,
3+
"prefix": $PREFIX,
4+
"region": "us-south"
5+
}

‎solutions/deploy/cloud-pak-deployer/.secrets.baseline‎ renamed to ‎solutions/fully-configurable/cloud-pak-deployer/.secrets.baseline‎

File renamed without changes.

0 commit comments

Comments
 (0)