diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 4e7643c..a70be28 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -1,8 +1,8 @@ # lab/_envcommon/default-versions.hcl locals { - module_name = basename(get_original_terragrunt_dir()) - release_version = local.module_versions["2025.20.04"][local.module_name] + module_name = basename(get_original_terragrunt_dir()) + release_version = local.module_versions["2025.20.04"][local.module_name] ##################### # Module Versions @@ -22,7 +22,7 @@ locals { "eks-grafana" = "0.1.4" "eks-istio" = "1.0.6" "eks-k8s-dashboard" = "0.1.3" - "eks-karpenter" = "mcmCluster" + "eks-karpenter" = "0.1.4" "eks-keycloak" = "0.0.6" "eks-kiali" = "0.1.2" "eks-loki" = "0.1.3" @@ -151,8 +151,8 @@ locals { ################ # Karpenter ################ - karpenter_helm_chart = "1.3.3" - karpenter_tag = "1.3.3" + karpenter_helm_chart = "1.4.0" + karpenter_tag = "1.4.0" ################ # Keycloak diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl index f6a9a49..07cc34d 100644 --- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl @@ -27,8 +27,7 @@ dependency "eks" { config_path = "../eks" mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - cluster_name = include.root.inputs.cluster_name - oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock" + cluster_name = include.root.inputs.cluster_name } } @@ -92,9 +91,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 - oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn + cluster_name = dependency.eks.outputs.cluster_name + cluster_domain = dependency.eks_dns.outputs.cluster_domain # Storage Configuration rwo_storage_class = dependency.eks_loki.outputs.rwo_storage_class diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl index fd0ab3e..9f10168 100644 --- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl @@ -35,8 +35,7 @@ dependency "eks" { config_path = "../eks" mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"] mock_outputs = { - cluster_name = include.root.inputs.cluster_name - oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock" + cluster_name = include.root.inputs.cluster_name } } @@ -48,8 +47,7 @@ inputs = { region = include.root.inputs.aws_region # Cluster Configuration - cluster_name = dependency.eks.outputs.cluster_name - oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn + cluster_name = dependency.eks.outputs.cluster_name # Istio Configuration namespace = include.root.inputs.namespaces["istio"]