Skip to content

Commit b197389

Browse files
committed
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 <mkolesni@redhat.com>
1 parent 2cf971d commit b197389

3 files changed

Lines changed: 39 additions & 0 deletions

File tree

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@
3030

3131
# Generated files
3232
manifest.json
33+
34+
# Shipyard generated and downloaded
35+
.dapper
36+
Dockerfile.dapper
37+
Makefile.dapper.base
38+
output/

.shipyard.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
nodes: control-plane worker
3+
clusters:
4+
cluster1:
5+
cluster2:

Makefile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ TEST_BINARIES_FOLDER := ${PWD}/test/integration/bin
99
DOCKER := docker
1010
LDFLAGS := -X github.com/skupperproject/skupper/pkg/version.Version=${VERSION}
1111

12+
# Shipyard configuration
13+
BASE_BRANCH = main
14+
LOAD_BALANCER = true
15+
ORG = skupperproject
16+
PROJECT = skupper
17+
SETTINGS = ./.shipyard.yml
18+
SHIPYARD_REPO = quay.io/mkolesnik
19+
SHIPYARD_URL = https://raw.githubusercontent.com/mkolesnik/shipyard/remixed/
20+
export BASE_BRANCH ORG PROJECT SHIPYARD_REPO SHIPYARD_URL
21+
1222
all: generate-client build-cmd build-get build-config-sync build-controllers build-tests build-manifest
1323

1424
build-tests:
@@ -121,3 +131,21 @@ release/darwin.zip: release/darwin/skupper
121131

122132
generate-manifest: build-manifest
123133
./manifest
134+
135+
ifneq (,$(DAPPER_HOST_ARCH))
136+
137+
# Running in Shipyard's container
138+
139+
include $(SHIPYARD_DIR)/Makefile.clusters
140+
141+
else
142+
143+
# Not running in Shipyard's container
144+
145+
Makefile.dapper.base:
146+
@echo Downloading $@
147+
@curl -sfLO $(SHIPYARD_URL)/$@
148+
149+
include Makefile.dapper.base
150+
151+
endif

0 commit comments

Comments
 (0)