From e08b1d39270278cee80622ded9a0d971709eb077 Mon Sep 17 00:00:00 2001
From: Muneeb Aijaz <43588696+MuneebAijaz@users.noreply.github.com>
Date: Mon, 21 Apr 2025 19:52:10 +0500
Subject: [PATCH] Revert chart labels for seamless upgrades (#903)

* Revert chart labels for seamless upgrades
---
 deployments/kubernetes/chart/reloader/Chart.yaml       |  2 +-
 .../kubernetes/chart/reloader/templates/_helpers.tpl   | 10 ++++------
 .../chart/reloader/templates/deployment.yaml           |  4 ++--
 .../chart/reloader/templates/networkpolicy.yaml        |  4 ++--
 .../chart/reloader/templates/poddisruptionbudget.yaml  |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml
index dcd5ef21..c8979529 100644
--- a/deployments/kubernetes/chart/reloader/Chart.yaml
+++ b/deployments/kubernetes/chart/reloader/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: 2.1.1
+version: 2.1.2
 appVersion: v1.4.1
 keywords:
   - Reloader
diff --git a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl
index 401a5a3f..1c276211 100644
--- a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl
+++ b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl
@@ -28,12 +28,10 @@ Create chart name and version as used by the chart label.
 {{- end }}
 
 {{- define "reloader-labels.chart" -}}
-app.kubernetes.io/name: {{ include "reloader-name" . }}
-helm.sh/chart: {{ include "reloader-chart" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end}}
-app.kubernetes.io/instance: {{ .Release.Name | quote }}
+app: {{ template "reloader-fullname" . }}
+chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+release: {{ .Release.Name | quote }}
+heritage: {{ .Release.Service | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
 {{- end -}}
 
diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
index 7c174ef8..851230e8 100644
--- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
@@ -25,8 +25,8 @@ spec:
   revisionHistoryLimit: {{ .Values.reloader.deployment.revisionHistoryLimit }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ template "reloader-fullname" . }}
-      app.kubernetes.io/instance: {{ .Release.Name | quote }}
+      app: {{ template "reloader-fullname" . }}
+      release: {{ .Release.Name | quote }}
 {{- if .Values.reloader.matchLabels }}
 {{ toYaml .Values.reloader.matchLabels | indent 6 }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml b/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml
index b440a98e..ca5f2248 100644
--- a/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml
@@ -14,8 +14,8 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      app.kubernetes.io/name: {{ template "reloader-fullname" . }}
-      app.kubernetes.io/instance: {{ .Release.Name | quote }}
+      app: {{ template "reloader-fullname" . }}
+      release: {{ .Release.Name | quote }}
 {{- if .Values.reloader.matchLabels }}
 {{ toYaml .Values.reloader.matchLabels | indent 6 }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/poddisruptionbudget.yaml b/deployments/kubernetes/chart/reloader/templates/poddisruptionbudget.yaml
index c6490666..e13c4783 100644
--- a/deployments/kubernetes/chart/reloader/templates/poddisruptionbudget.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/poddisruptionbudget.yaml
@@ -13,5 +13,5 @@ spec:
 {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ template "reloader-fullname" . }}
+      app: {{ template "reloader-fullname" . }}
 {{- end }}