From d113199eafd36429fe5dcac6182a35ef01eba2d7 Mon Sep 17 00:00:00 2001
From: Florian Zink <florian.zink@chefkoch.de>
Date: Fri, 23 Dec 2022 14:48:22 +0100
Subject: [PATCH] Update helm deploy type

---
 helm.mk | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/helm.mk b/helm.mk
index ef74dc2..e4f08da 100644
--- a/helm.mk
+++ b/helm.mk
@@ -1,21 +1,24 @@
-MANDATORY-helm = K8S_CONTEXT
+MANDATORY-helm = K8S_CONTEXT HELM_CHART_NAME HELM_CHART_PATH HELM_VALUES_FILE NAMESPACE
 # helm
 #
-# deploys helm charts on k8s via helmfile
+# deploys helm charts on k8s via helm
 #
 start-helm:
-	@- echo "\n### starting deployment with helmfile"
+	@- echo "\n### starting deployment with helm"
 	@- echo "\n### setting kubernetes context to $(K8S_CONTEXT)"
 	@ kubectl config use-context $(K8S_CONTEXT)
-#
-	@- echo "\n### create namespace $(NAMESPACE)"
-	@- kubectl create namespace "$(NAMESPACE)" --dry-run=client -o yaml | kubectl apply -f - 
-#
-	@- echo "\n### run kubectl apply -f secrets.yaml"
-	@- kubectl apply -f secrets.yaml -o yaml
-#
+
 	@- echo "\n### deploying helm chart"
-	@ helmfile --file helmfile.yaml apply --suppress-secrets
-#
+	@- echo "-- DEPLOYMENT --------------------"
+	@- echo " "
+	@- echo "Namespace: $(NAMESPACE)"
+	@- echo "Helm Chart: $(HELM_CHART_PATH)"
+	@- echo "Values File: $(HELM_VALUES_FILE)"
+	@- echo " "
+	@- echo "----------------------------------"
+
+	@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(NAMESPACE)  --install --wait --values -
+
+
 pull-helm:
 # nop