Merge commit '6a242c1591eb7d317937dd7c5cd6540e658fd6c0' into bump

jouve · Jan 4, 2024 · 9f4c58d · 9f4c58d
2 parents 1eaef56 + 6a242c1
commit 9f4c58d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/charts/coredns/Chart.yaml b/charts/coredns/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: coredns
-version: 1.29.5
+version: 1.29.6
 appVersion: 1.11.1
 home: https://coredns.io
 icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
@@ -26,5 +26,7 @@ dependencies:
   version: 2.x.x
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Added option to override defaultMode for extraSecrets
+    - 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
@@ -11,16 +11,16 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "coredns.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if .Values.fullnameOverride -}}
+{{- .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 }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

diff --git a/git-subtree-pull.sh b/git-subtree-pull.sh
@@ -13,5 +13,5 @@ git_subtree_pull () {
     git subtree pull "--prefix=$tgt_dir" "$tmp" "$ref"
 }
 
-git_subtree_pull https://github.com/cloudnative-pg/charts cloudnative-pg-v0.19.1 charts/cloudnative-pg charts/cloudnative-pg
-git_subtree_pull https://github.com/coredns/helm          coredns-1.28.1         charts/coredns charts/coredns
+git_subtree_pull https://github.com/cloudnative-pg/charts cloudnative-pg-v0.20.0 charts/cloudnative-pg charts/cloudnative-pg
+git_subtree_pull https://github.com/coredns/helm          coredns-1.29.0         charts/coredns charts/coredns