Skip to content

Commit 2ebfb3a

Browse files
authored
Merge pull request #156 from den-is/master
Ignore duplicate strings in the fullname helper template
2 parents 1919d08 + 56fed54 commit 2ebfb3a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

charts/coredns/Chart.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: coredns
3-
version: 1.28.2
3+
version: 1.29.0
44
appVersion: 1.11.1
55
home: https://coredns.io
66
icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
@@ -16,9 +16,10 @@ maintainers:
1616
- name: haad
1717
- name: hagaibarel
1818
- name: shubham-cmyk
19-
engine: gotpl
2019
type: application
2120
annotations:
2221
artifacthub.io/changes: |
23-
- kind: fixed
24-
description: add .Release.Namespace in metadata
22+
- kind: changed
23+
description: Ignore duplicate strings in the fullname helper template
24+
- kind: removed
25+
description: Removed deprecated "engine: gotpl" from the Chart.yaml

charts/coredns/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
1515
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
1616
{{- else -}}
1717
{{- $name := default .Chart.Name .Values.nameOverride -}}
18+
{{- if contains $name .Release.Name }}
19+
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
20+
{{- else }}
1821
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
1922
{{- end -}}
2023
{{- end -}}
24+
{{- end -}}
2125

2226
{{/*
2327
Common labels

0 commit comments

Comments
 (0)