diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 7754fb5..237054a 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -47,6 +47,7 @@ locals { ################ # Istio ################ + istio_namespace = "istio-system" istio_version = "1.24.2" ################ diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl index 7c89235..82de792 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl @@ -39,6 +39,6 @@ inputs = { oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn # Istio Configuration - istio_namespace = include.root.inputs.istio_namespace - istio_version = include.root.inputs.istio_version + namespace = include.root.inputs.istio_namespace + istio_version = include.root.inputs.istio_version } diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl index 3e6e80d..6cbe233 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl @@ -15,7 +15,8 @@ terraform { dependencies { paths = [ "../eks", - "../eks-config" + "../eks-config", + "../eks-dns" ] } @@ -28,6 +29,15 @@ dependency "eks" { } } +dependency "eks-dns" { + config_path = "../eks-dns" + mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] + mock_outputs = { + cluster_domain = "mock.example.com" + oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock" + } +} + inputs = { # AWS Configuration account_id = include.root.inputs.aws_account_id @@ -35,7 +45,8 @@ inputs = { region = include.root.inputs.aws_region # Cluster Configuration - cluster_name = dependency.eks.outputs.cluster_name + cluster_domain = dependency.eks-dns.outputs.cluster_domain + cluster_name = dependency.eks.outputs.cluster_name # Dashboard Configuration k8s_dashboard_version = include.root.inputs.k8s_dashboard_version 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 6d1aeb2..7d376f9 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 @@ -22,9 +22,10 @@ dependency "eks" { mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - cluster_name = include.root.inputs.cluster_name + cluster_name = "mock-cluster" cluster_endpoint = "https://mock-endpoint.eks.amazonaws.com" oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock" + node_group_name = "mock-node-group" vpc_id = "vpc-mock" subnets = ["subnet-mock1", "subnet-mock2"] } @@ -37,12 +38,12 @@ inputs = { region = include.root.inputs.aws_region # Cluster Configuration + cluster_endpoint = dependency.eks.outputs.cluster_endpoint cluster_name = dependency.eks.outputs.cluster_name oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn - subnets = dependency.eks.outputs.subnets - vpc_id = dependency.eks.outputs.vpc_id # Karpenter Configuration - karpenter_tag = include.root.inputs.karpenter_tag - karpenter_version = include.root.inputs.karpenter_version + karpenter_tag = include.root.inputs.karpenter_tag + karpenter_helm_chart = include.root.inputs.karpenter_helm_chart + karpenter_node_group_name = dependency.eks.outputs.node_group_name } 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 a10eb79..f12f202 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 @@ -22,11 +22,6 @@ inputs = { # Core Cluster Configuration cluster_name = include.root.inputs.cluster_name cluster_version = include.root.inputs.cluster_version - subnets = include.root.inputs.subnet_ids - vpc_id = include.root.inputs.vpc_id - - # Node Group Configuration - eks_managed_node_groups = include.root.inputs.eks_managed_node_groups # Additional Configuration tags = include.root.inputs.tags