Merge pull request #15 from SCT-Engineering/no_kubectl

No kubectl
SCT-Engineering · Jan 27, 2025 · 4a82f48 · 4a82f48
2 parents c82b7ce + 1f049d0
commit 4a82f48
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 47 deletions.
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -4,27 +4,27 @@ 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.1"
   istio_ingress_version      = "${local.release_version}"
   release_version            = "0.1.1"
 
   #####################
   # TF Providers
   #####################
-  aws_version        = "5.14.0"
+  aws_version        = "5.84.0"
   helm_version       = "2.11.0"
   kubernetes_version = "2.33.0"
   null_version       = "3.2.1"
   random_version     = "3.5.1"
   template_version   = "2.2.0"
-  tf_version         = "1.5.0"
+  tf_version         = "1.5.5"
 
   #####################
   # EKS Config
   #####################
-  kubectl_image_tag = "1.30.4"
+  # kubectl_image_tag = "1.30.4"
 
   ################
   # k8s-dashboard
@@ -41,28 +41,28 @@ locals {
   cert_manager_controller_tag      = "v${local.cert_manager_version}"
   cert_manager_helm_chart          = "${local.cert_manager_version}"
   cert_manager_startupapicheck_tag = "v${local.cert_manager_version}"
-  cert_manager_version             = "1.16.1"
+  cert_manager_version             = "1.16.3"
   cert_manager_webhook_tag         = "v${local.cert_manager_version}"
 
   ################
   # Istio
   ################
-  istio_version = "1.22.1"
+  istio_version = "1.24.2"
 
   ################
   # Grafana
   ################
   download_dashboards_image_tag = "7.85.0"
-  grafana_chart_version         = "8.5.0"
+  grafana_chart_version         = "8.8.5"
   grafana_hostname              = "grafana"
-  grafana_tag                   = "11.1.5"
+  grafana_tag                   = "11.4.0"
   init_chown_data_image_tag     = "1.31.1"
 
   ################
   # Karpenter
   ################
-  karpenter_helm_chart = "1.0.6"
-  karpenter_tag        = "1.0.6"
+  karpenter_helm_chart = "1.1.1"
+  karpenter_tag        = "1.1.1"
 
   ################
   # Kiali
@@ -73,8 +73,8 @@ locals {
   ################
   # Loki
   ################
-  loki_chart_version              = "6.10.2"
-  loki_tag                        = "3.1.1"
+  loki_chart_version              = "6.25.0"
+  loki_tag                        = "3.3.2"
   canary_tag                      = "3.0.0"
   enterprise_logs_provisioner_tag = "v1.7.0"
   gateway_tag                     = "1.25.2-alpine"
@@ -102,6 +102,6 @@ locals {
   ################
   # Tempo
   ################
-  tempo_chart_version = "1.10.3"
-  tempo_tag           = "2.5.0"
+  tempo_chart_version = "1.18.1"
+  tempo_tag           = "2.7.0"
 }
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
@@ -26,15 +26,16 @@ dependency "eks_config" {
 }
 
 inputs = {
-  cluster_name                     = dependency.eks.outputs.cluster_name
-  cluster_mailing_list             = dependency.eks.inputs.creator
-  oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
-  profile                          = include.root.inputs.aws_profile
-  region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
   cert_manager_cainjector_tag      = include.root.inputs.cert_manager_cainjector_tag
   cert_manager_controller_tag      = include.root.inputs.cert_manager_controller_tag
+  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
   cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
   cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
   cluster_issuer_name              = include.root.inputs.cluster_issuer_name
+  cluster_mailing_list             = dependency.eks.inputs.creator
+  cluster_name                     = dependency.eks.outputs.cluster_name
+  oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
+  profile                          = include.root.inputs.aws_profile
+  region                           = include.root.inputs.aws_region
+  release_version                  = include.root.inputs.release_version
 }
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
@@ -30,13 +30,13 @@ dependency "eks" {
 }
 
 inputs = {
-  profile                                         = include.root.inputs.aws_profile
-  region                                          = include.root.inputs.aws_region
-  vpc_id                                          = dependency.eks.outputs.vpc_id
   cluster_name                                    = dependency.eks.outputs.cluster_name
-  subnets                                         = dependency.eks.outputs.subnets
-  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
+  profile                                         = include.root.inputs.aws_profile
+  region                                          = include.root.inputs.aws_region
+  release_version                                 = include.root.inputs.release_version
+  security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
+  subnets                                         = dependency.eks.outputs.subnets
+  vpc_id                                          = dependency.eks.outputs.vpc_id
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
@@ -34,9 +34,9 @@ inputs = {
   istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
   profile           = include.root.inputs.aws_profile
   region            = include.root.inputs.aws_region
+  route53_endpoints = include.root.inputs.route53_endpoints
   subnets           = dependency.eks.outputs.subnets
   tags              = dependency.eks.inputs.tags
   vpc_domain_name   = dependency.eks.inputs.vpc_domain_name
   vpc_name          = dependency.eks.inputs.vpc_name
-  route53_endpoints = include.root.inputs.route53_endpoints
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
@@ -27,14 +27,14 @@ dependency "eks-loki" {
 }
 
 inputs = {
-  profile                       = include.root.inputs.aws_profile
-  region                        = include.root.inputs.aws_region
-  cluster_name                  = dependency.eks.outputs.cluster_name
   cluster_domain                = dependency.eks.inputs.vpc_domain_name
-  public_hostname               = include.root.inputs.grafana_hostname
-  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
+  cluster_name                  = dependency.eks.outputs.cluster_name
+  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
   grafana_chart_version         = include.root.inputs.grafana_chart_version
   grafana_tag                   = include.root.inputs.grafana_tag
-  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
   init_chown_data_image_tag     = include.root.inputs.init_chown_data_image_tag
+  profile                       = include.root.inputs.aws_profile
+  public_hostname               = include.root.inputs.grafana_hostname
+  region                        = include.root.inputs.aws_region
+  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
 }
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
@@ -24,9 +24,9 @@ dependency "eks-karpenter" {
 }
 
 inputs = {
-  profile             = include.root.inputs.aws_profile
-  region              = include.root.inputs.aws_region
   cluster_name        = dependency.eks.outputs.cluster_name
   istio_chart_version = include.root.inputs.istio_version
   istio_version       = include.root.inputs.istio_version
+  profile             = include.root.inputs.aws_profile
+  region              = include.root.inputs.aws_region
 }
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
@@ -26,11 +26,11 @@ dependency "eks-loki" {
 }
 
 inputs = {
-  profile               = include.root.inputs.aws_profile
-  region                = include.root.inputs.aws_region
-  cluster_name          = dependency.eks.outputs.cluster_name
+  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
   cluster_domain        = dependency.eks.inputs.vpc_domain_name
-  public_hostname       = include.root.inputs.dashboard_hostname
+  cluster_name          = dependency.eks.outputs.cluster_name
   k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+  profile               = include.root.inputs.aws_profile
+  public_hostname       = include.root.inputs.dashboard_hostname
+  region                = include.root.inputs.aws_region
 }
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
@@ -29,15 +29,14 @@ dependency "eks-config" {
 }
 
 inputs = {
-  profile                   = include.root.inputs.aws_profile
-  region                    = include.root.inputs.aws_region
   cluster_endpoint          = dependency.eks.outputs.cluster_endpoint
   cluster_name              = dependency.eks.outputs.cluster_name
+  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
   karpenter_node_group_name = dependency.eks.outputs.node_group_name
+  karpenter_tag             = include.root.inputs.karpenter_tag
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
+  profile                   = include.root.inputs.aws_profile
+  region                    = include.root.inputs.aws_region
+  release_version           = include.root.inputs.release_version
   vpc_id                    = dependency.eks.outputs.vpc_id
-  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
-  karpenter_tag             = include.root.inputs.karpenter_tag
-  kubectl_tag               = include.root.inputs.kubectl_image_tag
-
 }