Skip to content

Commit 4ebd86d

Browse files
authored
Merge pull request #253 from joryirving/feat/fullnameoverride-minecraft
feat: add nameOverride and fullnameOverride to minecraft chart
2 parents 80e95ab + b3b5542 commit 4ebd86d

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

charts/minecraft/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: minecraft
3-
version: 4.24.0
3+
version: 4.25.0
44
appVersion: SeeValues
55
home: https://minecraft.net/
66
description: Minecraft server

charts/minecraft/templates/_helpers.tpl

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,17 @@ Create a default fully qualified app name.
1111
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1212
*/}}
1313
{{- define "minecraft.fullname" -}}
14-
{{- $name := default .Chart.Name .Values.nameOverride -}}
15-
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
16-
{{- end -}}
14+
{{- if .Values.fullnameOverride }}
15+
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
16+
{{- else }}
17+
{{- $name := default .Chart.Name .Values.nameOverride }}
18+
{{- if contains $name .Release.Name }}
19+
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
20+
{{- else }}
21+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
22+
{{- end }}
23+
{{- end }}
24+
{{- end }}
1725

1826
{{- define "minecraft.ingress.apiVersion" -}}
1927
{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.Version -}}

charts/minecraft/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ image:
1010
# ### WARNING ###
1111
replicaCount: 1
1212

13+
nameOverride: ""
14+
fullnameOverride: ""
15+
1316
## Configure resource requests and limits
1417
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
1518
##

0 commit comments

Comments
 (0)