From 320add1f95c41c7878cf955a691e4664a2f1e78b Mon Sep 17 00:00:00 2001
From: izturn <44051386+izturn@users.noreply.github.com>
Date: Wed, 2 Nov 2022 19:12:09 +0800
Subject: [PATCH] adjust the naming style for resources to make them not pass
 the length limit (#13277)

Signed-off-by: Gang Liu <gang.liu@daocloud.io>

Signed-off-by: Gang Liu <gang.liu@daocloud.io>
---
 bitnami/external-dns/Chart.yaml                            | 2 +-
 bitnami/external-dns/templates/_helpers.tpl                | 4 ++--
 bitnami/external-dns/templates/psp-clusterrole.yaml        | 2 +-
 bitnami/external-dns/templates/psp-clusterrolebinding.yaml | 4 ++--
 bitnami/external-dns/templates/tls-secret.yaml             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bitnami/external-dns/Chart.yaml b/bitnami/external-dns/Chart.yaml
index 3adfb2f8f2..64ba4cee06 100644
--- a/bitnami/external-dns/Chart.yaml
+++ b/bitnami/external-dns/Chart.yaml
@@ -24,4 +24,4 @@ sources:
   - https://github.com/kubernetes-sigs/external-dns
   - https://github.com/bitnami/containers/tree/main/bitnami/external-dns
   - https://github.com/kubernetes-sigs/external-dns
-version: 6.11.2
+version: 6.11.3
diff --git a/bitnami/external-dns/templates/_helpers.tpl b/bitnami/external-dns/templates/_helpers.tpl
index aa2d81b592..c924e8c7ef 100644
--- a/bitnami/external-dns/templates/_helpers.tpl
+++ b/bitnami/external-dns/templates/_helpers.tpl
@@ -864,10 +864,10 @@ Return the secret containing external-dns TLS certificates
 */}}
 {{- define "external-dns.tlsSecretName" -}}
 {{- if .Values.coredns.etcdTLS.autoGenerated -}}
-    {{- printf "%s-crt" (include "external-dns.fullname" .) -}}
+    {{- printf "%s-crt" (include "external-dns.fullname" .) | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- $secretName := .Values.coredns.etcdTLS.secretName -}}
-{{- printf "%s" (tpl $secretName $) -}}
+{{- printf "%s" (tpl $secretName $) | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/bitnami/external-dns/templates/psp-clusterrole.yaml b/bitnami/external-dns/templates/psp-clusterrole.yaml
index e15c6b8261..0ac23290d5 100644
--- a/bitnami/external-dns/templates/psp-clusterrole.yaml
+++ b/bitnami/external-dns/templates/psp-clusterrole.yaml
@@ -3,7 +3,7 @@
 kind: ClusterRole
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
-  name: {{ printf "%s-%s" (include "common.names.fullname.namespace" .) "psp" }}
+  name: {{ printf "%s-%s" (include "common.names.fullname.namespace" .) "psp" | trunc 63 | trimSuffix "-" }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{ include "external-dns.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/bitnami/external-dns/templates/psp-clusterrolebinding.yaml b/bitnami/external-dns/templates/psp-clusterrolebinding.yaml
index 161619b090..b2c6100abb 100644
--- a/bitnami/external-dns/templates/psp-clusterrolebinding.yaml
+++ b/bitnami/external-dns/templates/psp-clusterrolebinding.yaml
@@ -3,7 +3,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
-  name: {{ printf "%s-%s" (include "common.names.fullname.namespace" .) "psp" }}
+  name: {{ printf "%s-%s" (include "common.names.fullname.namespace" .) "psp" | trunc 63 | trimSuffix "-" }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{ include "external-dns.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -15,7 +15,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ printf "%s-%s" (include "common.names.fullname.namespace" .) "psp" }}
+  name: {{ printf "%s-%s" (include "common.names.fullname.namespace" .) "psp" | trunc 63 | trimSuffix "-" }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "external-dns.serviceAccountName" . }}
diff --git a/bitnami/external-dns/templates/tls-secret.yaml b/bitnami/external-dns/templates/tls-secret.yaml
index ef5d9a0d83..3ae00aab14 100644
--- a/bitnami/external-dns/templates/tls-secret.yaml
+++ b/bitnami/external-dns/templates/tls-secret.yaml
@@ -9,7 +9,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "external-dns.fullname" . }}-crt
+  name: {{ printf "%s-crt" (include "external-dns.fullname" .) | trunc 63 | trimSuffix "-" }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}