From 98ceff1abfc012a374936453ad4a18645adc331e Mon Sep 17 00:00:00 2001
From: izturn <44051386+izturn@users.noreply.github.com>
Date: Mon, 14 Nov 2022 17:57:25 +0800
Subject: [PATCH] adjust the naming style for resources to make them not pass
 the length limit (#13471)

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

Signed-off-by: Gang Liu <gang.liu@daocloud.io>
---
 bitnami/wildfly/Chart.yaml                        | 2 +-
 bitnami/wildfly/templates/ingress.yaml            | 2 +-
 bitnami/wildfly/templates/management-ingress.yaml | 4 ++--
 bitnami/wildfly/templates/tls-secrets.yaml        | 4 ++--
 bitnami/wildfly/values.yaml                       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitnami/wildfly/Chart.yaml b/bitnami/wildfly/Chart.yaml
index 8c01138ab..62eef7ad5 100644
--- a/bitnami/wildfly/Chart.yaml
+++ b/bitnami/wildfly/Chart.yaml
@@ -26,4 +26,4 @@ name: wildfly
 sources:
   - https://github.com/bitnami/containers/tree/main/bitnami/wildfly
   - http://wildfly.org
-version: 13.5.7
+version: 13.5.8
diff --git a/bitnami/wildfly/templates/ingress.yaml b/bitnami/wildfly/templates/ingress.yaml
index 8263bdcf5..08482e30e 100644
--- a/bitnami/wildfly/templates/ingress.yaml
+++ b/bitnami/wildfly/templates/ingress.yaml
@@ -59,7 +59,7 @@ spec:
         {{- range .Values.ingress.extraHosts }}
         - {{ .name | quote }}
         {{- end }}
-      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      secretName: {{ printf "%s-tls" .Values.ingress.hostname | trunc 63 | trimSuffix "-" }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.ingress.extraTls "context" $ ) | nindent 4 }}
diff --git a/bitnami/wildfly/templates/management-ingress.yaml b/bitnami/wildfly/templates/management-ingress.yaml
index 44d18951d..7ada99740 100644
--- a/bitnami/wildfly/templates/management-ingress.yaml
+++ b/bitnami/wildfly/templates/management-ingress.yaml
@@ -2,7 +2,7 @@
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
-  name: {{ printf "%s-%s" (include "common.names.fullname" .) "management" }}
+  name: {{ printf "%s-management" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -59,7 +59,7 @@ spec:
         {{- range .Values.mgmtIngress.extraHosts }}
         - {{ .name | quote }}
         {{- end }}
-      secretName: {{ printf "%s-tls" .Values.mgmtIngress.hostname }}
+      secretName: {{ printf "%s-tls" .Values.mgmtIngress.hostname | trunc 63 | trimSuffix "-" }}
     {{- end }}
     {{- if .Values.mgmtIngress.extraTls }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.mgmtIngress.extraTls "context" $ ) | nindent 4 }}
diff --git a/bitnami/wildfly/templates/tls-secrets.yaml b/bitnami/wildfly/templates/tls-secrets.yaml
index 8fb43e1ce..dfebb90e9 100644
--- a/bitnami/wildfly/templates/tls-secrets.yaml
+++ b/bitnami/wildfly/templates/tls-secrets.yaml
@@ -47,7 +47,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ printf "%s-tls" .Values.ingress.hostname }}
+  name: {{ printf "%s-tls" .Values.ingress.hostname | trunc 63 | trimSuffix "-" }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -68,7 +68,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ printf "%s-tls" .Values.mgmtIngress.hostname }}
+  name: {{ printf "%s-tls" .Values.mgmtIngress.hostname | trunc 63 | trimSuffix "-" }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/bitnami/wildfly/values.yaml b/bitnami/wildfly/values.yaml
index ff5158ce8..e16a7f221 100644
--- a/bitnami/wildfly/values.yaml
+++ b/bitnami/wildfly/values.yaml
@@ -432,7 +432,7 @@ ingress:
   ##
   annotations: {}
   ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter
-  ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}`
+  ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname | trunc 63 | trimSuffix "-" }}`
   ## You can:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Rely on cert-manager to create it by setting the corresponding annotations
@@ -533,7 +533,7 @@ mgmtIngress:
   ##
   annotations: {}
   ## @param mgmtIngress.tls Enable TLS configuration for the hostname defined at `mgmtIngress.hostname` parameter
-  ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.mgmtIngress.hostname }}
+  ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.mgmtIngress.hostname | trunc 63 | trimSuffix "-" }}
   ## You can use the mgmtIngress.secrets parameter to create this TLS secret, relay on cert-manager to create it, or
   ## let the chart create self-signed certificates for you
   ##