Skip to content

Commit 8cb7dd3

Browse files
author
Mike Barry
committed
Use only common.labels.standard for label generation
Use only the common.labels.standard function to manage label creation. Using both the common.labels.standard function and then manually defining labels above creates redundant labels and incorrect formatting. Fixes #419
1 parent 62f1c2e commit 8cb7dd3

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

charts/diode/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: diode
33
description: A Helm chart for Diode
44
type: application
5-
version: 1.8.1
5+
version: 1.8.2
66
appVersion: "1.5.0"
77
home: https://github.com/netboxlabs/diode
88
sources:

charts/diode/templates/_helpers.tpl

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,7 @@ Create chart name and version as used by the chart label.
4242
Common labels
4343
*/}}
4444
{{- define "diode.labels" -}}
45-
helm.sh/chart: {{ include "diode.chart" . }}
46-
{{ include "diode.selectorlabels" . }}
47-
{{- if .Chart.AppVersion }}
48-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
49-
{{- end }}
50-
app.kubernetes.io/managed-by: {{ .Release.Service }}
51-
{{- if .Values.global.commonLabels }}
52-
{{- include "common.labels.standard" ( dict "customLabels" .Values.global.commonLabels "context" $ ) }}
53-
{{- end }}
45+
{{- include "common.labels.standard" ( dict "customLabels" .Values.global.commonLabels "context" . ) }}
5446
{{- end }}
5547

5648
{{/*

0 commit comments

Comments
 (0)