worked in cicd

SCT-Engineering · Dec 18, 2024 · f5d13b6 · f5d13b6
1 parent 7cf9fe0
commit f5d13b6
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 466 deletions.
diff --git a/lab/_envcommon/aws-provider.hcl b/lab/_envcommon/aws-provider.hcl
diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
diff --git a/lab/_envcommon/kubernetes-provider.hcl b/lab/_envcommon/kubernetes-provider.hcl
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
@@ -25,33 +25,6 @@ dependency "eks_config" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name
   cluster_mailing_list             = dependency.eks.inputs.creator

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
@@ -24,36 +24,33 @@ dependency "eks" {
     oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
     security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
     subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
-    cluster_token                                           = [{ token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER" }]
+    cluster_token                                   = [{ token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER" }]
     vpc_id                                          = "a-vpc-id"
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
+generate "kubectl-provider" {
+  path      = "kubectl-provider.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.cluster_token.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
+  %{ if dependency.eks.outputs.cluster_name != "a-cluster-name" ~}
+  data "aws_eks_cluster" "kubectl" {
+    name = "${dependency.eks.outputs.cluster_name}"
   }
-}
-%{endif}
-EOF
+  provider "kubectl" {
+    apply_retry_count      = 5
+    host                   = data.aws_eks_cluster.kubectl.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.kubectl.certificate_authority[0].data)
+    load_config_file       = false
+
+    exec {
+      api_version = "client.authentication.k8s.io/v1beta1"
+      command     = "aws"
+      args = ["eks", "get-token", "--cluster-name", "${dependency.eks.outputs.cluster_name}", "--region", "${include.root.inputs.aws_region}"]
+    }
+  }
+  %{ endif ~}
+  EOF
 }
 
 inputs = {

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
@@ -29,33 +29,6 @@ dependency "istio" {
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   cluster_name      = dependency.eks.inputs.cluster_name
   istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb

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
@@ -26,33 +26,6 @@ dependency "eks-loki" {
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   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-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
@@ -18,38 +18,12 @@ dependency "eks" {
     cluster_name = "a-cluster-name"
   }
 }
+
 dependency "eks-karpenter" {
   config_path  = "../eks-karpenter"
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   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
@@ -25,33 +25,6 @@ dependency "eks-loki" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile               = include.root.inputs.aws_profile
   region                = include.root.inputs.aws_region