fix name generation
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: cloudflared
|
name: cloudflared
|
||||||
version: 2.1.2
|
version: 2.1.3
|
||||||
description: Cloudflared Tunnel
|
description: Cloudflared Tunnel
|
||||||
keywords:
|
keywords:
|
||||||
- cloudflare
|
- cloudflare
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# cloudflared
|
# cloudflared
|
||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
Cloudflared Tunnel
|
Cloudflared Tunnel
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Generate the secret name
|
|||||||
{{- if .Values.secret.externalSecret.nameOverride }}
|
{{- if .Values.secret.externalSecret.nameOverride }}
|
||||||
{{- .Values.secret.externalSecret.nameOverride | trunc 63 | trimSuffix "-" }}
|
{{- .Values.secret.externalSecret.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{- printf "%s-secret" (include "cloudflared.name" .) -}}
|
{{- printf "%s-%s-secret" .Release.Name (include "cloudflared.name" .) -}}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- else if .Values.secret.existingSecret.name }}
|
{{- else if .Values.secret.existingSecret.name }}
|
||||||
{{- printf "%s" .Values.secret.existingSecret.name -}}
|
{{- printf "%s" .Values.secret.existingSecret.name -}}
|
||||||
@@ -44,7 +44,11 @@ Generate path in the secret store
|
|||||||
*/}}
|
*/}}
|
||||||
{{- define "secret.path" -}}
|
{{- define "secret.path" -}}
|
||||||
{{- if and (.Values.secret.externalSecret.enabled) (.Values.secret.externalSecret.store.path) }}
|
{{- if and (.Values.secret.externalSecret.enabled) (.Values.secret.externalSecret.store.path) }}
|
||||||
{{- printf "%s/%s" .Values.secret.externalSecret.store.path .Release.Name -}}
|
{{- if .Values.name }}
|
||||||
|
{{- printf "%s/%s-%s" .Values.secret.externalSecret.store.path .Release.Name .Values.name -}}
|
||||||
|
{{- else }}
|
||||||
|
{{- printf "%s/%s" .Values.secret.externalSecret.store.path .Release.Name -}}
|
||||||
|
{{- end }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{ fail "No Secret Store Path Found!" }}
|
{{ fail "No Secret Store Path Found!" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
Reference in New Issue
Block a user