Skip to content

Commit 0c2ef8e

Browse files
Jordan-Williams2Jordan-Williams2
Jordan-Williams2
authored and
Jordan-Williams2
committed
Merge branch 'main' into direct-endp
2 parents 684b6f3 + b24ba00 commit 0c2ef8e

File tree

18 files changed

+147
-548
lines changed

18 files changed

+147
-548
lines changed

‎.catalog-onboard-pipeline.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ offerings:
1717
scc:
1818
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
1919
region: us-south
20-
- name: existing-vpc
21-
mark_ready: false
22-
install_type: extension
23-
validation_type: schematics
24-
pre_validation: "tests/scripts/pre-validation-deploy-slz-vpc.sh"
25-
post_validation: "tests/scripts/post-validation-destroy-slz-vpc.sh"
26-
scc:
27-
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
28-
region: us-south
2920
- name: deploy-arch-ibm-slz-vpc
3021
kind: solution
3122
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd

‎.secrets.baseline‎

Lines changed: 1 addition & 1 deletion
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": "2023-12-16T18:26:41Z",
6+
"generated_at": "2025-10-28T04:05:31Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"

‎README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ For more information about the default configuration, see [Default Secure Landin
4444
* [Contributing](#contributing)
4545
<!-- END OVERVIEW HOOK -->
4646

47-
## Reference architectures
48-
- [VPC landing zone - Standard variation](https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-vpc-ra)
49-
- [VSI on VPC landing zone - Standard variation](https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-vsi-ra)
50-
- [VSI on VPC landing zone - QuickStart variation](https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-vsi-ra-qs)
51-
- [Red Hat OpenShift Container Platform on VPC landing zone](https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-ocp-ra)
52-
5347
## terraform-ibm-landing-zone
5448

5549
Complete the following steps before you deploy the Secure Landing Zone module.

‎ibm_catalog.json‎

Lines changed: 10 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@
205205
]
206206
},
207207
"terraform_version": "1.10.5",
208-
"dependency_version_2": true
208+
"dependency_version_2": true,
209+
"ignore_readme": true
209210
},
210211
{
211212
"label": "Standard - Financial Services edition",
@@ -595,184 +596,8 @@
595596
]
596597
},
597598
"terraform_version": "1.10.5",
598-
"dependency_version_2": true
599-
},
600-
{
601-
"label": "Existing VPC",
602-
"name": "existing-vpc",
603-
"index": 5,
604-
"install_type": "fullstack",
605-
"working_directory": "patterns/vsi-extension",
606-
"release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes",
607-
"dependencies": [
608-
{
609-
"flavors": [
610-
"standard"
611-
],
612-
"id": "95fccffc-ae3b-42df-b6d9-80be5914d852-global",
613-
"name": "deploy-arch-ibm-slz-ocp",
614-
"version": ">=1.0.0",
615-
"optional": false
616-
},
617-
{
618-
"flavors": [
619-
"standard"
620-
],
621-
"id": "9fc0fa64-27af-4fed-9dce-47b3640ba739-global",
622-
"name": "deploy-arch-ibm-slz-vpc",
623-
"version": ">=1.0.0"
624-
}
625-
],
626-
"compliance": {
627-
"authority": "scc-v3",
628-
"profiles": [
629-
{
630-
"profile_name": "IBM Cloud Framework for Financial Services",
631-
"profile_version": "1.7.0"
632-
}
633-
]
634-
},
635-
"configuration": [
636-
{
637-
"key": "ssh_public_key",
638-
"required": true,
639-
"value_constraints": [
640-
{
641-
"type": "regex",
642-
"description": "The value provided for 'ssh_public_key' is not valid.",
643-
"value": "^__NULL__$|^ssh-rsa AAAA[0-9A-Za-z+/]+[=]{0,3} ?([^@]+@[^@]+)?"
644-
}
645-
]
646-
},
647-
{
648-
"custom_config": {
649-
"config_constraints": {
650-
"generationType": "2"
651-
},
652-
"grouping": "deployment",
653-
"original_grouping": "deployment",
654-
"type": "vpc_region"
655-
},
656-
"key": "region",
657-
"required": true
658-
},
659-
{
660-
"key": "ibmcloud_api_key"
661-
},
662-
{
663-
"key": "prefix",
664-
"required": true,
665-
"type": "string",
666-
"default_value": "dev",
667-
"random_string": {
668-
"length": 4
669-
}
670-
},
671-
{
672-
"key": "vpc_id"
673-
},
674-
{
675-
"key": "existing_ssh_key_name"
676-
},
677-
{
678-
"key": "resource_tags",
679-
"custom_config": {
680-
"grouping": "deployment",
681-
"original_grouping": "deployment",
682-
"config_constraints": {
683-
"type": "string"
684-
}
685-
}
686-
},
687-
{
688-
"key": "access_tags",
689-
"custom_config": {
690-
"grouping": "deployment",
691-
"original_grouping": "deployment",
692-
"config_constraints": {
693-
"type": "string"
694-
}
695-
}
696-
},
697-
{
698-
"key": "image_name"
699-
},
700-
{
701-
"key": "vsi_instance_profile"
702-
},
703-
{
704-
"key": "user_data"
705-
},
706-
{
707-
"key": "boot_volume_encryption_key"
708-
},
709-
{
710-
"key": "vsi_per_subnet"
711-
},
712-
{
713-
"key": "subnet_names"
714-
},
715-
{
716-
"key": "security_group_ids"
717-
},
718-
{
719-
"key": "block_storage_volumes"
720-
},
721-
{
722-
"key": "skip_iam_authorization_policy"
723-
},
724-
{
725-
"key": "enable_floating_ip"
726-
},
727-
{
728-
"key": "placement_group_id"
729-
},
730-
{
731-
"key": "load_balancers"
732-
},
733-
{
734-
"key": "primary_vni_additional_ip_count"
735-
},
736-
{
737-
"key": "use_legacy_network_interface"
738-
},
739-
{
740-
"key": "allow_ip_spoofing"
741-
}
742-
],
743-
"iam_permissions": [
744-
{
745-
"role_crns": [
746-
"crn:v1:bluemix:public:iam::::role:Administrator"
747-
],
748-
"service_name": "is.vpc",
749-
"notes": "Required to create Virtual Private Cloud(VPC)."
750-
}
751-
],
752-
"architecture": {
753-
"features": [
754-
{
755-
"title": " ",
756-
"description": "Ideal for extending existing VPC environments"
757-
},
758-
{
759-
"title": " ",
760-
"description": "Validated configuration that enhances resiliency and security while aligning with financial services compliance requirements."
761-
}
762-
],
763-
"diagrams": [
764-
{
765-
"diagram": {
766-
"caption": "Virtual Server Instance topology - VSI on existing VPC",
767-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/reference-architectures/vsi-vsi.drawio.svg",
768-
"type": "image/svg+xml"
769-
},
770-
"description": "This variation is aligned to the IBM Cloud for Financial Services reference architecture. It provisions <b>Virtual Server Instances (VSIs)</b> in every subnet across multiple availability zones, delivering a resilient and secure multizone infrastructure to run your workloads.<br><br> The extension integrates <b>Key Management</b> to strengthen security of sensitive data and uses <b>Activity Tracker with Flow Logs</b> to collect and store Internet Protocol (IP) traffic data. A <b>transit gateway</b> connects the Management and Workload VPCs, while <b>Virtual Private Endpoints (VPEs)</b> provide private access to IBM Cloud services. Secure connectivity to enterprise environments is enabled through a <b>site-to-site VPN</b>, and <b>CBR (Context-based restrictions)</b> rules manage traffic flows to approved services.<br><br> This variation avoids the use of floating IPs for internet access, relying instead on private and controlled connections. It simplifies risk management and demonstrates regulatory compliance for Financial Services scenarios."
771-
}
772-
]
773-
},
774-
"terraform_version": "1.10.5",
775-
"dependency_version_2": true
599+
"dependency_version_2": true,
600+
"ignore_readme": true
776601
}
777602
]
778603
},
@@ -1190,7 +1015,8 @@
11901015
]
11911016
},
11921017
"terraform_version": "1.10.5",
1193-
"dependency_version_2": true
1018+
"dependency_version_2": true,
1019+
"ignore_readme": true
11941020
}
11951021
]
11961022
},
@@ -1589,7 +1415,8 @@
15891415
]
15901416
},
15911417
"terraform_version": "1.10.5",
1592-
"dependency_version_2": true
1418+
"dependency_version_2": true,
1419+
"ignore_readme": true
15931420
},
15941421
{
15951422
"label": "Standard - Financial Services edition",
@@ -2249,7 +2076,8 @@
22492076
]
22502077
},
22512078
"terraform_version": "1.10.5",
2252-
"dependency_version_2": true
2079+
"dependency_version_2": true,
2080+
"ignore_readme": true
22532081
}
22542082
]
22552083
}

‎patterns/vpc/outputs.tf‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,33 @@ output "schematics_workspace_id" {
141141
}
142142

143143
##############################################################################
144+
145+
##############################################################################
146+
# VPC Next Steps URLs outputs
147+
##############################################################################
148+
149+
output "next_steps_text" {
150+
value = "Your Virtual Private Clouds are ready."
151+
description = "Next steps text"
152+
}
153+
154+
output "next_step_primary_label" {
155+
value = "Go to Virtual Private Clouds"
156+
description = "Primary label"
157+
}
158+
159+
output "next_step_primary_url" {
160+
value = "https://cloud.ibm.com/infrastructure/network/vpcs"
161+
description = "Primary URL"
162+
}
163+
164+
output "next_step_secondary_label" {
165+
value = "Learn more about VPCs"
166+
description = "Secondary label"
167+
}
168+
169+
output "next_step_secondary_url" {
170+
value = "https://cloud.ibm.com/docs/vpc?topic=vpc-about-vpc"
171+
description = "Secondary URL"
172+
}
173+
##############################################################################

‎patterns/vsi-extension/outputs.tf‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,29 @@ output "vsi_data" {
22
description = "Details of the VSI including name, id, zone, and primary ipv4 address, VPC Name, and floating IP."
33
value = module.vsi
44
}
5+
6+
output "next_steps_text" {
7+
value = "Your Virtual Server Instances are ready."
8+
description = "Next steps text"
9+
}
10+
11+
output "next_step_primary_label" {
12+
value = "Go to Virtual Server Instances"
13+
description = "Primary label"
14+
}
15+
16+
output "next_step_primary_url" {
17+
value = "https://cloud.ibm.com/infrastructure/compute/vs"
18+
description = "Primary URL"
19+
}
20+
21+
22+
output "next_step_secondary_label" {
23+
value = "Expose app to internet"
24+
description = "Secondary label"
25+
}
26+
27+
output "next_step_secondary_url" {
28+
value = "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-access-public-app"
29+
description = "Secondary URL"
30+
}

‎patterns/vsi-quickstart/outputs.tf‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
11
##############################################################################
22
# Output Variables
33
##############################################################################
4-
54
output "config" {
65
description = "Output configuration as encoded JSON"
76
value = module.landing_zone.config
87
}
8+
9+
output "next_steps_text" {
10+
value = module.landing_zone.next_steps_text
11+
description = "Next steps text"
12+
}
13+
14+
output "next_step_primary_label" {
15+
value = module.landing_zone.next_step_primary_label
16+
description = "Primary label"
17+
}
18+
19+
output "next_step_primary_url" {
20+
value = module.landing_zone.next_step_primary_url
21+
description = "Primary URL"
22+
}
23+
24+
25+
output "next_step_secondary_label" {
26+
value = module.landing_zone.next_step_secondary_label
27+
description = "Secondary label"
28+
}
29+
30+
output "next_step_secondary_url" {
31+
value = module.landing_zone.next_step_secondary_url
32+
description = "Secondary URL"
33+
}

‎patterns/vsi/module/outputs.tf‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,30 @@ output "config" {
160160
}
161161

162162
##############################################################################
163+
164+
165+
output "next_steps_text" {
166+
value = "Your Virtual Server Instances are ready."
167+
description = "Next steps text"
168+
}
169+
170+
output "next_step_primary_label" {
171+
value = "Go to Virtual Server Instances"
172+
description = "Primary label"
173+
}
174+
175+
output "next_step_primary_url" {
176+
value = "https://cloud.ibm.com/infrastructure/compute/vs"
177+
description = "Primary URL"
178+
}
179+
180+
181+
output "next_step_secondary_label" {
182+
value = "Expose app to internet"
183+
description = "Secondary label"
184+
}
185+
186+
output "next_step_secondary_url" {
187+
value = "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-access-public-app"
188+
description = "Secondary URL"
189+
}

0 commit comments

Comments
 (0)