feat: generate provider configs for kubectl & helm (#1044)

* feat: allow variables to specify values in main.tf * filter out nonexistent variables * loop * feat: generate provider configs for kubectl & helm * remove custom provider * tidy * conditionals * index
chanzuckerberg · Apr 26, 2024 · d832a3c · d832a3c
1 parent 4ca082b
commit d832a3c
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 8 deletions.
diff --git a/config/v2/resolvers.go b/config/v2/resolvers.go
@@ -659,7 +659,6 @@ func ResolveHelmProvider(commons ...Common) *HelmProvider {
 			}
 		}
 	}
-
 	if version != nil {
 		return &HelmProvider{
 			CommonProvider: CommonProvider{

diff --git a/templates/templates/common/helm_provider.tmpl b/templates/templates/common/helm_provider.tmpl
@@ -0,0 +1,9 @@
+{{ define "helm_provider" -}}
+provider "helm" {
+  kubernetes {
+    host                   = data.aws_eks_cluster.cluster.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
+    token                  = data.aws_eks_cluster_auth.cluster.token
+  }
+}
+{{ end }}
diff --git a/templates/templates/common/kubectl_provider.tmpl b/templates/templates/common/kubectl_provider.tmpl
@@ -0,0 +1,9 @@
+{{ define "kubectl_provider" -}}
+provider "kubectl" {
+  host                   = data.aws_eks_cluster.cluster.endpoint
+  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
+  token                  = data.aws_eks_cluster_auth.cluster.token
+  load_config_file       = false
+  apply_retry_count      = 15
+}
+{{ end }}
diff --git a/templates/templates/common/kubernetes_provider.tmpl b/templates/templates/common/kubernetes_provider.tmpl
@@ -1,16 +1,28 @@
 {{ define "kubernetes_provider" -}}
-{{ if .ClusterComponentName -}}
+{{ if .Kubernetes.ClusterComponentName -}}
   data "aws_eks_cluster" "cluster" {
-    name = data.terraform_remote_state.{{ .ClusterComponentName }}.outputs.cluster_id
+    name = data.terraform_remote_state.{{ .Kubernetes.ClusterComponentName }}.outputs.cluster_id
   }
 
   data "aws_eks_cluster_auth" "cluster" {
-    name = data.terraform_remote_state.{{ .ClusterComponentName }}.outputs.cluster_id
+    name = data.terraform_remote_state.{{ .Kubernetes.ClusterComponentName }}.outputs.cluster_id
   }
 
 provider "kubernetes" {
   host                   = data.aws_eks_cluster.cluster.endpoint
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
+  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
   token                  = data.aws_eks_cluster_auth.cluster.token
 }
-{{ end }}{{ end }}
+{{if .Helm -}}{{if not .Helm.CustomProvider -}}
+{{template "helm_provider" .Helm -}}
+{{ end }}
+{{ end }}
+
+{{- if .Kubectl -}}{{- if not .Kubectl.CustomProvider -}}
+{{template "kubectl_provider" .Kubectl -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- end -}}
+{{- end -}}
diff --git a/templates/templates/component/terraform/fogg.tf.tmpl b/templates/templates/component/terraform/fogg.tf.tmpl
@@ -77,7 +77,7 @@ variable "TFC_PROJECT_NAME" {
 {{ end }}{{ end }}
 
 {{- if .ProviderConfiguration.Kubernetes -}}{{- if not .ProviderConfiguration.Kubernetes.CustomProvider -}}
-  {{- template "kubernetes_provider" .ProviderConfiguration.Kubernetes -}}
+  {{- template "kubernetes_provider" .ProviderConfiguration -}}
 {{- end -}}{{- end -}}
 
 terraform {

diff --git a/testdata/v2_full_yaml/fogg.yml b/testdata/v2_full_yaml/fogg.yml
@@ -124,6 +124,10 @@ envs:
             enabled: true
             cluster_component_name: comp1
             version: 2.19.0
+          helm:
+            enabled: true
+          kubectl:
+            enabled: true
     extra_vars:
       foo: bar2
 modules:

diff --git a/testdata/v2_full_yaml/terraform/envs/staging/k8s-comp/fogg.tf b/testdata/v2_full_yaml/terraform/envs/staging/k8s-comp/fogg.tf