From 2f1cd8d728d7777209dcc2f344c0ef7c9ee5a139 Mon Sep 17 00:00:00 2001 From: Mike Kolesnik Date: Thu, 28 Jul 2022 00:24:24 +0300 Subject: [PATCH] Use ENV vars instead of flags Switch to using Shipyard's ENV vars instead of flags, much simpler to understand. Signed-off-by: Mike Kolesnik --- Makefile | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 1e73cd0..3d0be5c 100644 --- a/Makefile +++ b/Makefile @@ -11,30 +11,18 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent include $(SHIPYARD_DIR)/Makefile.inc ifneq (,$(filter ovn,$(_using))) -CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml +export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml else -CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml +export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml endif -override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG) -override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm -export DEPLOY_ARGS +export DEPLOYTOOL = helm GH_URL=https://submariner-io.github.io/submariner-charts/charts CHARTS_DIR=charts CHARTS_VERSION=0.13.0-rc2 HELM_DOCS_VERSION=0.15.0 REPO_URL=$(shell git config remote.origin.url) -# Process extra flags from the `using=a,b,c` optional flag - -ifneq (,$(filter lighthouse,$(_using))) -override DEPLOY_ARGS += --service_discovery -endif - -ifneq (,$(filter globalnet,$(_using))) -override DEPLOY_ARGS += --globalnet -endif - # Targets to make e2e: E2E_ARGS=cluster1 cluster2