Use reload-images from Shipyard

As it has been added in Shipyard a while ago, use it from there. Signed-off-by: Mike Kolesnik <[email protected]>
submariner-io · Feb 22, 2022 · 34836c4 · 34836c4
1 parent 1c26ed6
commit 34836c4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 43 deletions.
diff --git a/Makefile b/Makefile
@@ -8,13 +8,11 @@ ifneq (,$(DAPPER_HOST_ARCH))
 BINARIES := bin/lighthouse-agent bin/lighthouse-coredns
 IMAGES := lighthouse-agent lighthouse-coredns
 PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent $(IMAGES)
+SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
 
 include $(SHIPYARD_DIR)/Makefile.inc
 
 TARGETS := $(shell ls -p scripts | grep -v -e / -e deploy)
-CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
-override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
-override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG)
 override E2E_ARGS += cluster1 cluster2 cluster3
 override UNIT_TEST_ARGS += test/e2e
 override DEPLOY_ARGS += --service_discovery

diff --git a/scripts/reload-images b/scripts/reload-images