Add Shipyard support for deploying clusters

This allows to quickly and easily deploy clusters (kind, ocp, acm) for testing. The kind clusters run locally and can be used for development, quick testing and CI. Signed-off-by: Mike Kolesnik <[email protected]>
skupperproject · Dec 18, 2023 · 2a14a5a · 2a14a5a
1 parent 628277f
commit 2a14a5a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,9 @@
 
 # Generated files
 manifest.json
+
+# Shipyard generated and downloaded
+.dapper
+Dockerfile.dapper
+Makefile.shipyard
+output/
diff --git a/.shipyard.yml b/.shipyard.yml
@@ -0,0 +1,5 @@
+---
+nodes: control-plane worker
+clusters:
+  cluster1:
+  cluster2:
diff --git a/Makefile b/Makefile
@@ -9,6 +9,16 @@ TEST_BINARIES_FOLDER := ${PWD}/test/integration/bin
 DOCKER := docker
 LDFLAGS := -X github.com/skupperproject/skupper/pkg/version.Version=${VERSION}
 
+# Shipyard configuration
+BASE_BRANCH = main
+LOAD_BALANCER = true
+ORG = skupperproject
+PROJECT = skupper
+SETTINGS = ./.shipyard.yml
+SHIPYARD_REPO = quay.io/mkolesnik
+SHIPYARD_URL = https://raw.githubusercontent.com/mkolesnik/shipyard/remixed/
+export BASE_BRANCH ORG PROJECT SHIPYARD_REPO SHIPYARD_URL
+
 all: generate-client build-cmd build-get build-config-sync build-controllers build-tests build-manifest
 
 build-tests:
@@ -121,3 +131,22 @@ release/darwin.zip: release/darwin/skupper
 
 generate-manifest: build-manifest
 	./manifest
+
+ifneq (,$(DAPPER_HOST_ARCH))
+
+# Running in Shipyard's container
+
+include $(SHIPYARD_DIR)/Makefile.clusters
+
+else
+
+# Not running in Shipyard's container
+
+Makefile.shipyard:
+	@echo Downloading $@
+	@curl -sfLO $(SHIPYARD_URL)/$@
+
+ONLY_SHIPYARD_GOALS = true
+include Makefile.shipyard
+
+endif