Skip to content

Commit

Permalink
Merge pull request #164 from janwillies/update-build
Browse files Browse the repository at this point in the history
switch build submodule from upbound to crossplane
  • Loading branch information
janwillies authored Nov 22, 2024
2 parents 306bf62 + a6ec210 commit 3408b27
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 218 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "build"]
path = build
url = https://github.com/upbound/build
url = https://github.com/crossplane/build
32 changes: 19 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)
PLATFORMS ?= linux_amd64 linux_arm64

# kind-related versions
KIND_VERSION ?= v0.14.0
KIND_NODE_IMAGE_TAG ?= v1.24.0
KIND_VERSION = v0.24.0

# -include will silently skip missing files, which allows us
# to load those files with a target in the Makefile. If only
Expand Down Expand Up @@ -44,9 +43,9 @@ GOLANGCILINT_VERSION = 1.56.1
# ====================================================================================
# Setup Kubernetes tools

UP_VERSION = v0.27.0
UP_VERSION = v0.34.2
UP_CHANNEL = stable
UPTEST_VERSION = v0.12.0
USE_HELM3 = true

-include build/makelib/k8s_tools.mk

Expand All @@ -70,6 +69,22 @@ XPKGS = provider-gitlab
# we ensure image is present in daemon.
xpkg.build.provider-gitlab: do.build.images

# ====================================================================================
# End to End Testing
CROSSPLANE_VERSION = 1.17.1
CROSSPLANE_NAMESPACE = crossplane-system
-include build/makelib/local.xpkg.mk
-include build/makelib/controlplane.mk

local-dev: controlplane.up
local-deploy: build controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)
@$(INFO) running locally built provider
@$(KUBECTL) wait provider.pkg $(PROJECT_NAME) --for condition=Healthy --timeout 5m
@$(KUBECTL) -n $(CROSSPLANE_NAMESPACE) wait --for=condition=Available deployment --all --timeout=5m
@$(OK) running locally built provider

e2e: local-deploy

# ====================================================================================
# Targets

Expand All @@ -94,15 +109,6 @@ cobertura:
manifests:
@$(WARN) Deprecated. Please run make generate instead.

# integration tests
e2e.run: test-integration

# Run integration tests.
test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM3)
@$(INFO) running integration tests using kind $(KIND_VERSION)
@KIND_NODE_IMAGE_TAG=${KIND_NODE_IMAGE_TAG} $(ROOT_DIR)/cluster/local/integration_tests.sh || $(FAIL)
@$(OK) integration tests passed

# Update the submodules, such as the common build scripts.
submodules:
@git submodule sync
Expand Down
203 changes: 0 additions & 203 deletions cluster/local/integration_tests.sh

This file was deleted.

0 comments on commit 3408b27

Please sign in to comment.