Skip to content

Commit 9daca32

Browse files
Aashiq-JAashiq-J
authored
Merge branch 'main' into renovate/dependencies
2 parents bbd20f8 + 612495f commit 9daca32

File tree

7 files changed

+274
-61
lines changed

7 files changed

+274
-61
lines changed

‎ibm_catalog.json‎

Lines changed: 77 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@
7070
],
7171
"flavors": [
7272
{
73-
"label": "[Experimental] Standard - Integrated setup with configurable services",
73+
"label": "Standard - Integrated setup with configurable services",
7474
"index": 2,
7575
"name": "fully-configurable",
76+
"short_description": "Ideal for users who want flexibility with a reliable starting point.",
7677
"install_type": "fullstack",
7778
"working_directory": "solutions/fully-configurable",
7879
"release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes",
@@ -211,10 +212,6 @@
211212
],
212213
"architecture": {
213214
"features": [
214-
{
215-
"title": " ",
216-
"description": "Ideal for users who want flexibility with a reliable starting point."
217-
},
218215
{
219216
"title": " ",
220217
"description": "Offers full control over architecture parameters, with well-chosen defaults that enable a functional OpenShift cluster and integrated IBM Cloud services without requiring manual adjustments."
@@ -256,8 +253,8 @@
256253
},
257254
{
258255
"key": "openshift_version",
259-
"required": true,
260256
"default_value": "4.19",
257+
"required": true,
261258
"options": [
262259
{
263260
"displayname": "4.19",
@@ -285,6 +282,22 @@
285282
}
286283
]
287284
},
285+
{
286+
"key": "region",
287+
"required": true,
288+
"type": "string",
289+
"custom_config": {
290+
"config_constraints": {
291+
"generationType": "2"
292+
},
293+
"grouping": "deployment",
294+
"original_grouping": "deployment",
295+
"type": "vpc_region"
296+
},
297+
"description": "Region in which all the resources will be deployed. [Learn More](https://terraform-ibm-modules.github.io/documentation/#/region).",
298+
"virtual": true,
299+
"default_value": "us-south"
300+
},
288301
{
289302
"key": "default_worker_pool_machine_type",
290303
"required": true,
@@ -460,14 +473,6 @@
460473
{
461474
"displayname": "ox2.64x512 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))",
462475
"value": "ox2.64x512"
463-
},
464-
{
465-
"displayname": "ox2.8x64 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))",
466-
"value": "ox2.8x64"
467-
},
468-
{
469-
"displayname": "ox2.96x768 (Not available in Sao Paulo (br-sao), Montreal (ca-mon))",
470-
"value": "ox2.96x768"
471476
}
472477
]
473478
},
@@ -477,38 +482,27 @@
477482
},
478483
{
479484
"key": "default_worker_pool_operating_system",
485+
"hidden": true,
480486
"required": true,
487+
"type": "string",
481488
"options": [
482489
{
490+
"description": "RHEL with security features.",
483491
"displayname": "RHEL 9",
484492
"value": "RHEL_9_64"
485493
},
486494
{
495+
"description": "Container-optimized for Red Hat OpenShift Container Platform (OCP) clusters.",
487496
"displayname": "Red Hat CoreOS",
488497
"value": "RHCOS"
489498
},
490499
{
500+
"description": "Stable RHEL, widely compatible.",
491501
"displayname": "RHEL 8",
492502
"value": "REDHAT_8_64"
493503
}
494504
]
495505
},
496-
{
497-
"key": "region",
498-
"required": true,
499-
"type": "string",
500-
"custom_config": {
501-
"config_constraints": {
502-
"generationType": "2"
503-
},
504-
"grouping": "deployment",
505-
"original_grouping": "deployment",
506-
"type": "vpc_region"
507-
},
508-
"description": "Region in which all the resources will be deployed. [Learn More](https://terraform-ibm-modules.github.io/documentation/#/region).",
509-
"virtual": true,
510-
"default_value": "us-south"
511-
},
512506
{
513507
"key": "allow_public_access_to_cluster_management",
514508
"required": true
@@ -588,21 +582,26 @@
588582
{
589583
"key": "cluster_ready_when",
590584
"hidden": true,
585+
"type": "string",
591586
"options": [
592587
{
588+
"description": "Standard readiness, cluster control plane is ready",
593589
"displayname": "Normal",
594590
"value": "Normal"
595591
},
596592
{
597-
"displayname": "IngressReady",
593+
"description": "Wait for ingress controller to be operational",
594+
"displayname": "Ingress Ready",
598595
"value": "IngressReady"
599596
},
600597
{
601-
"displayname": "OneWorkerNodeReady",
598+
"description": "At least one worker node is fully ready",
599+
"displayname": "One Worker Ready",
602600
"value": "OneWorkerNodeReady"
603601
},
604602
{
605-
"displayname": "MasterNodeReady",
603+
"description": "Master node components are operational",
604+
"displayname": "Master Ready",
606605
"value": "MasterNodeReady"
607606
}
608607
]
@@ -695,21 +694,26 @@
695694
{
696695
"key": "cluster_config_endpoint_type",
697696
"hidden": true,
697+
"type": "string",
698698
"options": [
699699
{
700-
"displayname": "default",
700+
"description": "Standard endpoint configuration",
701+
"displayname": "Default",
701702
"value": "default"
702703
},
703704
{
704-
"displayname": "private",
705+
"description": "Private network access only",
706+
"displayname": "Private",
705707
"value": "private"
706708
},
707709
{
708-
"displayname": "vpe",
710+
"description": "Virtual Private Endpoint for secure access",
711+
"displayname": "VPE",
709712
"value": "vpe"
710713
},
711714
{
712-
"displayname": "link",
715+
"description": "Direct link connection",
716+
"displayname": "Link",
713717
"value": "link"
714718
}
715719
]
@@ -881,21 +885,24 @@
881885
},
882886
{
883887
"key": "secrets_manager_service_plan",
884-
"required": true,
888+
"description": "The pricing plan to use when provisioning a Secrets Manager instance. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard).",
889+
"type_metadata": "string",
885890
"virtual": true,
891+
"required": true,
886892
"type": "string",
893+
"default_value": "standard",
887894
"options": [
888895
{
896+
"description": "Centrally manage secrets in a dedicated instance. Unlimited Secrets Manager instances per IBM Cloud account. Unlimited access to all service capabilities.",
889897
"displayname": "Standard",
890898
"value": "standard"
891899
},
892900
{
901+
"description": "Try Secrets Manager at no cost for 30 days. Unlimited access to all service capabilities for a limited time. You can have one Trial instance provisioned in your account at any time. After your trial expires, functionality is removed.",
893902
"displayname": "Trial",
894903
"value": "trial"
895904
}
896-
],
897-
"default_value": "standard",
898-
"description": "The pricing plan to use when provisioning a Secrets Manager instance. Possible values: `standard`, `trial`. You can create only one Trial instance of Secrets Manager per account. Before you can create a new Trial instance, you must delete the existing Trial instance and its reclamation. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard)."
905+
]
899906
},
900907
{
901908
"key": "existing_vpc_crn",
@@ -979,12 +986,15 @@
979986
{
980987
"key": "audit_log_policy",
981988
"hidden": true,
989+
"type": "string",
982990
"options": [
983991
{
992+
"description": "Standard audit logging.",
984993
"displayname": "Default",
985994
"value": "default"
986995
},
987996
{
997+
"description": "Detailed verbose logging.",
988998
"displayname": "Write Request Bodies",
989999
"value": "WriteRequestBodies"
9901000
}
@@ -1008,7 +1018,7 @@
10081018
"name": "deploy-arch-ibm-slz-vpc",
10091019
"description": "Configure the VPC and subnets required to deploy your OpenShift cluster.",
10101020
"id": "9fc0fa64-27af-4fed-9dce-47b3640ba739-global",
1011-
"version": "v8.7.0",
1021+
"version": "v8.8.3",
10121022
"flavors": [
10131023
"fully-configurable"
10141024
],
@@ -1051,7 +1061,7 @@
10511061
"name": "deploy-arch-ibm-kms",
10521062
"description": "Integrate IBM Key Protect to manage encryption keys for your cluster, securing persistent volumes and supporting compliance. If unselected, encryption is still applied using IBM-managed keys.",
10531063
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
1054-
"version": "v5.4.0",
1064+
"version": "v5.4.8",
10551065
"flavors": [
10561066
"fully-configurable"
10571067
],
@@ -1088,7 +1098,7 @@
10881098
"name": "deploy-arch-ibm-cos",
10891099
"description": "Set up a Cloud Object Storage (COS) instance and bucket to serve as internal registry storage for your OpenShift cluster.",
10901100
"id": "68921490-2778-4930-ac6d-bae7be6cd958-global",
1091-
"version": "v10.5.0",
1101+
"version": "v10.5.5",
10921102
"flavors": [
10931103
"instance"
10941104
],
@@ -1120,7 +1130,7 @@
11201130
"fully-configurable"
11211131
],
11221132
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
1123-
"version": "v1.9.0",
1133+
"version": "v1.9.10",
11241134
"optional": true,
11251135
"on_by_default": true,
11261136
"input_mapping": [
@@ -1160,7 +1170,7 @@
11601170
"name": "deploy-arch-ibm-cloud-monitoring",
11611171
"description": "Set up a Cloud Monitoring instance to collect platform metrics.",
11621172
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
1163-
"version": "v1.9.0",
1173+
"version": "v1.10.6",
11641174
"flavors": [
11651175
"fully-configurable"
11661176
],
@@ -1194,7 +1204,7 @@
11941204
"name": "deploy-arch-ibm-activity-tracker",
11951205
"description": "Configure Activity Tracker Event Routing to direct auditing events appropriately.",
11961206
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
1197-
"version": "v1.4.3",
1207+
"version": "v1.4.11",
11981208
"flavors": [
11991209
"fully-configurable"
12001210
],
@@ -1233,7 +1243,7 @@
12331243
"name": "deploy-arch-ibm-secrets-manager",
12341244
"description": "Provision a Secrets Manager instance to securely store and manage sensitive credentials—such as certificates—used by services integrated with your cluster.",
12351245
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
1236-
"version": "v2.11.0",
1246+
"version": "v2.11.6",
12371247
"flavors": [
12381248
"fully-configurable"
12391249
],
@@ -1280,7 +1290,7 @@
12801290
"name": "deploy-arch-ibm-scc-workload-protection",
12811291
"description": "Integrate with Workload Protection to monitor and manage your cluster’s security posture, helping detect misconfigurations and enforce compliance.",
12821292
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
1283-
"version": "v1.14.0",
1293+
"version": "v1.15.3",
12841294
"flavors": [
12851295
"fully-configurable"
12861296
],
@@ -1313,6 +1323,7 @@
13131323
{
13141324
"label": "QuickStart - Basic and simple",
13151325
"name": "ocp-quickstart",
1326+
"short_description": "Ideal for users new to IBM Cloud or OpenShift who want to get started without configuring underlying infrastructure.",
13161327
"index": 1,
13171328
"install_type": "fullstack",
13181329
"working_directory": "solutions/quickstart",
@@ -1361,11 +1372,7 @@
13611372
"features": [
13621373
{
13631374
"title": " ",
1364-
"description": "Ideal for users new to IBM Cloud or OpenShift who want to get started without configuring underlying infrastructure."
1365-
},
1366-
{
1367-
"title": " ",
1368-
"description": "A lightweight, experimental configuration for quickly provisioning an OpenShift cluster on IBM Cloud VPC. Not certified and not intended for production use."
1375+
"description": "A lightweight configuration for quickly provisioning an OpenShift cluster on IBM Cloud VPC. Not certified and not intended for production use."
13691376
}
13701377
],
13711378
"diagrams": [
@@ -1425,22 +1432,28 @@
14251432
},
14261433
{
14271434
"key": "size",
1435+
"type_metadata": "string",
14281436
"required": true,
1437+
"type": "string",
14291438
"options": [
14301439
{
1431-
"displayname": "mini",
1440+
"description": "bx2.4x16 with 4 vCPU and 16 GB memory, 2 nodes across 2 zones.",
1441+
"displayname": "Mini",
14321442
"value": "mini"
14331443
},
14341444
{
1435-
"displayname": "small",
1445+
"description": "bx2.8x32 with 8 vCPU and 32 GB memory, 3 nodes across 3 zones.",
1446+
"displayname": "Small",
14361447
"value": "small"
14371448
},
14381449
{
1439-
"displayname": "medium",
1450+
"description": "bx2.8x32 with 8 vCPU and 32 GB memory, 6 nodes across 3 zones.",
1451+
"displayname": "Medium",
14401452
"value": "medium"
14411453
},
14421454
{
1443-
"displayname": "large",
1455+
"description": "bx2.16x64 with 16 vCPU and 64 GB memory, 9 nodes across 3 zones.",
1456+
"displayname": "Large",
14441457
"value": "large"
14451458
}
14461459
]
@@ -1499,16 +1512,22 @@
14991512
},
15001513
{
15011514
"key": "default_worker_pool_operating_system",
1515+
"required": true,
1516+
"type": "string",
1517+
"hidden": true,
15021518
"options": [
15031519
{
1520+
"description": "RHEL with security features.",
15041521
"displayname": "RHEL 9",
15051522
"value": "RHEL_9_64"
15061523
},
15071524
{
1525+
"description": "Container-optimized and immutable OS for Red Hat OpenShift Container Platform (OCP) clusters.",
15081526
"displayname": "Red Hat CoreOS",
15091527
"value": "RHCOS"
15101528
},
15111529
{
1530+
"description": "Stable RHEL, widely compatible.",
15121531
"displayname": "RHEL 8",
15131532
"value": "REDHAT_8_64"
15141533
}

‎reference-architectures/deployable-architecture-ocp-cluster-qs.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎reference-architectures/deployable-architecture-ocp-cluster.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎solutions/quickstart/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ variable "ocp_entitlement" {
7676
variable "default_worker_pool_operating_system" {
7777
type = string
7878
description = "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)."
79-
default = "RHEL_9_64"
79+
default = "RHCOS"
8080
}
8181

8282
variable "access_tags" {

0 commit comments

Comments
 (0)