From 4dfc479ff186a09e0d0ffbd3b4abaf0d58227b23 Mon Sep 17 00:00:00 2001 From: badra001 Date: Fri, 28 Jul 2023 16:11:23 -0400 Subject: [PATCH] update to use domain for shared vpcs --- examples/full-cluster-tf-upgrade/1.24/common-services/cert.tf | 3 ++- examples/full-cluster-tf-upgrade/1.24/dns-zone.tf | 3 ++- examples/full-cluster-tf-upgrade/1.24/ec2-keypair.tf | 2 +- .../full-cluster-tf-upgrade/1.24/settings.auto.tfvars.example | 1 + examples/full-cluster-tf-upgrade/1.24/variables.eks.tf | 4 ++-- examples/full-cluster-tf-upgrade/1.25/common-services/cert.tf | 3 ++- examples/full-cluster-tf-upgrade/1.25/dns-zone.tf | 3 ++- examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf | 2 +- .../full-cluster-tf-upgrade/1.25/settings.auto.tfvars.example | 4 +--- examples/full-cluster-tf-upgrade/1.25/variables.eks.tf | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/examples/full-cluster-tf-upgrade/1.24/common-services/cert.tf b/examples/full-cluster-tf-upgrade/1.24/common-services/cert.tf index 8b56005..3a99b53 100644 --- a/examples/full-cluster-tf-upgrade/1.24/common-services/cert.tf +++ b/examples/full-cluster-tf-upgrade/1.24/common-services/cert.tf @@ -8,7 +8,8 @@ # ca #--- locals { - ca_dns_name = format("pki.%v.%v", var.cluster_name, var.vpc_domain_name) + vpc_domain_name = coalesce(var.domain.var.vpc_domain_name) + ca_dns_name = format("pki.%v.%v", var.cluster_name, local.vpc_domain_name) # ca_ou = format("ou=%v,ou=EKS,ou=%v,ou=PKI",var.cluster_name,var.vpc_full_name) ca_ou = format("eks-%v-%v-PKI", var.cluster_name, var.vpc_full_name) ca_cert_download = false diff --git a/examples/full-cluster-tf-upgrade/1.24/dns-zone.tf b/examples/full-cluster-tf-upgrade/1.24/dns-zone.tf index a029fb6..edc17c5 100644 --- a/examples/full-cluster-tf-upgrade/1.24/dns-zone.tf +++ b/examples/full-cluster-tf-upgrade/1.24/dns-zone.tf @@ -1,5 +1,6 @@ locals { - cluster_domain_name = format("%v.%v", var.cluster_name, var.vpc_domain_name) + vpc_domain_name = coalesce(var.domain.var.vpc_domain_name) + cluster_domain_name = format("%v.%v", var.cluster_name, local.vpc_domain_name) cluster_domain_description = format("%v EKS Cluster DNS Zone", var.cluster_name) } diff --git a/examples/full-cluster-tf-upgrade/1.24/ec2-keypair.tf b/examples/full-cluster-tf-upgrade/1.24/ec2-keypair.tf index e47db54..e000d4d 100644 --- a/examples/full-cluster-tf-upgrade/1.24/ec2-keypair.tf +++ b/examples/full-cluster-tf-upgrade/1.24/ec2-keypair.tf @@ -20,7 +20,7 @@ resource "null_resource" "generate_keypair" { } provisioner "local-exec" { working_dir = "./setup" - command = "ssh-keygen -f ${local.keypair_name} -N '' -t rsa -b 2048 -C '${local.keypair_name}@${var.cluster_name}.${var.vpc_domain_name}'" + command = "ssh-keygen -f ${local.keypair_name} -N '' -t rsa -b 2048 -C '${local.keypair_name}@${var.cluster_name}.${local.vpc_domain_name}'" } } diff --git a/examples/full-cluster-tf-upgrade/1.24/settings.auto.tfvars.example b/examples/full-cluster-tf-upgrade/1.24/settings.auto.tfvars.example index d00d3a0..584f589 100644 --- a/examples/full-cluster-tf-upgrade/1.24/settings.auto.tfvars.example +++ b/examples/full-cluster-tf-upgrade/1.24/settings.auto.tfvars.example @@ -5,6 +5,7 @@ cluster_name = "{org}-{project}-{env}" cluster_version = "1.24" region = "us-gov-east-1" +## domain = set to correct domain if using a shared vpc eks_instance_disk_size = 40 eks_vpc_name = "{vpc_full_name}" eks_instance_type = "t3.xlarge" diff --git a/examples/full-cluster-tf-upgrade/1.24/variables.eks.tf b/examples/full-cluster-tf-upgrade/1.24/variables.eks.tf index b6ba4ca..761ce1d 100644 --- a/examples/full-cluster-tf-upgrade/1.24/variables.eks.tf +++ b/examples/full-cluster-tf-upgrade/1.24/variables.eks.tf @@ -19,7 +19,7 @@ variable "cluster_name" { variable "cluster_version" { description = "The EKS version number, see https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html" type = string - default = "1.21" + default = "1.24" } variable "eks_instance_type" { @@ -54,5 +54,5 @@ variable "eks_instance_disk_size" { variable "domain" { description = "The DNS domain name of the cluster. Defaults to empty which causes the sample application to use the domain assigned to the load balancer of the istio ingress gateway." type = string - default = "" + default = null } diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/cert.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/cert.tf index 2e57718..bf64c09 100644 --- a/examples/full-cluster-tf-upgrade/1.25/common-services/cert.tf +++ b/examples/full-cluster-tf-upgrade/1.25/common-services/cert.tf @@ -8,7 +8,8 @@ # ca #--- locals { - ca_dns_name = format("pki.%v.%v", var.cluster_name, var.vpc_domain_name) + vpc_domain_name = coalesce(var.domain.var.vpc_domain_name) + ca_dns_name = format("pki.%v.%v", var.cluster_name, local.vpc_domain_name) # ca_ou = format("ou=%v,ou=EKS,ou=%v,ou=PKI",var.cluster_name,var.vpc_full_name) ca_ou = format("eks-%v-%v-PKI", var.cluster_name, var.vpc_full_name) ca_cert_download = false diff --git a/examples/full-cluster-tf-upgrade/1.25/dns-zone.tf b/examples/full-cluster-tf-upgrade/1.25/dns-zone.tf index a029fb6..edc17c5 100644 --- a/examples/full-cluster-tf-upgrade/1.25/dns-zone.tf +++ b/examples/full-cluster-tf-upgrade/1.25/dns-zone.tf @@ -1,5 +1,6 @@ locals { - cluster_domain_name = format("%v.%v", var.cluster_name, var.vpc_domain_name) + vpc_domain_name = coalesce(var.domain.var.vpc_domain_name) + cluster_domain_name = format("%v.%v", var.cluster_name, local.vpc_domain_name) cluster_domain_description = format("%v EKS Cluster DNS Zone", var.cluster_name) } diff --git a/examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf b/examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf index e47db54..e000d4d 100644 --- a/examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf +++ b/examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf @@ -20,7 +20,7 @@ resource "null_resource" "generate_keypair" { } provisioner "local-exec" { working_dir = "./setup" - command = "ssh-keygen -f ${local.keypair_name} -N '' -t rsa -b 2048 -C '${local.keypair_name}@${var.cluster_name}.${var.vpc_domain_name}'" + command = "ssh-keygen -f ${local.keypair_name} -N '' -t rsa -b 2048 -C '${local.keypair_name}@${var.cluster_name}.${local.vpc_domain_name}'" } } diff --git a/examples/full-cluster-tf-upgrade/1.25/settings.auto.tfvars.example b/examples/full-cluster-tf-upgrade/1.25/settings.auto.tfvars.example index da6e8a9..444db69 100644 --- a/examples/full-cluster-tf-upgrade/1.25/settings.auto.tfvars.example +++ b/examples/full-cluster-tf-upgrade/1.25/settings.auto.tfvars.example @@ -5,12 +5,10 @@ cluster_name = "{org}-{project}-{env}" cluster_version = "1.25" region = "us-gov-east-1" +## domain = set to correct domain if using a shared vpc eks_instance_disk_size = 40 eks_vpc_name = "{vpc_full_name}" eks_instance_type = "t3.xlarge" eks_ng_desire_size = 3 eks_ng_max_size = 15 eks_ng_min_size = 3 - - - diff --git a/examples/full-cluster-tf-upgrade/1.25/variables.eks.tf b/examples/full-cluster-tf-upgrade/1.25/variables.eks.tf index 6088491..d8effda 100644 --- a/examples/full-cluster-tf-upgrade/1.25/variables.eks.tf +++ b/examples/full-cluster-tf-upgrade/1.25/variables.eks.tf @@ -54,5 +54,5 @@ variable "eks_instance_disk_size" { variable "domain" { description = "The DNS domain name of the cluster. Defaults to empty which causes the sample application to use the domain assigned to the load balancer of the istio ingress gateway." type = string - default = "" + default = null }