From 34c1887498bf6040d30b12432ce62b208778ca1b Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 16 Jan 2025 21:24:29 -0500 Subject: [PATCH] do not pass kubectl_image_tag --- lab/_envcommon/default-versions.hcl | 8 ++++---- .../vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl index 6a147b5..5fe0fa9 100644 --- a/lab/_envcommon/default-versions.hcl +++ b/lab/_envcommon/default-versions.hcl @@ -4,9 +4,9 @@ locals { ##################### # Module Versions ##################### - cluster_version = "1.30" + cluster_version = "1.31" custom_service_eks_account = "${local.release_version}" - eks_module_version = "20.28.0" + eks_module_version = "20.31.6" istio_ingress_version = "${local.release_version}" release_version = "0.1.1" @@ -19,12 +19,12 @@ locals { null_version = "3.2.1" random_version = "3.5.1" template_version = "2.2.0" - tf_version = "1.5.0" + tf_version = "1.8.0" # since we are using provider functions ##################### # EKS Config ##################### - kubectl_image_tag = "1.30.4" + # kubectl_image_tag = "1.30.4" ################ # k8s-dashboard 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 d4a60db..469e29d 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=no_kubectl" extra_arguments "retry_lock" { commands = get_terraform_commands_that_need_locking() arguments = ["-lock-timeout=20m"] @@ -38,5 +38,5 @@ inputs = { security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn - kubectl_image_tag = include.root.inputs.kubectl_image_tag + # kubectl_image_tag = include.root.inputs.kubectl_image_tag }