fixing observation for legacy key types

Makefile.vars.mk

@@ -18,7 +18,7 @@ CONTAINER_REGISTRY ?= ghcr.io
 UPBOUND_CONTAINER_REGISTRY ?= xpkg.upbound.io
 
 # Image URL to use all building/pushing image targets
-CONTAINER_IMG ?= ghcr.io/vshn/provider-exoscale/provider:v0.9.2
+CONTAINER_IMG ?= $(CONTAINER_REGISTRY)/$(PROJECT_OWNER)/$(PROJECT_NAME)/controller:$(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)
@@ -28,8 +28,8 @@ UPBOUND_PACKAGE_IMG ?= $(UPBOUND_CONTAINER_REGISTRY)/$(PROJECT_OWNER)/$(PROJECT_
 # https://hub.docker.com/r/kindest/node/tags
 KIND_NODE_VERSION ?= v1.24.0
 KIND_IMAGE ?= docker.io/kindest/node:$(KIND_NODE_VERSION)
-KIND_KUBECONFIG ?= /home/wejdross/vshn/shedar/kindev/.kind/kind-kubeconfig-v1.24.4
-KIND_CLUSTER ?= kindev
+KIND_KUBECONFIG ?= $(kind_dir)/kind-kubeconfig-$(KIND_NODE_VERSION)
+KIND_CLUSTER ?= $(PROJECT_NAME)-$(KIND_NODE_VERSION)
 
 # TEST:integration
 ENVTEST_ADDITIONAL_FLAGS ?= --bin-dir "$(kind_dir)"

kind/kind.mk

@@ -26,7 +26,7 @@ kind-setup-ingress: kind-setup ## Install NGINX as ingress controller onto kind
 # We fix the arch to linux/amd64 since kind runs in amd64 even on Mac/arm.
 kind-load-image: export GOOS = linux
 kind-load-image: export GOARCH = amd64
-kind-load-image: build-docker ## Load the container image onto kind cluster
+kind-load-image: kind-setup build-docker ## Load the container image onto kind cluster
 	@$(kind_bin) load docker-image --name $(KIND_CLUSTER) $(CONTAINER_IMG)
 
 .PHONY: kind-clean