Skip to content

Switch to nginx ingress module #195

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
bmonkman merged 2 commits into from
Mar 31, 2021
Merged

Switch to nginx ingress module #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae0da8b
breaking: Switch to nginx ingress module which now uses helm / NLB
bmonkman Mar 31, 2021
38045fb
Fixed module name
bmonkman Mar 31, 2021
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
4 changes: 4 additions & 0 deletions templates/kubernetes/terraform/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,8 @@ module "kubernetes" {
notification_service_highly_available = true

cache_store = "<% index .Params `cacheStore` %>"

# Should not be less than 2 for production. 2 can handle a significant amount of traffic and should give a reasonable amount of redundancy in the case of
# needing to do deployments of the controller or unexpected termination of a node with a controller pod on it.
nginx_ingress_replicas = 2
}
2 changes: 2 additions & 0 deletions templates/kubernetes/terraform/environments/stage/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,6 @@ module "kubernetes" {
notification_service_highly_available = false

cache_store = "<% index .Params `cacheStore` %>"

nginx_ingress_replicas = 1
}
2 changes: 1 addition & 1 deletion templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ data "aws_iam_policy_document" "cert_manager_policy_doc" {
"route53:ListResourceRecordSets"
]

resources = [for index, domain in var.external_dns_zones : "arn:aws:route53:::hostedzone/${data.aws_route53_zone.zones[index].zone_id}"]
resources = [for zone in data.aws_route53_zone.zones : "arn:aws:route53:::hostedzone/${zone.zone_id}"]
}

statement {
Expand Down
4 changes: 2 additions & 2 deletions templates/kubernetes/terraform/modules/kubernetes/external_dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ data "aws_iam_policy_document" "external_dns_policy_doc" {

actions = ["route53:ChangeResourceRecordSets"]

// data.aws_route53_zone.zones declared in ./cert-manager.tf
resources = [for index, domain in var.external_dns_zones : "arn:aws:route53:::hostedzone/${data.aws_route53_zone.zones[index].zone_id}"]
# data.aws_route53_zone.zones declared in ./cert-manager.tf
resources = [for zone in data.aws_route53_zone.zones : "arn:aws:route53:::hostedzone/${zone.zone_id}"]
}
}

Expand Down
4 changes: 0 additions & 4 deletions templates/kubernetes/terraform/modules/kubernetes/ingress/README.md
View file
Open in desktop

This file was deleted.

350 changes: 0 additions & 350 deletions templates/kubernetes/terraform/modules/kubernetes/ingress/main.tf
View file
Open in desktop

This file was deleted.

Loading