From e75e70efc8f518a512dd77638c3eb80bed08192b Mon Sep 17 00:00:00 2001
From: Andreas Neue <an@dnix.de>
Date: Wed, 25 Jun 2025 09:51:49 +0200
Subject: [PATCH] helm.mk: building the helm command and params is now
 hopefully smarter

---
 helm.mk | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/helm.mk b/helm.mk
index 394fb8c..06d39cb 100644
--- a/helm.mk
+++ b/helm.mk
@@ -23,21 +23,15 @@ ifdef HELM_REPO_URL
 	@- helm repo update $(HELM_CHART_NAME)
 endif
 
+	@ $(eval helm_params = $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --wait --values)
 ifdef DEBUG_MODE
-	@- echo "\n### deploying helm chart with --debug flag"
-	@- echo "-- DEBUG DEPLOYMENT --------------------"
-	@- echo " "
-	@- echo "Namespace: $(K8S_NAMESPACE)"
-	@- echo "Helm Chart: $(HELM_CHART_PATH)"
-	@- echo "Helm Version (use latest if empty): $(HELM_CHART_VERSION)"
-	@- echo "Values File: $(HELM_VALUES_FILE)"
-	@- echo " "
-	@- echo "----------------------------------"
+	@ $(eval helm_params = $(helm_params) --debug)
+endif
+ifdef K8S_KUBECONFIG
+	@ $(eval helm_params = $(helm_params) --kubeconfig $(K8S_KUBECONFIG))
+endif
+	@ $(eval helm_params = $(helm_params) - --version $(HELM_CHART_VERSION))
 
-	@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --debug --wait --values - --version "$(HELM_CHART_VERSION)"
-
-else
-	
 	@- echo "\n### deploying helm chart"
 	@- echo "-- DEPLOYMENT --------------------"
 	@- echo " "
@@ -48,10 +42,7 @@ else
 	@- echo " "
 	@- echo "----------------------------------"
 
-	@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --wait --values - --version "$(HELM_CHART_VERSION)"
-
-endif
-
+	envsubst < $(HELM_VALUES_FILE) | helm upgrade $(helm_params)
 
 pull-helm:
 # nop