ITQ/submariner-charts
1
0
Fork 0
mirror of https://github.com/submariner-io/submariner-charts.git synced 2026-09-20 21:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use ENV vars instead of flags

Browse Source 
Switch to using Shipyard's ENV vars instead of flags, much simpler to
understand.

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
This commit is contained in:
Mike Kolesnik
2022-08-01 09:41:47 -04:00
committed by Thomas Pantelis
parent d667fc2546
commit 2f1cd8d728
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -15
View File
@@ -11,30 +11,18 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
include $(SHIPYARD_DIR)/Makefile.inc include $(SHIPYARD_DIR)/Makefile.inc
ifneq (,$(filter ovn,$(_using))) ifneq (,$(filter ovn,$(_using)))
CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
else else
CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
endif endif
override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG) export DEPLOYTOOL = helm
override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm
export DEPLOY_ARGS
GH_URL=https://submariner-io.github.io/submariner-charts/charts GH_URL=https://submariner-io.github.io/submariner-charts/charts
CHARTS_DIR=charts CHARTS_DIR=charts
CHARTS_VERSION=0.13.0-rc2 CHARTS_VERSION=0.13.0-rc2
HELM_DOCS_VERSION=0.15.0 HELM_DOCS_VERSION=0.15.0
REPO_URL=$(shell git config remote.origin.url) 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 # Targets to make
e2e: E2E_ARGS=cluster1 cluster2 e2e: E2E_ARGS=cluster1 cluster2