chore(DMVP-2601): cleanup and add dependency

dasmeta · Aug 24, 2023 · 0f05015 · 0f05015
1 parent e11364c
commit 0f05015
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/modules/node-problem-detector/README.md b/modules/node-problem-detector/README.md
@@ -10,7 +10,6 @@ https://artifacthub.io/packages/helm/deliveryhero/node-problem-detector
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.0 |
 
 ## Providers
 
@@ -20,7 +19,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_jenkins"></a> [jenkins](#module\_jenkins) | terraform-module/release/helm | 2.6.0 |
+| <a name="module_node-problem-detector"></a> [node-problem-detector](#module\_node-problem-detector) | terraform-module/release/helm | 2.6.0 |
 
 ## Resources
 

diff --git a/modules/node-problem-detector/main.tf b/modules/node-problem-detector/main.tf
@@ -1,4 +1,4 @@
-module "jenkins" {
+module "node-problem-detector" {
   source  = "terraform-module/release/helm"
   version = "2.6.0"
 
@@ -14,26 +14,9 @@ module "jenkins" {
     recreate_pods = false
     deploy        = 1
   }
-  values = [templatefile("${path.module}/values.yaml", {
-    # region                = var.region
-    # storage               = "4Gi"
-  })]
+  values = [templatefile("${path.module}/values.yaml", {})]
 
-  set = [
-    # {
-    #   name  = "labels.kubernetes\\.io/name"
-    #   value = "jenkins"
-    # },
-    # {
-    #   name  = "service.labels.kubernetes\\.io/name"
-    #   value = "jenkins"
-    # },
-  ]
+  set = []
 
-  set_sensitive = [
-    # {
-    #   path  = "master.adminUser"
-    #   value = "jenkins"
-    # },
-  ]
+  set_sensitive = []
 }
diff --git a/modules/node-problem-detector/versions.tf b/modules/node-problem-detector/versions.tf
@@ -1,13 +1,3 @@
 terraform {
   required_version = ">= 1.0.0"
-  required_providers {
-    helm = ">= 2.0"
-    # kubernetes = {
-    #   version = "~>2.12"
-    # }
-    # kubectl = {
-    #   source  = "gavinbunney/kubectl"
-    #   version = "~>1.14"
-    # }
-  }
 }
diff --git a/node-problem-detector.tf b/node-problem-detector.tf
@@ -2,4 +2,8 @@ module "node-problem-detector" {
   source = "./modules/node-problem-detector"
 
   count = var.enable_node_problem_detector ? 1 : 0
+
+  depends_on = [
+    module.eks-cluster
+  ]
 }