diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index dd0b36b..15dbfbc 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -6,9 +6,9 @@ locals { ##################### cluster_version = "1.31" custom_service_eks_account = "${local.release_version}" - eks_module_version = "20.31.1" + eks_module_version = "20.33.1" istio_ingress_version = "${local.release_version}" - release_version = "0.1.1" + release_version = "main" ##################### # TF Providers diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index a2e6077..9bca740 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -5,7 +5,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=no-kubectl" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl index 772e72d..82b857a 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl @@ -7,7 +7,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=main" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl index bbf116b..93b4bee 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl @@ -5,7 +5,7 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=main" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl index ba46766..afbab7d 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl @@ -5,25 +5,25 @@ include "root" { } terraform { - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=taints" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] } } -inputs = { - cluster_endpoint_public_access = include.root.inputs.cluster_endpoint_public_access - cluster_name = include.root.inputs.cluster_name - cluster_version = include.root.inputs.cluster_version - creator = include.root.inputs.creator - eks_instance_disk_size = include.root.inputs.eks_instance_disk_size - eks_ng_desired_size = include.root.inputs.eks_ng_desired_size - eks_ng_max_size = include.root.inputs.eks_ng_max_size - eks_ng_min_size = include.root.inputs.eks_ng_min_size - eks_vpc_name = include.root.inputs.vpc_name - enable_cluster_creator_admin_permissions = include.root.inputs.enable_cluster_creator_admin_permissions - environment_abbr = include.root.inputs.environment_abbr - tags = include.root.inputs.tags - vpc_name = include.root.inputs.vpc_name -} +# inputs = { +# cluster_endpoint_public_access = include.root.inputs.cluster_endpoint_public_access +# cluster_name = include.root.inputs.cluster_name +# cluster_version = include.root.inputs.cluster_version +# creator = include.root.inputs.creator +# eks_instance_disk_size = include.root.inputs.eks_instance_disk_size +# eks_ng_desired_size = include.root.inputs.eks_ng_desired_size +# eks_ng_max_size = include.root.inputs.eks_ng_max_size +# eks_ng_min_size = include.root.inputs.eks_ng_min_size +# eks_vpc_name = include.root.inputs.vpc_name +# enable_cluster_creator_admin_permissions = include.root.inputs.enable_cluster_creator_admin_permissions +# environment_abbr = include.root.inputs.environment_abbr +# tags = include.root.inputs.tags +# vpc_name = include.root.inputs.vpc_name +# } diff --git a/lab/root.hcl b/lab/root.hcl index 7253386..d24ce01 100644 --- a/lab/root.hcl +++ b/lab/root.hcl @@ -98,7 +98,7 @@ generate "kube-provider" { path = "kube-provider.tf" if_exists = "overwrite" contents = <<-EOF -%{ if startswith(local.module_name, "tfmod-eks-") ~} +%{ if local.module_name != "tfmod-eks") ~} data "aws_eks_cluster" "kube" { name = "${local.cluster_name}" } @@ -119,7 +119,7 @@ generate "helm-provider" { path = "helm-provider.tf" if_exists = "overwrite" contents = <<-EOF -%{ if startswith(local.module_name, "tfmod-eks-") ~} +%{ if local.module_name != "tfmod-eks") ~} data "aws_eks_cluster" "helm" { name = "${local.cluster_name}" }