From a110442ca7dddfcf799828efa6d1aa2cb9350a70 Mon Sep 17 00:00:00 2001 From: Denis Iskandarov Date: Thu, 28 Dec 2023 10:37:30 +0400 Subject: [PATCH 1/3] Ignore release name in fullname template if it equals to chart's name Signed-off-by: Denis Iskandarov --- charts/coredns/Chart.yaml | 3 +-- charts/coredns/templates/_helpers.tpl | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/coredns/Chart.yaml b/charts/coredns/Chart.yaml index 25da34f..855e469 100644 --- a/charts/coredns/Chart.yaml +++ b/charts/coredns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: coredns -version: 1.28.2 +version: 2.0.0 appVersion: 1.11.1 home: https://coredns.io icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png @@ -16,7 +16,6 @@ maintainers: - name: haad - name: hagaibarel - name: shubham-cmyk -engine: gotpl type: application annotations: artifacthub.io/changes: | diff --git a/charts/coredns/templates/_helpers.tpl b/charts/coredns/templates/_helpers.tpl index 9c50032..6dc6833 100644 --- 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 From 99839a717a75348d91b389368da6b0d95aea92a2 Mon Sep 17 00:00:00 2001 From: Denis Iskandarov Date: Thu, 28 Dec 2023 10:42:55 +0400 Subject: [PATCH 2/3] updated changelog Signed-off-by: Denis Iskandarov --- charts/coredns/Chart.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/coredns/Chart.yaml b/charts/coredns/Chart.yaml index 855e469..d743e69 100644 --- a/charts/coredns/Chart.yaml +++ b/charts/coredns/Chart.yaml @@ -19,5 +19,7 @@ maintainers: 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 From 56fed549d74e8af8930a35c4d691c6a11912b1ef Mon Sep 17 00:00:00 2001 From: Denis Iskandarov Date: Thu, 28 Dec 2023 10:45:29 +0400 Subject: [PATCH 3/3] Chart version bump Signed-off-by: Denis Iskandarov --- charts/coredns/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/coredns/Chart.yaml b/charts/coredns/Chart.yaml index d743e69..df76cba 100644 --- a/charts/coredns/Chart.yaml +++ b/charts/coredns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: coredns -version: 2.0.0 +version: 1.29.0 appVersion: 1.11.1 home: https://coredns.io icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png