Skip to content

Commit 74b6716

Browse files
authored
fix: add catch for nil value in naming templates (#263)
* fix: add catch for nil value * Update Chart.yaml
1 parent f7d654d commit 74b6716

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

charts/minecraft/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: minecraft
3-
version: 4.26.1
3+
version: 4.26.2
44
appVersion: SeeValues
55
home: https://minecraft.net/
66
description: Minecraft server

charts/minecraft/templates/_helpers.tpl

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
Expand the name of the chart.
44
*/}}
55
{{- define "minecraft.name" -}}
6-
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
6+
{{- $nameOverride := (and .Values (get .Values "nameOverride")) }}
7+
{{- default .Chart.Name $nameOverride | trunc 63 | trimSuffix "-" -}}
78
{{- end -}}
89

910
{{/*
@@ -29,10 +30,10 @@ Create a default fully qualified app name.
2930
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
3031
*/}}
3132
{{- define "minecraft.fullname" -}}
32-
{{- if .Values.fullnameOverride }}
33+
{{- if and .Values (hasKey .Values "fullnameOverride") .Values.fullnameOverride }}
3334
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
3435
{{- else }}
35-
{{- $name := default .Chart.Name .Values.nameOverride }}
36+
{{- $name := default .Chart.Name (and .Values (get .Values "nameOverride")) }}
3637
{{- if contains $name .Release.Name }}
3738
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
3839
{{- else }}

0 commit comments

Comments
 (0)