From 45a3fca2dfb00b8a0d56c4ba0f1e6324165288db Mon Sep 17 00:00:00 2001
From: Andrew Karpow <andrew.karpow@sap.com>
Date: Mon, 27 Apr 2026 14:23:49 -0400
Subject: [PATCH] [workflows] release strategy edge broke semver tagging
 releases.

We don't use the edge label activly anyway.

Also force usage of AppVersion as image version since it seem to
fallback using latest ever if overriden via helm.
---
 .github/workflows/container-registry-ghcr.yaml              | 6 ++----
 Makefile.maker.yaml                                         | 1 -
 .../openstack-hypervisor-operator/templates/deployment.yaml | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/container-registry-ghcr.yaml b/.github/workflows/container-registry-ghcr.yaml
index 1f2e896..be157ad 100644
--- a/.github/workflows/container-registry-ghcr.yaml
+++ b/.github/workflows/container-registry-ghcr.yaml
@@ -9,8 +9,8 @@
 name: Container Registry GHCR
 "on":
   push:
-    branches:
-      - main
+    tags:
+      - '*'
   workflow_dispatch: {}
 permissions:
   contents: read
@@ -34,8 +34,6 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
-            # https://github.com/docker/metadata-action#typeedge
-            type=edge
             # https://github.com/docker/metadata-action#latest-tag
             type=raw,value=latest,enable={{is_default_branch}}
             # https://github.com/docker/metadata-action#typesemver
diff --git a/Makefile.maker.yaml b/Makefile.maker.yaml
index 3fcfa6f..3f7ffa9 100644
--- a/Makefile.maker.yaml
+++ b/Makefile.maker.yaml
@@ -41,7 +41,6 @@ githubWorkflow:
     enabled: true
     platforms: "linux/amd64,linux/arm64"
     tagStrategy:
-      - edge
       - latest
       - semver
       - sha
diff --git a/charts/openstack-hypervisor-operator/templates/deployment.yaml b/charts/openstack-hypervisor-operator/templates/deployment.yaml
index af49564..b37cfca 100644
--- a/charts/openstack-hypervisor-operator/templates/deployment.yaml
+++ b/charts/openstack-hypervisor-operator/templates/deployment.yaml
@@ -47,8 +47,7 @@ spec:
           value: {{ quote .Values.controllerManager.manager.env.labelSelector }}
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
-        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag
-          | default .Chart.AppVersion }}
+        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Chart.AppVersion }}
         livenessProbe:
           httpGet:
             path: /healthz