From f04fba409b0e81c7de31fd232080aff6c7dae4a6 Mon Sep 17 00:00:00 2001 From: "lukasz.widera@vshn.ch" Date: Thu, 18 Jul 2024 11:09:11 +0200 Subject: [PATCH] fixing e2e --- Makefile.vars.mk | 2 +- kind/config.yaml | 6 +++--- test/local.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.vars.mk b/Makefile.vars.mk index 201353a..5a97da0 100644 --- a/Makefile.vars.mk +++ b/Makefile.vars.mk @@ -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) diff --git a/kind/config.yaml b/kind/config.yaml index 22fffd1..e84013b 100644 --- a/kind/config.yaml +++ b/kind/config.yaml @@ -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 diff --git a/test/local.mk b/test/local.mk index aef53b1..332289c 100644 --- a/test/local.mk +++ b/test/local.mk @@ -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 -