From e9813353adaef15cc726ccfd364718bb11f2bb85 Mon Sep 17 00:00:00 2001
From: Francesco Giudici <francesco.giudici@suse.com>
Date: Mon, 30 Sep 2024 09:23:59 +0200
Subject: [PATCH] charts: drop chart version from resource labels

Fixes #846

Signed-off-by: Francesco Giudici <francesco.giudici@suse.com>
---
 .../elemental-operator-crds-helm/templates/crds.yaml     | 9 ---------
 .../elemental-operator-helm/templates/deployment.yaml    | 1 -
 config/crd/kustomization.yaml                            | 1 -
 3 files changed, 11 deletions(-)

diff --git a/.obs/chartfile/elemental-operator-crds-helm/templates/crds.yaml b/.obs/chartfile/elemental-operator-crds-helm/templates/crds.yaml
index 7e080013..0c4ec33a 100644
--- a/.obs/chartfile/elemental-operator-crds-helm/templates/crds.yaml
+++ b/.obs/chartfile/elemental-operator-crds-helm/templates/crds.yaml
@@ -9,7 +9,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: machineinventories.elemental.cattle.io
 spec:
@@ -322,7 +321,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: machineinventoryselectors.elemental.cattle.io
 spec:
@@ -533,7 +531,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: machineinventoryselectortemplates.elemental.cattle.io
 spec:
@@ -772,7 +769,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: machineregistrations.elemental.cattle.io
 spec:
@@ -1149,7 +1145,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: managedosimages.elemental.cattle.io
 spec:
@@ -2691,7 +2686,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: managedosversionchannels.elemental.cattle.io
 spec:
@@ -3199,7 +3193,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: managedosversions.elemental.cattle.io
 spec:
@@ -3609,7 +3602,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: metadata.elemental.cattle.io
 spec:
@@ -3670,7 +3662,6 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: infrastructure-elemental
     cluster.x-k8s.io/v1beta1: v1beta1
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     release-name: '{{ .Release.Name }}'
   name: seedimages.elemental.cattle.io
 spec:
diff --git a/.obs/chartfile/elemental-operator-helm/templates/deployment.yaml b/.obs/chartfile/elemental-operator-helm/templates/deployment.yaml
index f397c64f..2ff60f61 100644
--- a/.obs/chartfile/elemental-operator-helm/templates/deployment.yaml
+++ b/.obs/chartfile/elemental-operator-helm/templates/deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: {{ .Chart.Name }}
-    app.kubernetes.io/version: {{ .Chart.Version }}
   name: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.replicas }}
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 9b41da0a..ad7132dd 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -17,7 +17,6 @@ commonLabels:
   release-name: '{{ .Release.Name }}'
   cluster.x-k8s.io/provider: infrastructure-elemental
   cluster.x-k8s.io/v1beta1: v1beta1
-  helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
 
 commonAnnotations:
   app.kubernetes.io/instance: '{{ .Release.Name }}'