From f256a14f7f08dc7ded644cb557d587f75ad3838d Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 21 Sep 2021 15:57:47 -0500 Subject: [PATCH 1/2] Change makefile --- Makefile | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) mode change 120000 => 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 120000 index 77ebae1bd..000000000 --- a/Makefile +++ /dev/null @@ -1 +0,0 @@ -common/Makefile \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..dbc569432 --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ +BOOTSTRAP=1 + +show: + make -f common/Makefile show + +init: + make -f common/Makefile init + +deploy: + make -f common/Makefile deploy +ifeq ($(BOOTSTRAP),1) + make -f common/Makefile TARGET_NAMESPACE=manuela-ci argosecret +endif + +upgrade: + make -f common/Makefile upgrade +ifeq ($(BOOTSTRAP),1) + make -f common/Makefile TARGET_NAMESPACE=manuela-ci argosecret +endif + +uninstall: + make -f common/Makefile uninstall + +.phony: install From 8c341a3198932cef31e20c0cf872222ae8c926ed Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 21 Sep 2021 18:14:48 -0500 Subject: [PATCH 2/2] Parameterize namespace to install argo secret in --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dbc569432..79e0d1add 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ BOOTSTRAP=1 +ARGO_TARGET_NAMESPACE=manuela-ci show: make -f common/Makefile show @@ -9,13 +10,13 @@ init: deploy: make -f common/Makefile deploy ifeq ($(BOOTSTRAP),1) - make -f common/Makefile TARGET_NAMESPACE=manuela-ci argosecret + make -f common/Makefile TARGET_NAMESPACE=$(ARGO_TARGET_NAMESPACE) argosecret endif upgrade: make -f common/Makefile upgrade ifeq ($(BOOTSTRAP),1) - make -f common/Makefile TARGET_NAMESPACE=manuela-ci argosecret + make -f common/Makefile TARGET_NAMESPACE=$(ARGO_TARGET_NAMESPACE) argosecret endif uninstall: