Skip to content

Commit

Permalink
fixing e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Jul 18, 2024
1 parent cb808f5 commit f04fba4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ GIT_TAG = $(shell git symbolic-ref -q --short HEAD || git describe --tags --exac
IMG_TAG = $(subst /,_,$(GIT_TAG))
# Image URL to use all building/pushing image targets
CONTAINER_IMG ?= $(CONTAINER_REGISTRY)/$(PROJECT_OWNER)/$(PROJECT_NAME)/controller:$(IMG_TAG)
LOCAL_PACKAGE_IMG = localhost:15000/$(PROJECT_OWNER)/$(PROJECT_NAME)/package:$(IMG_TAG)
LOCAL_PACKAGE_IMG = localhost:5000/$(PROJECT_OWNER)/$(PROJECT_NAME)/package:$(IMG_TAG)
GHCR_PACKAGE_IMG ?= $(CONTAINER_REGISTRY)/$(PROJECT_OWNER)/$(PROJECT_NAME)/provider:$(IMG_TAG)
UPBOUND_PACKAGE_IMG ?= $(UPBOUND_CONTAINER_REGISTRY)/$(PROJECT_OWNER)/$(PROJECT_NAME):$(IMG_TAG)

Expand Down
6 changes: 3 additions & 3 deletions kind/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ nodes:
node-labels: "ingress-ready=true"
extraPortMappings:
- containerPort: 80
hostPort: 10088
hostPort: 8088
protocol: TCP
- containerPort: 443
hostPort: 10443
hostPort: 8443
protocol: TCP
# registry can't be sensibly exposed via Ingress under 127.0.0.0.nip.io host with subpath
- containerPort: 30500
hostPort: 15000
hostPort: 5000
protocol: TCP
2 changes: 1 addition & 1 deletion test/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ INTEGRATION_TEST_DEBUG_OUTPUT ?= false
.PHONY: local-install
local-install: export KUBECONFIG = $(KIND_KUBECONFIG)
# for ControllerConfig:
local-install: export INTERNAL_PACKAGE_IMG = registry.registry-system.svc.cluster.local:15000/$(PROJECT_OWNER)/$(PROJECT_NAME)/package:$(IMG_TAG)
local-install: export INTERNAL_PACKAGE_IMG = registry.registry-system.svc.cluster.local:5000/$(PROJECT_OWNER)/$(PROJECT_NAME)/package:$(IMG_TAG)
local-install: kind-load-image crossplane-setup registry-setup .local-package-push minio-setup ## Install Operator in local cluster
yq e '.spec.metadata.annotations."local.dev/installed"="$(shell date)"' test/controllerconfig-minio.yaml | kubectl apply -f -
yq e '.spec.package=strenv(INTERNAL_PACKAGE_IMG)' test/provider-minio.yaml | kubectl apply -f -
Expand Down

0 comments on commit f04fba4

Please sign in to comment.