Merge pull request #156 from den-is/master

Ignore duplicate strings in the fullname helper template
coredns · Dec 28, 2023 · 2ebfb3a · 2ebfb3a
2 parents 1919d08 + 56fed54
commit 2ebfb3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/charts/coredns/Chart.yaml b/charts/coredns/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: coredns
-version: 1.28.2
+version: 1.29.0
 appVersion: 1.11.1
 home: https://coredns.io
 icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
@@ -16,9 +16,10 @@ maintainers:
   - name: haad
   - name: hagaibarel
   - name: shubham-cmyk
-engine: gotpl
 type: application
 annotations:
   artifacthub.io/changes: |
-    - kind: fixed
-      description: add .Release.Namespace in metadata
+    - kind: changed
+      description: Ignore duplicate strings in the fullname helper template
+    - kind: removed
+      description: Removed deprecated "engine: gotpl" from the Chart.yaml
diff --git a/charts/coredns/templates/_helpers.tpl b/charts/coredns/templates/_helpers.tpl
@@ -15,9 +15,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Common labels