Skip to content

Commit 742968c

Browse files
author
Arya Girish K
committed
resolved review comments
1 parent daa0a34 commit 742968c

File tree

5 files changed

+27
-37
lines changed

5 files changed

+27
-37
lines changed

‎ibm_catalog.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@
10581058
"features": [
10591059
{
10601060
"title": " ",
1061-
"description": "Configures quickstart deployment of a Red Hat OpenShift cluster within an IBM Cloud VPC with limited options."
1061+
"description": "Configures QuickStart deployment of a Red Hat OpenShift cluster within an IBM Cloud VPC with limited options."
10621062
}
10631063
],
10641064
"diagrams": [
@@ -1068,7 +1068,7 @@
10681068
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/refs/heads/main/reference-architecture/deployable-architecture-ocp-cluster-qs.svg",
10691069
"type": "image/svg+xml"
10701070
},
1071-
"description": "This quickstart variation of deployable architecture enables deployment of a <b>Red Hat OpenShift cluster</b> within an IBM Cloud Virtual Private Cloud (VPC). It provisions the OpenShift cluster and its foundational VPC infrastructure with a limited set of essential options for rapid and streamlined setup. Additionally, the deployment creates an <b>Object Storage bucket</b> that serves as the internal container image registry for the OpenShift cluster, ensuring seamless storage integration.<br><br>Users can select from predefined cluster sizes — <b>mini (default), small, medium, and large</b> — each size determining the number of availability zones, worker nodes per zone, and the <b>machine type</b> (worker node flavor) accordingly. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/blob/main/solutions/quickstart/DA_docs.md).( <br><br>By default, the architecture provisions a <b>two-zone VPC</b>, forming the foundation for the OpenShift cluster. The cluster comprises a single worker pool distributed across these zones, with <b>two worker nodes per zone</b> in the mini configuration.<br><br>This streamlined architecture balances ease of use with flexibility, enabling rapid OpenShift cluster deployments with IBM Cloud's proven infrastructure, integrated storage services, and right-sized compute resources."
1071+
"description": "This QuickStart variation of deployable architecture enables deployment of a <b>Red Hat OpenShift cluster</b> within an IBM Cloud Virtual Private Cloud (VPC). It provisions the OpenShift cluster and its foundational VPC infrastructure with a limited set of essential options for rapid and streamlined setup. Additionally, the deployment creates an <b>Object Storage bucket</b> that serves as the internal container image registry for the OpenShift cluster. Thus, it helps ensure seamless storage integration.<br><br>Users can select from predefined cluster sizes — <b>mini (default), small, medium, and large.</b> Each size determining the number of availability zones, worker nodes per zone, and the <b>machine type</b> (worker node flavor) . [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-base-ocp-vpc/blob/main/solutions/quickstart/DA_docs.md).( <br><br>By default, the architecture provisions a <b>two-zone VPC</b>, forming the foundation for the OpenShift cluster. The cluster comprises a single worker pool distributed across these zones, with <b>two worker nodes per zone</b> in the mini configuration.<br><br>This streamlined architecture balances ease of use with flexibility, enabling rapid OpenShift cluster deployments with the infrastructure, integrated storage services, and right-sized compute resources of IBM Cloud."
10721072
}
10731073
]
10741074
},
@@ -1151,7 +1151,6 @@
11511151
{
11521152
"key": "ocp_version",
11531153
"required": true,
1154-
"display_name": "openshift_version",
11551154
"options": [
11561155
{
11571156
"displayname": "4.18",
@@ -1177,7 +1176,6 @@
11771176
},
11781177
{
11791178
"key": "default_worker_pool_operating_system",
1180-
"display_name":"operating_system",
11811179
"options": [
11821180
{
11831181
"displayname": "RHEL 9",

‎solutions/quickstart/DA_docs.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Cluster Size Configuration
22

3-
This document describes the cluster size options and their configuration details.This table determines the number of availability zones, worker nodes per zone, and the machine type used for the OpenShift cluster.
3+
This document describes the cluster size options and their configuration details. This table determines the number of availability zones, worker nodes per zone, and the machine type used for the OpenShift cluster.
44

55
## Cluster Table
66

7-
| T-Shirt Size | Number of Worker Nodes | Zones | vCPU per Node | Memory per Node (GB) | Disk per Node (GB) | Worker Node Flavor Name | HA Level | Notes |
8-
|--------------|-----------------------|-------|---------------|----------------------|--------------------|------------------------|--------------------|----------------------------------------------------------|
9-
| Mini | 2 | 2 | 4 | 16 | 100 | bx2.4x16 | Moderate (Basic) | Smallest possible; basic HA across 2 zones | |
10-
| Small | 3 | 3 | 8 | 32 | 200 | bx2.8x32 | High | Entry-level production HA | |
11-
| Medium | 5 | 3 | 8 | 32 | 200 | bx2.8x32 | High | Moderate workloads, better HA | |
12-
| Large | 7 | 3 | 16 | 64 | 400 | bx2.16x64 | High | Large-scale, robust HA | |
7+
| T-Shirt Size | Number of Worker Nodes per zone | Total Number of Worker Nodes | Zones | vCPU per Node | Memory per Node (GB) | Disk per Node (GB) | Worker Node Flavor Name | HA Level | Notes |
8+
|--------------|------------------------|------------------------------|--------|----------------|------------------------|----------------------|--------------------------|---------------------|--------------------------------------------------------|
9+
| Mini | 1 | 2 | 2 | 4 | 16 | 100 | bx2.4x16 | Moderate (Basic) | Smallest possible; basic HA across 2 zones |
10+
| Small | 1 | 3 | 3 | 8 | 32 | 200 | bx2.8x32 | High | Entry-level production HA |
11+
| Medium | 2 | 6 | 3 | 8 | 32 | 200 | bx2.8x32 | High | Moderate workloads, better HA |
12+
| Large | 3 | 9 | 3 | 16 | 64 | 400 | bx2.16x64 | High | Large-scale, robust HA |

‎solutions/quickstart/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Cloud automation for Red Hat OpenShift Container Platform on VPC (Quickstart)
1+
# Cloud automation for Red Hat OpenShift Container Platform on VPC (QuickStart)
22

33
:exclamation: **Important:** This solution is not intended to be called by other modules because it contains a provider configuration and is not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information, see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers).

‎solutions/quickstart/main.tf‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,37 +80,30 @@ module "vpc" {
8080
locals {
8181
size_config = {
8282
mini = {
83-
flavor = "bx2.4x16"
84-
total_workers = 2
85-
zones = 2
83+
flavor = "bx2.4x16"
84+
workers_per_zone = 1
85+
zones = 2
8686

8787
}
8888
small = {
89-
flavor = "bx2.8x32"
90-
total_workers = 3
91-
zones = 3
89+
flavor = "bx2.8x32"
90+
workers_per_zone = 1
91+
zones = 3
9292
}
9393
medium = {
94-
flavor = "bx2.8x32"
95-
total_workers = 5
96-
zones = 3
94+
flavor = "bx2.8x32"
95+
workers_per_zone = 2
96+
zones = 3
9797
}
9898
large = {
99-
flavor = "bx2.16x64"
100-
total_workers = 7
101-
zones = 3
99+
flavor = "bx2.16x64"
100+
workers_per_zone = 3
101+
zones = 3
102102
}
103103
}
104104

105-
selected = lookup(local.size_config, var.size, local.size_config[var.size])
106-
base_workers_per_zone = floor(local.selected.total_workers / local.selected.zones)
107-
extra_workers = local.selected.total_workers % local.selected.zones
105+
selected = lookup(local.size_config, var.size, local.size_config[var.size])
108106

109-
110-
workers_distribution = [
111-
for i in range(local.selected.zones) :
112-
local.base_workers_per_zone + (i < local.extra_workers ? 1 : 0)
113-
]
114107
# Build the vpc_subnets for default pool
115108
cluster_vpc_subnets = {
116109
default = [
@@ -121,14 +114,13 @@ locals {
121114
}
122115
]
123116
}
124-
max_workers_per_zone = max(local.workers_distribution...)
125117

126118
worker_pools = [
127119
{
128120
pool_name = "default"
129121
machine_type = local.selected.flavor
130122
operating_system = var.default_worker_pool_operating_system
131-
workers_per_zone = local.max_workers_per_zone
123+
workers_per_zone = local.selected.workers_per_zone
132124
vpc_subnets = local.cluster_vpc_subnets["default"]
133125

134126
}

‎solutions/quickstart/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ variable "region" {
5050
variable "ocp_version" {
5151
type = string
5252
description = "Version of the OpenShift cluster to provision."
53-
default = "4.17"
53+
default = null
5454
}
5555

5656
variable "cluster_name" {
@@ -61,14 +61,14 @@ variable "cluster_name" {
6161

6262

6363
variable "address_prefix" {
64-
description = "The IP range that will be defined for the VPC for a certain location. Use only with manual address prefixes."
64+
description = "The IP range that defines a certain location for the VPC. Use only with manual address prefixes."
6565
type = string
6666
default = "10.10.10.0/24"
6767
}
6868

6969
variable "ocp_entitlement" {
7070
type = string
71-
description = "Value that is applied to the entitlements for OCP cluster provisioning"
71+
description = "Value that is applied to the entitlements for OCP cluster provisioning."
7272
default = null
7373
}
7474

0 commit comments

Comments
 (0)