Skip to content
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
680d4e2
feat: Migration to landing zone OCP DA
Aditya-ranjan-16 Jul 17, 2025
9d39d62
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Jul 17, 2025
f263c4c
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Jul 20, 2025
479dab3
fix
Aditya-ranjan-16 Jul 20, 2025
fdb68bf
fix
Aditya-ranjan-16 Jul 20, 2025
cc8bc56
fix
Aditya-ranjan-16 Jul 21, 2025
e21a6a7
fix: catalog
Aditya-ranjan-16 Jul 21, 2025
6184536
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Jul 23, 2025
0080c6e
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Jul 23, 2025
70a72eb
fix: catalog
Aditya-ranjan-16 Jul 24, 2025
77953ee
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Jul 25, 2025
5ed0960
fix
Aditya-ranjan-16 Jul 25, 2025
e3f5e52
fix
Aditya-ranjan-16 Jul 25, 2025
273a760
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Jul 29, 2025
c1a47a2
fix: added link
Aditya-ranjan-16 Jul 29, 2025
373052f
fix: content
Aditya-ranjan-16 Jul 30, 2025
6d9dc40
test: catalog
Aditya-ranjan-16 Jul 30, 2025
8b7aef6
test
Aditya-ranjan-16 Jul 30, 2025
bfcc933
test
Aditya-ranjan-16 Jul 30, 2025
c70bbef
test
Aditya-ranjan-16 Jul 31, 2025
35d461c
fix
Aditya-ranjan-16 Aug 8, 2025
03016d0
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Aug 8, 2025
a4af637
add: quickstart
Aditya-ranjan-16 Aug 8, 2025
d1a8cff
fix
Aditya-ranjan-16 Aug 8, 2025
ba23470
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Aug 8, 2025
7a9f77c
Update ibm_catalog.json
Aditya-ranjan-16 Aug 8, 2025
5e2bcca
fix
Aditya-ranjan-16 Aug 8, 2025
33e710d
catalog update
Aditya-ranjan-16 Aug 8, 2025
72ecdd9
fix
Aditya-ranjan-16 Aug 8, 2025
eaeaa8d
fix
Aditya-ranjan-16 Aug 8, 2025
5c4fa23
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Aug 8, 2025
df58fde
fix
Aditya-ranjan-16 Aug 12, 2025
e87c647
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Aug 18, 2025
0997382
fix
Aditya-ranjan-16 Aug 18, 2025
492adc9
Merge branch 'main' into landing-zone-variation
vburckhardt Aug 19, 2025
c1cc3c0
fix: addresed comments
Aditya-ranjan-16 Aug 19, 2025
393fdce
fix
Aditya-ranjan-16 Aug 19, 2025
fbf1e53
fix
Aditya-ranjan-16 Aug 20, 2025
c35b8b2
fix
Aditya-ranjan-16 Aug 20, 2025
7f372d6
fix index
Aditya-ranjan-16 Aug 20, 2025
b3bcd52
fix
Aditya-ranjan-16 Aug 20, 2025
24d6896
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Aug 21, 2025
6ec37eb
fix name
Aditya-ranjan-16 Aug 21, 2025
82e598a
fix
Aditya-ranjan-16 Aug 21, 2025
723aa8e
fix
Aditya-ranjan-16 Aug 21, 2025
13898f6
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Aug 28, 2025
e435fe0
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Sep 4, 2025
e362da3
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Sep 5, 2025
458f733
updates
Aditya-ranjan-16 Sep 5, 2025
094d26b
fix icon
Aditya-ranjan-16 Sep 5, 2025
08dedcf
fix
Aditya-ranjan-16 Sep 5, 2025
66896b8
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Sep 9, 2025
baabefd
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Sep 9, 2025
b636de0
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Sep 9, 2025
229f51f
updates
Aditya-ranjan-16 Sep 9, 2025
d35388e
Merge branch 'main' into landing-zone-variation
Aditya-ranjan-16 Sep 10, 2025
d8b2ef8
fix
Aditya-ranjan-16 Sep 10, 2025
f9a2c46
updated tags
maheshwarishikha Sep 10, 2025
6a0a2af
updated features desc
maheshwarishikha Sep 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .catalog-onboard-pipeline.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
---
apiVersion: v1
offerings:
- name: deploy-arch-ibm-ocp-vpc
- name: deploy-arch-ibm-slz-ocp
kind: solution
catalog_id: f64499c8-eb50-4985-bf91-29f9e605a433
offering_id: 1728a4fd-f561-4cf9-82ef-2b1eeb5da1a8
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
offering_id: 95fccffc-ae3b-42df-b6d9-80be5914d852
include_git_submodules: true
variations:
- name: fully-configurable
mark_ready: true
mark_ready: false
install_type: fullstack
pre_validation: "tests/scripts/pre-validation-deploy-cos-instance-and-vpc.sh"
post_validation: "tests/scripts/post-validation-destroy-cos-instance-and-vpc.sh"
Expand All @@ -16,5 +17,5 @@ offerings:
region: us-south
scope_resource_group_var_name: existing_resource_group_name
- name: quickstart
mark_ready: true
mark_ready: false
install_type: fullstack
2 changes: 1 addition & 1 deletion .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-07-31T06:11:34Z",
"generated_at": "2025-08-08T07:10:00Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down
60 changes: 33 additions & 27 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,44 @@
{
"products": [
{
"name": "deploy-arch-ibm-ocp-vpc",
"label": "Cloud automation for Red Hat OpenShift Container Platform on VPC",
"name": "deploy-arch-ibm-slz-ocp",
"label": "Red Hat OpenShift Container Platform on VPC landing zone",
"product_kind": "solution",
"tags": [
"compute",
"ibm_created",
"target_terraform",
"terraform",
"solution",
"containers",
"converged_infra"
"reference_architecture",
"solution"
],
"keywords": [
"vpc",
"slz",
"IaC",
"infrastructure as code",
"terraform",
"ocp",
"cluster",
"red_hat_openshift"
"solution",
"Red Hat OpenShift Container Platform",
"OCP"
],
"short_description": "Automates the deployment of Red Hat OpenShift container platform on IBM Cloud with optional integration of security and logging services.",
"long_description": "The Cloud automation for Red Hat OpenShift Container Platform on VPC enables a scalable and flexible cloud environment for containerized applications with seamless integration to other security and observability services. This architecture can be deployed independently while also serving as a foundational deployable architecture for other architectures like [Cloud automation for Red Hat OpenShift AI](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-ocp-ai-ba708aed-bb8a-4ac0-83a7-53a066701db5-global) to deploy mission critical applications and AI-driven initiatives to market quickly and securely with a managed OpenShift service.\n\nℹ️ This Terraform-based automation is part of a broader suite of IBM-maintained Infrastructure as Code (IaC) assets, each following the naming pattern \"Cloud automation for *servicename*\" and focusing on single IBM Cloud service. These single-service deployable architectures can be used on their own to streamline and automate service deployments through an [IaC approach](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects), or assembled together into a broader [automated IaC stack](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-config-stack) to automate the deployment of an end-to-end solution architecture.",
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/blob/main/README.md",
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/main/images/ocp_icon.svg",
"short_description": "Creates Red Hat OpenShift workload clusters on IBM Cloud within a secure VPC network, with optional integration of security and logging services",
"long_description": "This Deployable Architecture deploys a Red Hat OpenShift Container Platform cluster on Virtual Private Cloud (VPC), enabling a scalable and flexible cloud environment for containerized applications with seamless integration to security and observability services. The VPC is implemented as a multi-zone, multi-subnet architecture, ensuring that your environment remains secure and highly available.",
"offering_docs_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-overview#overview-ocp",
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/.docs/images/deploy-arch-slz-ocp-lt.svg",
"provider_name": "IBM",
"features": [
{
"title": "Red Hat OpenShift Cluster",
"description": "Creates a [Red Hat OpenShift Cluster](https://cloud.ibm.com/docs/openshift) on IBM Cloud that helps businesses manage their containerized applications at scale with added enterprise features such as security, scalability, and automation."
},
{
"title": "Worker pools",
"description": "Configures worker pools in cluster through which you can group and manage [worker nodes](https://cloud.ibm.com/docs/openshift?topic=openshift-add-workers-vpc) of similar configurations, such as compute resources and availability zones."
"description": "Configures worker pools in cluster through which you can group and manage [worker nodes](https://cloud.ibm.com/docs/openshift?topic=openshift-add-workers-vpc) of similar configurations, such as compute resources and availability zones.",
"title": "Worker pools"
},
{
"description": "Configures the [subnets](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-subnets&interface=ui#vpc_basics_subnets) for the cluster, and specifies the subnets to deploy the worker nodes in.",
"title": "Subnets"
},
{
"title": "Access Endpoints",
Expand All @@ -54,19 +62,18 @@
},
{
"title": "Observability",
"description": "This solution can leverage [Cloud automation for Observability](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-observability-a3137d28-79e0-479d-8a24-758ebd5a0eab-global) that supports configuring resources for logging, monitoring and activity tracker event routing (optional)."
"description": "This solution can leverage Observability that supports configuring resources for logging, monitoring and activity tracker event routing (optional)."
},
{
"title": "Kube Audit",
"description": "Deploys the Kube Audit solution to monitor and log Kubernetes API server activity. It captures events such as user actions, configuration changes, and access attempts, helping meet security and compliance requirements through centralized [audit logging](https://cloud.ibm.com/docs/containers?topic=containers-health-audit#audit-api-server)."
}
],
"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 repository [here](https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/issues). Please note this product is not supported via the IBM Cloud Support Center.",
"flavors": [
{
"label": "Fully configurable",
"label": "[Experimental] Fully configurable",
"index":3,
"name": "fully-configurable",
"index": 2,
"install_type": "fullstack",
"working_directory": "solutions/fully-configurable",
"compliance": {
Expand Down Expand Up @@ -176,11 +183,11 @@
"diagrams": [
{
"diagram": {
"caption": "Red Hat OpenShift cluster topology",
"caption": "Red Hat OpenShift cluster topology - Fully configurable",
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/refs/heads/main/reference-architecture/deployable-architecture-ocp-cluster.svg",
"type": "image/svg+xml"
},
"description": "This architecture supports creation of <b>Red Hat OpenShift cluster</b> within a Virtual Private Cloud (VPC).<br><br>You can create a fully-configured <b>VPC</b> by selecting the [Cloud automation for VPC](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-vpc-2af61763-f8ef-4527-a815-b92166f29bc8-global) dependency or you can use an existing VPC if any. The VPC can be provisioned either in a single-zone or multi-zone configuration, depending on your availability requirements. By default, the VPC addon provisions a three-zone VPC, forming the foundation for your OpenShift cluster. This cluster includes a single worker pool distributed across all three zones, with two worker nodes per zone. If you need additional worker pools, you can easily configure them using the <b>additional_worker_pools</b> variable.<br><br>A <b>Cloud Object Storage (COS)</b> instance is required for this topology. Within this instance, an Object Storage bucket will be created, which serves as the internal registry storage for the OpenShift cluster. The [Cloud automation for Object Storage](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-cos-68921490-2778-4930-ac6d-bae7be6cd958-global) architecture supports the creation of COS instance. Additionally, the storage bucket can be encrypted using <b>Key Management Services(KMS)</b> to enhance security.<br><br>For logging and monitoring needs, you can enable <b>Observability</b> for your cluster. [Cloud automation for Observability](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-observability-a3137d28-79e0-479d-8a24-758ebd5a0eab-global) provides advanced monitoring, logging, and operational insights into the performance and health of your deployment.<br><br><b>Secrets Manager</b> Integration can also be enabled using [Cloud automation for Secrets Manager](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/dep[…]bm-secrets-manager-6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global) for centrally managing Ingress subdomain certificates, ensuring secure management of sensitive credentials.<br><br>This architecture provides a robust and secure foundation for deploying and managing your Red Hat OpenShift cluster, enabling seamless integration, enhanced security, and comprehensive monitoring for your cloud-native applications."
"description": "This architecture supports creation of <b>Red Hat OpenShift cluster</b> within a Virtual Private Cloud (VPC). The architecture can be deployed independently or serve as a foundational building block for other solutions, such as [Cloud automation for Red Hat OpenShift AI](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-ocp-ai-ba708aed-bb8a-4ac0-83a7-53a066701db5-global)<br><br>You can create a fully-configured <b>VPC</b> by selecting the [Cloud automation for VPC](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-vpc-2af61763-f8ef-4527-a815-b92166f29bc8-global) dependency or you can use an existing VPC if any. The VPC can be provisioned either in a single-zone or multi-zone configuration, depending on your availability requirements. By default, the VPC addon provisions a three-zone VPC, forming the foundation for your OpenShift cluster. This cluster includes a single worker pool distributed across all three zones, with two worker nodes per zone. If you need additional worker pools, you can easily configure them using the <b>additional_worker_pools</b> variable.<br><br>A <b>Cloud Object Storage (COS)</b> instance is required for this topology. Within this instance, an Object Storage bucket will be created, which serves as the internal registry storage for the OpenShift cluster. The [Cloud automation for Object Storage](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-cos-68921490-2778-4930-ac6d-bae7be6cd958-global) architecture supports the creation of COS instance. Additionally, the storage bucket can be encrypted using <b>Key Management Services(KMS)</b> to enhance security.<br><br>For logging and monitoring needs, you can enable <b>Observability</b> for your cluster, providing advanced monitoring, logging, and operational insights into the performance and health of your deployment.<br><br><b>Secrets Manager</b> Integration can also be enabled using [Cloud automation for Secrets Manager](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/dep[…]bm-secrets-manager-6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global) for centrally managing Ingress subdomain certificates, ensuring secure management of sensitive credentials.<br><br>This architecture provides a robust and secure foundation for deploying and managing your Red Hat OpenShift cluster, enabling seamless integration, enhanced security, and comprehensive monitoring for your cloud-native applications."
}
]
},
Expand Down Expand Up @@ -451,10 +458,6 @@
"key": "existing_cos_instance_crn",
"required": true
},
{
"key": "disable_public_endpoint",
"required": true
},
{
"key": "enable_platform_metrics",
"type": "string",
Expand Down Expand Up @@ -600,6 +603,9 @@
{
"key": "use_private_endpoint"
},
{
"key": "disable_public_endpoint"
},
{
"key": "cluster_config_endpoint_type",
"options": [
Expand Down Expand Up @@ -776,7 +782,7 @@
"hidden": true
},
{
"key": "enable_kube_audit"
"key":"enable_kube_audit"
},
{
"key": "audit_deployment_name"
Expand Down Expand Up @@ -1009,9 +1015,9 @@
"terraform_version": "1.10.5"
},
{
"label": "QuickStart",
"label": "[Experimental] QuickStart",
"name": "quickstart",
"index": 1,
"index": 4,
"install_type": "fullstack",
"working_directory": "solutions/quickstart",
"iam_permissions": [
Expand Down