Fix bundle manifests

[adam-cattermole]

I spotted the version of authorino defined for the webhook container in the CSV is missing the 'v' which does not match the container tag pushed to quay.io/kuadrant/authorino:v0.15.0. Will investigate the root cause of this to fix in the main branch for the next release.

On top of this, now that we have moved to the stable channel, any catalog build containing bundles of both the stable and preview type requires specifying a default channel to determine the head of the catalog.

wip until we have verified no other issues in the manifests and I have tested re-running the image builds locally passes.

[guicassolato]

Well spotted, @adam-cattermole! This is a critical issue that blocks the release of v0.9.0 in the operator hubs.

While we investigate, I've created a new image tag 0.15.0 in quay.io to avoid breaking installs.

[guicassolato]

Also needs a fix: https://github.com/Kuadrant/authorino-operator/blob/accf6b009e86e3c65ddfd8721f7f2100c526b7e9/config/deploy/manifests.yaml#L6202

[adam-cattermole]

Thanks, @guicassolato, will update - just to note we spotted this before releasing to operator hub and made these changes in the bundle manifests there (https://github.com/k8s-operatorhub/community-operators/pull/3418/files#diff-07489bad3d374b44530a9fe6bab4b4848f7dced77495d22501332130626a8b87R306)

[guicassolato]

I think this may fix it:

diff --git a/Makefile b/Makefile
index cd4969a..cbfef0d 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,6 @@ manifests: controller-gen kustomize authorino-manifests ## Generate WebhookConfi

 .PHONY: authorino-manifests
 authorino-manifests: export AUTHORINO_GITREF := $(AUTHORINO_BRANCH)
-authorino-manifests: export AUTHORINO_VERSION := $(AUTHORINO_VERSION)
 authorino-manifests: ## Update authorino manifests.
    envsubst \
         < config/authorino/kustomization.template.yaml \
diff --git a/config/authorino/kustomization.template.yaml b/config/authorino/kustomization.template.yaml
index d08e0c4..cb79cc2 100644
--- a/config/authorino/kustomization.template.yaml
+++ b/config/authorino/kustomization.template.yaml
@@ -9,7 +9,7 @@ resources:
 images:
 - name: AUTHORINO_IMAGE
   newName: quay.io/kuadrant/authorino
-  newTag: ${AUTHORINO_VERSION}
+  newTag: ${AUTHORINO_GITREF}

 patchesStrategicMerge:
 - webhook/patches/webhook_in_authconfigs.yaml

(updated)

[guicassolato]

I think this may fix it:

diff --git a/Makefile b/Makefile
index cd4969a..cbfef0d 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,6 @@ manifests: controller-gen kustomize authorino-manifests ## Generate WebhookConfi

 .PHONY: authorino-manifests
 authorino-manifests: export AUTHORINO_GITREF := $(AUTHORINO_BRANCH)
-authorino-manifests: export AUTHORINO_VERSION := $(AUTHORINO_VERSION)
 authorino-manifests: ## Update authorino manifests.
  envsubst \
         < config/authorino/kustomization.template.yaml \
diff --git a/config/authorino/kustomization.template.yaml b/config/authorino/kustomization.template.yaml
index d08e0c4..cb79cc2 100644
--- a/config/authorino/kustomization.template.yaml
+++ b/config/authorino/kustomization.template.yaml
@@ -9,7 +9,7 @@ resources:
 images:
 - name: AUTHORINO_IMAGE
   newName: quay.io/kuadrant/authorino
-  newTag: ${AUTHORINO_VERSION}
+  newTag: ${AUTHORINO_GITREF}

 patchesStrategicMerge:
 - webhook/patches/webhook_in_authconfigs.yaml

(updated)

Wait. This won't work in main.

[guicassolato]

@adam-cattermole, I think this should work:

diff --git a/Makefile b/Makefile
index cd4969a..8e52825 100644
--- a/Makefile
+++ b/Makefile
@@ -77,8 +77,10 @@ SHELL = /usr/bin/env bash -o pipefail
 AUTHORINO_VERSION ?= latest
 ifeq (latest,$(AUTHORINO_VERSION))
 AUTHORINO_BRANCH = main
+AUTHORINO_IMAGE_TAG = latest
 else
 AUTHORINO_BRANCH = v$(AUTHORINO_VERSION)
+AUTHORINO_IMAGE_TAG = v$(AUTHORINO_VERSION)
 endif

 AUTHORINO_IMAGE_FILE ?= authorino_image
@@ -140,7 +142,7 @@ manifests: controller-gen kustomize authorino-manifests ## Generate WebhookConfi

 .PHONY: authorino-manifests
 authorino-manifests: export AUTHORINO_GITREF := $(AUTHORINO_BRANCH)
-authorino-manifests: export AUTHORINO_VERSION := $(AUTHORINO_VERSION)
+authorino-manifests: export AUTHORINO_IMAGE_TAG := $(AUTHORINO_IMAGE_TAG)
 authorino-manifests: ## Update authorino manifests.
    envsubst \
         < config/authorino/kustomization.template.yaml \
@@ -266,7 +268,7 @@ prepare-release:
    @if [ "$(AUTHORINO_VERSION)" = "latest" ]; then\
        [ ! -e "$(AUTHORINO_IMAGE_FILE)" ] || rm $(AUTHORINO_IMAGE_FILE); \
    else \
-       echo quay.io/kuadrant/authorino:v$(AUTHORINO_VERSION) > $(AUTHORINO_IMAGE_FILE); \
+       echo quay.io/kuadrant/authorino:$(AUTHORINO_IMAGE_TAG) > $(AUTHORINO_IMAGE_FILE); \
    fi
    $(MAKE) fix-csv-replaces

diff --git a/config/authorino/kustomization.template.yaml b/config/authorino/kustomization.template.yaml
index d08e0c4..37f905b 100644
--- a/config/authorino/kustomization.template.yaml
+++ b/config/authorino/kustomization.template.yaml
@@ -9,7 +9,7 @@ resources:
 images:
 - name: AUTHORINO_IMAGE
   newName: quay.io/kuadrant/authorino
-  newTag: ${AUTHORINO_VERSION}
+  newTag: ${AUTHORINO_IMAGE_TAG}

 patchesStrategicMerge:
 - webhook/patches/webhook_in_authconfigs.yaml

[guicassolato]

@adam-cattermole, do we also need the default channel in the Dockerfile? https://github.com/Kuadrant/authorino-operator/blob/accf6b009e86e3c65ddfd8721f7f2100c526b7e9/bundle.Dockerfile#L8

[adam-cattermole]

Yep I think that's a good idea - it isn't used for operator hub and I'm not sure it's used by olm to generate the dependency tree but we can update it in this branch before we rebuild the images