From ed904510dfbc1ded1b59caec3a850648e1b43b8b Mon Sep 17 00:00:00 2001
From: Per Goncalves da Silva <pegoncal@redhat.com>
Date: Tue, 7 Oct 2025 11:24:07 +0200
Subject: [PATCH] Fix bad image configuration in goreleaser

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
---
 .goreleaser.yml | 4 ++--
 Makefile        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index d739cfa..2f5a8d6 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -142,13 +142,13 @@ docker_manifests:
       - "{{ .Env.CONTROLLER_IMAGE }}:{{ .Env.TAG }}-arm64"
       - "{{ .Env.CONTROLLER_IMAGE }}:{{ .Env.TAG }}-ppc64le"
       - "{{ .Env.CONTROLLER_IMAGE }}:{{ .Env.TAG }}-s390x"
-  - name_template: "{{ .Env.CONTROLLER_IMAGE }}:{{ .Env.TAG }}"
+  - name_template: "{{ .Env.BUNDLE_IMAGE }}:{{ .Env.TAG }}"
     image_templates:
       - "{{ .Env.BUNDLE_IMAGE }}:{{ .Env.TAG }}-amd64"
       - "{{ .Env.BUNDLE_IMAGE }}:{{ .Env.TAG }}-arm64"
       - "{{ .Env.BUNDLE_IMAGE }}:{{ .Env.TAG }}-ppc64le"
       - "{{ .Env.BUNDLE_IMAGE }}:{{ .Env.TAG }}-s390x"
-  - name_template: "{{ .Env.BUNDLE_IMAGE }}:{{ .Env.TAG }}"
+  - name_template: "{{ .Env.CATALOG_IMAGE }}:{{ .Env.TAG }}"
     image_templates:
       - "{{ .Env.CATALOG_IMAGE }}:{{ .Env.TAG }}-amd64"
       - "{{ .Env.CATALOG_IMAGE }}:{{ .Env.TAG }}-arm64"
diff --git a/Makefile b/Makefile
index efee94b..7b0deb4 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 endif
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/olmtest/webhook-operator:$(TAG)
+IMG ?= $(IMAGE_TAG_BASE):$(TAG)
 BUNDLE_IMAGE = $(BUNDLE_IMG_BASE):$(TAG)
 CATALOG_IMAGE = $(CATALOG_IMG_BASE):$(TAG)