Skip to content

Commit b5f88dc

Browse files
joryirvingjoryirving
committed
fix: oci chart rendering version
1 parent 4ebd86d commit b5f88dc

17 files changed

+32
-32
lines changed

‎charts/minecraft-bedrock/templates/datadir-pvc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "minecraft.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
{{- with .Values.persistence.labels }}

‎charts/minecraft-bedrock/templates/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
{{- end }}
1313
labels:
1414
app: {{ template "minecraft.fullname" . }}
15-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
15+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1616
release: "{{ .Release.Name }}"
1717
heritage: "{{ .Release.Service }}"
1818
{{- with .Values.deploymentLabels }}
@@ -241,7 +241,7 @@ spec:
241241
name: datadir
242242
labels:
243243
app: {{ template "minecraft.fullname" . }}
244-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
244+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
245245
release: "{{ .Release.Name }}"
246246
heritage: "{{ .Release.Service }}"
247247
annotations:

‎charts/minecraft-bedrock/templates/minecraft-svc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: {{ .Release.Namespace }}
66
labels:
77
app: {{ template "minecraft.fullname" . }}
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
8+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
99
release: "{{ .Release.Name }}"
1010
heritage: "{{ .Release.Service }}"
1111
{{- with .Values.serviceLabels }}

‎charts/minecraft-proxy/templates/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "proxy.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
data:

‎charts/minecraft-proxy/templates/datadir-pvc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "proxy.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
annotations:

‎charts/minecraft-proxy/templates/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations: {{ toYaml .Values.deploymentAnnotations | nindent 4 }}
77
labels:
88
app: {{ template "proxy.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
spec:

‎charts/minecraft-proxy/templates/proxy-svc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "proxy.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
annotations:

‎charts/minecraft-proxy/templates/rcon-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: {{ .Release.Namespace }}
88
labels:
99
app: {{ template "proxy.fullname" . }}
10-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
10+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1111
release: "{{ .Release.Name }}"
1212
heritage: "{{ .Release.Service }}"
1313
type: Opaque

‎charts/minecraft-proxy/templates/rcon-svc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
{{ toYaml .Values.rconServiceAnnotations | indent 4 }}
99
labels:
1010
app: {{ template "proxy.fullname" . }}
11-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
11+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1212
release: "{{ .Release.Name }}"
1313
heritage: "{{ .Release.Service }}"
1414
spec:

‎charts/minecraft-proxy/templates/velocity-forwarding-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: {{ .Release.Namespace }}
88
labels:
99
app: {{ template "proxy.fullname" . }}
10-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
10+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1111
release: "{{ .Release.Name }}"
1212
heritage: "{{ .Release.Service }}"
1313
type: Opaque

‎charts/minecraft/templates/backupdir-pvc.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "minecraft.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
app.kubernetes.io/name: "{{ .Chart.Name }}"
1313
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
14-
app.kubernetes.io/version: "{{ .Chart.Version }}"
14+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1515
annotations:
1616
{{- with .Values.mcbackup.persistence.annotations }}
1717
{{ toYaml . | nindent 4 }}

‎charts/minecraft/templates/datadir-pvc.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "minecraft.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
app.kubernetes.io/name: "{{ .Chart.Name }}"
1313
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
14-
app.kubernetes.io/version: "{{ .Chart.Version }}"
14+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1515
{{- with .Values.persistence.labels }}
1616
{{ toYaml . | nindent 4 }}
1717
{{- end }}

‎charts/minecraft/templates/deployment.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ metadata:
1212
{{- end }}
1313
labels:
1414
app: {{ template "minecraft.fullname" . }}
15-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
15+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1616
release: "{{ .Release.Name }}"
1717
heritage: "{{ .Release.Service }}"
1818
app.kubernetes.io/name: "{{ .Chart.Name }}"
1919
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
20-
app.kubernetes.io/version: "{{ .Chart.Version }}"
20+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
2121
{{- if .Values.deploymentLabels }}
2222
{{- range $key, $value := .Values.deploymentLabels}}
2323
{{ $key }}: {{ $value | quote }}
@@ -42,7 +42,7 @@ spec:
4242
app: {{ template "minecraft.fullname" . }}
4343
app.kubernetes.io/name: "{{ .Chart.Name }}"
4444
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
45-
app.kubernetes.io/version: "{{ .Chart.Version }}"
45+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
4646
{{- if .Values.podLabels }}
4747
{{- range $key, $value := .Values.podLabels}}
4848
{{ $key }}: {{ $value | quote }}
@@ -531,12 +531,12 @@ spec:
531531
name: datadir
532532
labels:
533533
app: {{ template "minecraft.fullname" . }}
534-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
534+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
535535
release: "{{ .Release.Name }}"
536536
heritage: "{{ .Release.Service }}"
537537
app.kubernetes.io/name: "{{ .Chart.Name }}"
538538
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
539-
app.kubernetes.io/version: "{{ .Chart.Version }}"
539+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
540540
annotations:
541541
{{- with .Values.persistence.annotations }}
542542
{{ toYaml . | nindent 10 }}
@@ -565,12 +565,12 @@ spec:
565565
name: backupdir
566566
labels:
567567
app: {{ template "minecraft.fullname" . }}
568-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
568+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
569569
release: "{{ .Release.Name }}"
570570
heritage: "{{ .Release.Service }}"
571571
app.kubernetes.io/name: "{{ .Chart.Name }}"
572572
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
573-
app.kubernetes.io/version: "{{ .Chart.Version }}"
573+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
574574
annotations:
575575
{{- with .Values.mcbackup.persistence.annotations }}
576576
{{ toYaml . | nindent 10 }}

‎charts/minecraft/templates/minecraft-svc.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ metadata:
55
namespace: {{ .Release.Namespace }}
66
labels:
77
app: {{ template "minecraft.fullname" . }}
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
8+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
99
release: "{{ .Release.Name }}"
1010
heritage: "{{ .Release.Service }}"
1111
app.kubernetes.io/name: "{{ .Chart.Name }}"
1212
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
13-
app.kubernetes.io/version: "{{ .Chart.Version }}"
13+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1414
{{- if .Values.serviceLabels }}
1515
{{- range $key, $value := .Values.serviceLabels}}
1616
{{ $key }}: {{ $value | quote }}

‎charts/minecraft/templates/rclone-secret.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ metadata:
66
name: {{ template "minecraft.fullname" . }}-rclone-config
77
labels:
88
app: {{ template "minecraft.fullname" . }}
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
app.kubernetes.io/name: "{{ .Chart.Name }}"
1313
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
14-
app.kubernetes.io/version: "{{ .Chart.Version }}"
14+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1515
type: Opaque
1616
data:
1717
rclone.conf: |-

‎charts/minecraft/templates/rcon-svc.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ metadata:
88
{{ toYaml .Values.rconServiceAnnotations | indent 4 }}
99
labels:
1010
app: {{ template "minecraft.fullname" . }}
11-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
11+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1212
release: "{{ .Release.Name }}"
1313
heritage: "{{ .Release.Service }}"
1414
app.kubernetes.io/name: "{{ .Chart.Name }}"
1515
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
16-
app.kubernetes.io/version: "{{ .Chart.Version }}"
16+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1717
{{- if .Values.rconServiceLabels }}
1818
{{- range $key, $value := .Values.rconServiceLabels}}
1919
{{ $key }}: {{ $value | quote }}

‎charts/minecraft/templates/secrets.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ metadata:
77
namespace: {{ .Release.Namespace }}
88
labels:
99
app: {{ template "minecraft.fullname" . }}
10-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
10+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1111
release: "{{ .Release.Name }}"
1212
heritage: "{{ .Release.Service }}"
1313
app.kubernetes.io/name: "{{ .Chart.Name }}"
1414
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
15-
app.kubernetes.io/version: "{{ .Chart.Version }}"
15+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
1616
type: Opaque
1717
data:
1818
rcon-password: {{ default "" .Values.minecraftServer.rcon.password | b64enc | quote }}
@@ -26,12 +26,12 @@ metadata:
2626
namespace: {{ .Release.Namespace }}
2727
labels:
2828
app: {{ template "minecraft.fullname" . }}
29-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
29+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
3030
release: "{{ .Release.Name }}"
3131
heritage: "{{ .Release.Service }}"
3232
app.kubernetes.io/name: "{{ .Chart.Name }}"
3333
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
34-
app.kubernetes.io/version: "{{ .Chart.Version }}"
34+
app.kubernetes.io/version: "{{ .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}"
3535
type: Opaque
3636
data:
3737
cf-api-key: {{ default "" .Values.minecraftServer.autoCurseForge.apiKey.key | b64enc | quote }}

0 commit comments

Comments
 (0)