Revert changes to coredns resource naming

Ref: coredns/helm#156 Signed-off-by: Brad Davidson <[email protected]>
brandond · Feb 21, 2024 · 972107d · 972107d
1 parent c719ab4
commit 972107d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch
@@ -1,6 +1,20 @@
 --- charts-original/templates/_helpers.tpl
 +++ charts/templates/_helpers.tpl
-@@ -57,7 +57,7 @@
+@@ -15,13 +15,9 @@
+ {{- .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
+@@ -57,7 +53,7 @@
  Allow k8s-app label to be overridden
  */}}
  {{- define "coredns.k8sapplabel" -}}
@@ -9,7 +23,7 @@
  {{- end -}}
 
  {{/*
-@@ -224,3 +224,72 @@
+@@ -224,3 +220,72 @@
  {{ default "default" .Values.serviceAccount.name }}
  {{- end -}}
  {{- end -}}

diff --git a/packages/rke2-coredns/package.yaml b/packages/rke2-coredns/package.yaml
@@ -1,2 +1,2 @@
 url: https:/coredns/helm/releases/download/coredns-1.29.0/coredns-1.29.0.tgz
-packageVersion: 00
+packageVersion: 01