update module versions + fix cert validation records (#69)

This commit is contained in:
Max
2021-01-11 15:21:31 +01:00
committed by GitHub
parent ec5c7a6a49
commit 20b26b5eb2
8 changed files with 36 additions and 18 deletions

View File

@@ -1,5 +1,5 @@
module "alb_ingress_iam_role" {
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.12.0"
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.25.0"
role_name = "${module.eks.cluster_id}-alb-ingress"
provider_url = local.oidc_provider_url
role_policy_arns = [

View File

@@ -91,11 +91,20 @@ resource "aws_acm_certificate" "cloudsdk" {
}
resource "aws_route53_record" "cloudsdk_ssl_validation" {
zone_id = data.terraform_remote_state.route_53.outputs.zone_id
name = aws_acm_certificate.cloudsdk.domain_validation_options.0.resource_record_name
type = aws_acm_certificate.cloudsdk.domain_validation_options.0.resource_record_type
ttl = 600
for_each = {
for dvo in aws_acm_certificate.cloudsdk.domain_validation_options : dvo.domain_name => {
name = dvo.resource_record_name
record = dvo.resource_record_value
type = dvo.resource_record_type
}
}
zone_id = data.terraform_remote_state.route_53.outputs.zone_id
name = each.value.type
type = each.value.type
ttl = 600
allow_overwrite = true
records = [
aws_acm_certificate.cloudsdk.domain_validation_options.0.resource_record_value
each.value.record
]
}

View File

@@ -120,7 +120,7 @@ data "terraform_remote_state" "route_53" {
}
module "external_dns_cluster_role" {
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.12.0"
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.25.0"
role_name = "${module.eks.cluster_id}-external-dns"
provider_url = local.oidc_provider_url
role_policy_arns = [aws_iam_policy.external_dns.arn]
@@ -179,7 +179,7 @@ data "aws_iam_policy_document" "external_dns" {
}
module "cluster_autoscaler_cluster_role" {
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.12.0"
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.25.0"
role_name = "${module.eks.cluster_id}-cluster-autoscaler"
provider_url = local.oidc_provider_url
role_policy_arns = [aws_iam_policy.cluster_autoscaler.arn]

View File

@@ -1,5 +1,5 @@
module "vpc_main" {
source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v2.33.0"
source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v2.64.0"
name = "${var.org}-${var.project}-${var.env}"
cidr = var.vpc_cidr
azs = [for az in var.az : format("%s%s", var.aws_region, az)]

View File

@@ -1,5 +1,5 @@
module "alb_ingress_iam_role" {
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.12.0"
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.25.0"
role_name = "${module.eks.cluster_id}-alb-ingress"
provider_url = local.oidc_provider_url
role_policy_arns = [

View File

@@ -90,12 +90,21 @@ resource "aws_acm_certificate" "cloudsdk" {
}
resource "aws_route53_record" "cloudsdk_ssl_validation" {
zone_id = aws_route53_zone.cloudsdk.id
name = aws_acm_certificate.cloudsdk.domain_validation_options.0.resource_record_name
type = aws_acm_certificate.cloudsdk.domain_validation_options.0.resource_record_type
ttl = 600
for_each = {
for dvo in aws_acm_certificate.cloudsdk.domain_validation_options : dvo.domain_name => {
name = dvo.resource_record_name
record = dvo.resource_record_value
type = dvo.resource_record_type
}
}
zone_id = aws_route53_zone.cloudsdk.id
name = each.value.name
type = each.value.type
ttl = 600
allow_overwrite = true
records = [
aws_acm_certificate.cloudsdk.domain_validation_options.0.resource_record_value
each.value.record
]
}

View File

@@ -112,7 +112,7 @@ data "terraform_remote_state" "route_53" {
}
module "external_dns_cluster_role" {
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.12.0"
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.25.0"
role_name = "${module.eks.cluster_id}-external-dns"
provider_url = local.oidc_provider_url
role_policy_arns = [aws_iam_policy.external_dns.arn]
@@ -171,7 +171,7 @@ data "aws_iam_policy_document" "external_dns" {
}
module "cluster_autoscaler_cluster_role" {
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.12.0"
source = "git::https://github.com/terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-role-with-oidc?ref=v2.25.0"
role_name = "${module.eks.cluster_id}-cluster-autoscaler"
provider_url = local.oidc_provider_url
role_policy_arns = [aws_iam_policy.cluster_autoscaler.arn]

View File

@@ -1,5 +1,5 @@
module "vpc_main" {
source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v2.33.0"
source = "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v2.64.0"
name = "${var.org}-${var.project}-${var.env}"
cidr = var.vpc_cidr
azs = [for az in var.az : format("%s%s", var.aws_region, az)]