From 96b5bd67090f622a3feebf5a11456eab29047884 Mon Sep 17 00:00:00 2001
From: Lukasz Raczylo <lukasz@raczylo.com>
Date: Sun, 14 Mar 2021 22:17:09 +0000
Subject: [PATCH] fixup! Set required image tags for prometheus.

---
 step3/Makefile                     |  6 +++++-
 step3/infrastructure/prometheus.tf | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/step3/Makefile b/step3/Makefile
index 8deaaed..de178b3 100644
--- a/step3/Makefile
+++ b/step3/Makefile
@@ -22,4 +22,8 @@ import:
 	cd infrastructure; terraform import $(ADDITIONAL_ARGS) -var-file ../variables.tfvars $(ARGS)
 
 lint:
-	terraform fmt -recursive infrastructure/
\ No newline at end of file
+	terraform fmt -recursive infrastructure/
+
+show:
+	@echo Available services:
+	@kubectl get svc -A | grep -E '(adguard|traefik|torrent)' | awk '{print $$2 ":     \t"$$5}'
\ No newline at end of file
diff --git a/step3/infrastructure/prometheus.tf b/step3/infrastructure/prometheus.tf
index d877fa8..ed6f82f 100644
--- a/step3/infrastructure/prometheus.tf
+++ b/step3/infrastructure/prometheus.tf
@@ -26,18 +26,18 @@ resource "helm_release" "prometheus" {
     name  = "grafana.plugins"
     value = "devopsprodigy-kubegraf-app"
   }
-  set {
-    name  = "prometheus-node-exporter.image.tag"
-    value = "v1.1.2"
-  }
-  set {
-    name = "prometheus.prometheusSpec.image.tag"
-    value = "v2.25.1"
-  }
-  set {
-    name = "prometheus.alertManagerSpec.image.tag"
-    value = "v2.25.1"
-  }
+  # set {
+  #   name  = "prometheus-node-exporter.image.tag"
+  #   value = "v1.1.2"
+  # }
+  # set {
+  #   name = "prometheus.prometheusSpec.image.tag"
+  #   value = "v2.25.1"
+  # }
+  # set {
+  #   name = "prometheus.alertManagerSpec.image.tag"
+  #   value = "v2.25.1"
+  # }
 }
 
 ## SEE following for the dashboard configuration
@@ -71,7 +71,6 @@ kubectl delete ns kubegraf
 resource "null_resource" "prometheus_patch" {
   depends_on = [helm_release.prometheus]
   provisioner "local-exec" {
-    when    = create
     command = <<EOF
 kubectl patch ds prometheus-prometheus-node-exporter --type json -p '[{"op": "remove", "path" : "/spec/template/spec/containers/0/volumeMounts/2/mountPropagation"}]' || true
     EOF