Add: Keda CRD labels for ArgoCD Application's releaseName

Signed-off-by: choisungwook <[email protected]>
kedacore · Nov 2, 2023 · 29aabd0 · 29aabd0
1 parent 02b56f3
commit 29aabd0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/keda/templates/_helpers.tpl b/keda/templates/_helpers.tpl
@@ -8,16 +8,24 @@ Create chart name and version as used by the chart label.
 {{- end -}}
 
 {{/*
-Generate basic labels
+Generate CRD labels
 */}}
-{{- define "keda.labels" }}
+{{- define "keda.crd-labels" }}
 helm.sh/chart: {{ include "keda.chart" . }}
 app.kubernetes.io/component: operator
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: {{ .Values.operator.name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end }}
+{{- end }}
+
+{{/*
+Generate basic labels
+*/}}
+{{- define "keda.labels" -}}
+{{- include "keda.crd-labels" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels }}
 {{- end }}

diff --git a/keda/templates/crds/crd-clustertriggerauthentications.yaml b/keda/templates/crds/crd-clustertriggerauthentications.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.crd-labels" . | indent 4 }}
   name: clustertriggerauthentications.keda.sh
 spec:
   group: keda.sh

diff --git a/keda/templates/crds/crd-scaledjobs.yaml b/keda/templates/crds/crd-scaledjobs.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.crd-labels" . | indent 4 }}
   name: scaledjobs.keda.sh
 spec:
   group: keda.sh

diff --git a/keda/templates/crds/crd-scaledobjects.yaml b/keda/templates/crds/crd-scaledobjects.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.crd-labels" . | indent 4 }}
   name: scaledobjects.keda.sh
 spec:
   group: keda.sh

diff --git a/keda/templates/crds/crd-triggerauthentications.yaml b/keda/templates/crds/crd-triggerauthentications.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.crd-labels" . | indent 4 }}
   name: triggerauthentications.keda.sh
 spec:
   group: keda.sh