Skip to content

Commit

Permalink
Fix makefile
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha committed Dec 13, 2023
1 parent af8f79a commit 3cdbabe
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,20 @@ UPTEST_VERSION = v0.5.0
# ====================================================================================
# Setup Images

REGISTRY_ORGS ?= xpkg.kubedb.com/upbound
REGISTRY_ORGS ?= xpkg.upbound.io/upbound
IMAGES = $(PROJECT_NAME)
-include build/makelib/imagelight.mk
DOCKER_REGISTRY=ghcr.io/kubedb
-include build/makelib/image.mk

# ====================================================================================
# Setup XPKG

XPKG_REG_ORGS ?= xpkg.kubedb.com/upbound
# NOTE(hasheddan): skip promoting on xpkg.kubedb.com as channel tags are
XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
# NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
# inferred.
XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.kubedb.com/upbound
XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound
XPKGS = $(PROJECT_NAME)
-include build/makelib/xpkg.mk
# -include build/makelib/xpkg.mk

# ====================================================================================
# Fallthrough
Expand Down Expand Up @@ -162,7 +163,7 @@ run: go.build

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

Expand All @@ -188,7 +189,7 @@ uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
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 upbound-system wait --for=condition=Available deployment --all --timeout=5m
@$(KUBECTL) -n crossplane-system wait --for=condition=Available deployment --all --timeout=5m
@$(OK) running locally built provider

e2e: local-deploy uptest
Expand Down

0 comments on commit 3cdbabe

Please sign in to comment.