Skip to content

feat: OCP maps/pen 42 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Aug 28, 2024
Merged

feat: OCP maps/pen 42 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5a4f156
Change naming; Add TGW att code
marvinber Aug 12, 2024
9745b00
Update naming for resources
marvinber Aug 14, 2024
d95bc41
Update naming for resources
as-extern-mbertram Aug 15, 2024
62dcb4a
Merge branch 'ocp-maps/pen-42' of https://github.com/spring-media/ter…
as-extern-mbertram Aug 15, 2024
fb61569
Update Spacelift module version to reflect new versioning for OCP
as-extern-mbertram Aug 16, 2024
d608a4f
Update to new versioning
as-extern-mbertram Aug 16, 2024
366514f
Add TGW att name output to set tag
as-extern-mbertram Aug 19, 2024
a4128ed
Add short region variable as requirement
as-extern-mbertram Aug 23, 2024
f498540
Add default value to vpc suffix name
as-extern-mbertram Aug 23, 2024
167b067
Fix subnet type for subnet length and nacl
as-extern-mbertram Aug 23, 2024
394796c
Change naming based on PR feedback
as-extern-mbertram Aug 23, 2024
63114eb
Update naming according to PR feedback
as-extern-mbertram Aug 26, 2024
513bb51
Allow lists as input for routes to the TGW from private/public subnets
as-extern-mbertram Aug 26, 2024
115caee
Add comment for subnet naming
as-extern-mbertram Aug 27, 2024
a3b4213
Remove unnecessary function call
as-extern-mbertram Aug 27, 2024
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
2 changes: 1 addition & 1 deletion .spacelift/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version: 1
module_version: 5.1.1
module_version: 0.1.0
2 changes: 1 addition & 1 deletion examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals {
module "vpc" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand Down
4 changes: 2 additions & 2 deletions examples/ipam/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ locals {
module "vpc_ipam_set_netmask" {
source = "../.."

name = "${local.name}-set-netmask"
name_prefix = "${local.name}-set-netmask"

use_ipam_pool = true
ipv4_ipam_pool_id = aws_vpc_ipam_pool.this.id
Expand All @@ -46,7 +46,7 @@ module "vpc_ipam_set_netmask" {
module "vpc_ipam_set_cidr" {
source = "../.."

name = "${local.name}-set-cidr"
name_prefix = "${local.name}-set-cidr"

use_ipam_pool = true
ipv4_ipam_pool_id = aws_vpc_ipam_pool.this.id
Expand Down
2 changes: 1 addition & 1 deletion examples/ipv6-dualstack/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals {
module "vpc" {
source = "../.."

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand Down
2 changes: 1 addition & 1 deletion examples/ipv6-only/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ locals {
module "vpc" {
source = "../.."

name = local.name
name_prefix = local.name

azs = slice(data.aws_availability_zones.available.names, 0, 3)
enable_ipv6 = true
Expand Down
6 changes: 3 additions & 3 deletions examples/issues/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ locals {
module "vpc_issue_44" {
source = "../../"

name = "asymmetrical"
name_prefix = "asymmetrical"
cidr = "10.0.0.0/16"

azs = local.azs
Expand All @@ -48,7 +48,7 @@ module "vpc_issue_44" {
module "vpc_issue_46" {
source = "../../"

name = "no-private-subnets"
name_prefix = "no-private-subnets"
cidr = "10.0.0.0/16"

azs = local.azs
Expand All @@ -74,7 +74,7 @@ module "vpc_issue_46" {
module "vpc_issue_108" {
source = "../../"

name = "route-already-exists"
name_prefix = "route-already-exists"
cidr = "10.0.0.0/16"

azs = local.azs
Expand Down
2 changes: 1 addition & 1 deletion examples/network-acls/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ locals {
module "vpc" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand Down
2 changes: 1 addition & 1 deletion examples/outpost/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ locals {
module "vpc" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand Down
2 changes: 1 addition & 1 deletion examples/secondary-cidr-blocks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ locals {
module "vpc" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

secondary_cidr_blocks = local.secondary_cidr_blocks # can add up to 5 total CIDR blocks
Expand Down
2 changes: 1 addition & 1 deletion examples/separate-route-tables/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals {
module "vpc" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals {
module "vpc" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand Down
10 changes: 5 additions & 5 deletions examples/vpc-flow-logs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ locals {
module "vpc_with_flow_logs_s3_bucket" {
source = "../../"

name = local.name
name_prefix = local.name
cidr = local.vpc_cidr

azs = local.azs
Expand All @@ -44,7 +44,7 @@ module "vpc_with_flow_logs_s3_bucket" {
module "vpc_with_flow_logs_s3_bucket_parquet" {
source = "../../"

name = "${local.name}-parquet"
name_prefix = "${local.name}-parquet"
cidr = local.vpc_cidr

azs = local.azs
Expand All @@ -63,7 +63,7 @@ module "vpc_with_flow_logs_s3_bucket_parquet" {
module "vpc_with_flow_logs_cloudwatch_logs_default" {
source = "../../"

name = "${local.name}-cloudwatch-logs-default"
name_prefix = "${local.name}-cloudwatch-logs-default"
cidr = local.vpc_cidr

azs = local.azs
Expand All @@ -87,7 +87,7 @@ module "vpc_with_flow_logs_cloudwatch_logs_default" {
module "vpc_with_flow_logs_cloudwatch_logs_prefix" {
source = "../../"

name = "${local.name}-cloudwatch-logs-prefix"
name_prefix = "${local.name}-cloudwatch-logs-prefix"
cidr = local.vpc_cidr

azs = local.azs
Expand Down Expand Up @@ -116,7 +116,7 @@ module "vpc_with_flow_logs_cloudwatch_logs_prefix" {
module "vpc_with_flow_logs_cloudwatch_logs" {
source = "../../"

name = "${local.name}-cloudwatch-logs"
name_prefix = "${local.name}-cloudwatch-logs"
cidr = local.vpc_cidr

azs = local.azs
Expand Down
Loading