Merge pull request #253 from joryirving/feat/fullnameoverride-minecraft

feat: add nameOverride and fullnameOverride to minecraft chart

Author: billimek

charts/minecraft/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft
-version: 4.24.0
+version: 4.25.0
 appVersion: SeeValues
 home: https://minecraft.net/
 description: Minecraft server

charts/minecraft/templates/_helpers.tpl

@@ -11,9 +11,17 @@ 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 "minecraft.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- 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 }}
+{{- end }}
 
 {{- define "minecraft.ingress.apiVersion" -}}
 {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.Version -}}

charts/minecraft/values.yaml

@@ -10,6 +10,9 @@ image:
 # ### WARNING ###
 replicaCount: 1
 
+nameOverride: ""
+fullnameOverride: ""
+
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##