Skip to content

Commit

Permalink
Add Shipyard support for deploying clusters
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
mkolesnik committed Dec 13, 2023
1 parent 2cf971d commit b197389
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@

# Generated files
manifest.json

# Shipyard generated and downloaded
.dapper
Dockerfile.dapper
Makefile.dapper.base
output/
5 changes: 5 additions & 0 deletions .shipyard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
nodes: control-plane worker
clusters:
cluster1:
cluster2:
28 changes: 28 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -121,3 +131,21 @@ 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.dapper.base:
@echo Downloading $@
@curl -sfLO $(SHIPYARD_URL)/$@

include Makefile.dapper.base

endif

0 comments on commit b197389

Please sign in to comment.