From f6a9688c9dfd5dc12ec0d26eada58154cf427ff6 Mon Sep 17 00:00:00 2001 From: Andreas Neue Date: Wed, 14 Jun 2023 10:59:43 +0200 Subject: [PATCH] DEPLOY_TYPE "copy" is now named "simple", \("copy" will work anyways for a while\) --- Makefile | 6 ++++++ helm.mk | 4 ++++ copy.mk => simple.mk | 0 3 files changed, 10 insertions(+) rename copy.mk => simple.mk (100%) diff --git a/Makefile b/Makefile index 29f5a4f..973b289 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,12 @@ DEPLOY_START_DELAY = 0 -include secrets.mk include config.mk -include $(DEPLOY_CONFIG_OVERRIDE) + +# copy ist jetzt simple +ifeq ($(DEPLOY_TYPE), copy) + DEPLOY_TYPE = simple +endif + include make-deploy/$(DEPLOY_TYPE).mk .PHONY: self-update mandatory prerequisites prepare build test deploy pre-deploy post-deploy pre-local post-local upload pull start stop restart reload diff --git a/helm.mk b/helm.mk index 777ef55..1507e79 100644 --- a/helm.mk +++ b/helm.mk @@ -13,6 +13,10 @@ ifdef TEST_MODE @ envsubst < ${HELM_VALUES_FILE} | helm template ${HELM_CHART_NAME} ${HELM_CHART_PATH} --debug --values - endif +ifdef NAMESPACE + K8S_NAMESPACE = $(NAMESPACE) +endif + @- echo "\n### deploying helm chart" @- echo "-- DEPLOYMENT --------------------" @- echo " " diff --git a/copy.mk b/simple.mk similarity index 100% rename from copy.mk rename to simple.mk