From 447d6c162798e196227a3e89ae49322aed7fc9cd Mon Sep 17 00:00:00 2001
From: Andrew Karpow <andrew.karpow@sap.com>
Date: Mon, 27 Apr 2026 14:28:53 -0400
Subject: [PATCH] Remove edge tag and force AppVersion for image version

- Remove unused edge label from container registry workflow
- Force usage of AppVersion as image version in daemonset template
  instead of allowing fallback to latest when overridden via helm
---
 .github/workflows/container-registry-ghcr.yaml | 6 ++----
 Makefile.maker.yaml                            | 1 -
 charts/kvm-node-agent/Chart.yaml               | 2 +-
 charts/kvm-node-agent/templates/daemonset.yaml | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/container-registry-ghcr.yaml b/.github/workflows/container-registry-ghcr.yaml
index af48b48..a5d9fe0 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 1bfb3b0..f00b569 100644
--- a/Makefile.maker.yaml
+++ b/Makefile.maker.yaml
@@ -45,7 +45,6 @@ githubWorkflow:
     tagStrategy:
       - latest
       - semver
-      - edge
       - sha
   pushHelmChartToGhcr:
     path: charts/kvm-node-agent
diff --git a/charts/kvm-node-agent/Chart.yaml b/charts/kvm-node-agent/Chart.yaml
index bc1c4ea..1f7b65c 100644
--- a/charts/kvm-node-agent/Chart.yaml
+++ b/charts/kvm-node-agent/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: kvm-node-agent
 description: A Helm chart for Kubernetes
-appVersion: 0.1.0
+appVersion: latest
 version: 0.1.12
 type: application
diff --git a/charts/kvm-node-agent/templates/daemonset.yaml b/charts/kvm-node-agent/templates/daemonset.yaml
index 75ec5f6..154bb80 100644
--- a/charts/kvm-node-agent/templates/daemonset.yaml
+++ b/charts/kvm-node-agent/templates/daemonset.yaml
@@ -51,8 +51,7 @@ spec:
               fieldPath: {{ .Values.controllerManager.manager.env.nodeLabelFieldPath }}
         - 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