Merge pull request #34 from sparkfabrik/remove_helm_output

feat: remove helm values output
sparkfabrik · Nov 4, 2024 · 36f77b7 · 36f77b7
2 parents 15f0ab0 + 5d67e1c
commit 36f77b7
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 112 deletions.
diff --git a/examples/main.tf b/examples/main.tf
@@ -11,12 +11,8 @@ terraform {
       source  = "hashicorp/kubernetes"
       version = ">= 2.19"
     }
-    template = {
-      source  = "hashicorp/template"
-      version = ">= 2.2.0"
-    }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
       version = "3.6.2"
     }
   }

diff --git a/examples/outputs.tf b/examples/outputs.tf
@@ -9,15 +9,3 @@ output "drupal_apps_bucket_credentials" {
   description = "Drupal apps bucket credentials for each Drupal project."
   value       = module.drupal_resources.drupal_apps_bucket_credentials
 }
-
-output "helm_values_for_buckets" {
-  sensitive   = true
-  description = "Helm values for buckets to be entered into the gitlab pipeline"
-  value       = module.drupal_resources.helm_values_for_buckets
-}
-
-output "helm_values_for_databases" {
-  sensitive   = true
-  description = "Helm values for databases to be entered into the gitlab pipeline"
-  value       = module.drupal_resources.helm_values_for_databases
-}
diff --git a/files/template/helm_bucket.tpl b/files/template/helm_bucket.tpl
diff --git a/files/template/helm_database.tpl b/files/template/helm_database.tpl
diff --git a/outputs.tf b/outputs.tf
@@ -10,18 +10,6 @@ output "drupal_apps_bucket_credentials" {
   value       = module.drupal_buckets[*].buckets_access_credentials
 }
 
-output "drupal_apps_helm_values_for_buckets" {
-  sensitive   = true
-  description = "Output helm values to be used for buckets for each Drupal project."
-  value       = data.template_file.helm_values_for_buckets
-}
-
-output "drupal_apps_helm_values_for_databases" {
-  sensitive   = true
-  description = "Output helm values to be used for databases for each Drupal project."
-  value       = data.template_file.helm_values_for_databases
-}
-
 output "details_of_used_tag_keys" {
   description = "Details of the tag keys passed to this module."
   value       = module.drupal_buckets[*].details_of_used_tag_keys

diff --git a/secrets.tf b/secrets.tf
@@ -10,32 +10,6 @@ locals {
   } : {}
 }
 
-data "template_file" "helm_values_for_buckets" {
-  for_each = {
-    for o in local.map_of_drupal_buckets : o.name => o
-    if var.create_buckets == true
-  }
-
-  template = templatefile("${path.module}/files/template/helm_bucket.tpl",
-    {
-      bucket_secret_name = kubernetes_secret.bucket_secret_name[each.key].metadata[0].name
-    }
-  )
-}
-
-data "template_file" "helm_values_for_databases" {
-  for_each = {
-    for o in local.map_of_drupal_databases : o.database => o
-    if var.create_databases_and_users == true
-  }
-
-  template = templatefile("${path.module}/files/template/helm_database.tpl",
-    {
-      database_secret_name = kubernetes_secret.database_secret_name[each.key].metadata[0].name
-    }
-  )
-}
-
 resource "kubernetes_secret" "bucket_secret_name" {
   for_each = {
     for o in local.map_of_drupal_buckets : o.name => o

diff --git a/versions.tf b/versions.tf
@@ -11,12 +11,8 @@ terraform {
       source  = "hashicorp/kubernetes"
       version = ">= 2.19"
     }
-    template = {
-      source  = "hashicorp/template"
-      version = ">= 2.2.0"
-    }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
       version = "3.6.2"
     }
   }