Skip to content

Commit 0c11a7c

Browse files
authored
Make sure chart stores chart version in labels safely (#3205)
* Make sure chart stores chart version in labels safely Signed-off-by: [email protected] <[email protected]> * Revert chart vresion --------- Signed-off-by: [email protected] <[email protected]>
1 parent 4fc0d21 commit 0c11a7c

19 files changed

+31
-20
lines changed

chart/templates/_helper.tpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,14 @@
1515
{{ .repository }}:{{ .tag }}
1616
{{- end -}}
1717
{{- end -}}
18+
19+
20+
{{- define "vcluster.version.label" -}}
21+
{{- $rawLabel := printf "%s-%s" .Chart.Name .Chart.Version -}}
22+
{{- $sanitized := replace "+" "_" $rawLabel | replace "@" "_" -}}
23+
{{- if gt (len $sanitized) 63 -}}
24+
{{- $sanitized | trunc 63 -}}
25+
{{- else -}}
26+
{{- $sanitized -}}
27+
{{- end -}}
28+
{{- end -}}

chart/templates/clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "vcluster.clusterRoleName" . }}
66
labels:
77
app: vcluster
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
8+
chart: "{{ include "vcluster.version.label" $ }}"
99
release: "{{ .Release.Name }}"
1010
heritage: "{{ .Release.Service }}"
1111
{{- if .Values.controlPlane.advanced.globalMetadata.annotations }}

chart/templates/clusterrolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ template "vcluster.clusterRoleName" . }}
66
labels:
77
app: vcluster
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
8+
chart: "{{ include "vcluster.version.label" $ }}"
99
release: "{{ .Release.Name }}"
1010
heritage: "{{ .Release.Service }}"
1111
{{- if .Values.controlPlane.advanced.globalMetadata.annotations }}

chart/templates/config-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: {{ .Release.Namespace }}
66
labels:
77
app: vcluster
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
8+
chart: "{{ include "vcluster.version.label" $ }}"
99
release: "{{ .Release.Name }}"
1010
heritage: "{{ .Release.Service }}"
1111
{{- if .Values.controlPlane.advanced.globalMetadata.annotations }}

chart/templates/etcd-headless-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: vcluster-etcd
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ include "vcluster.version.label" $ }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
{{- $annotations := merge dict .Values.controlPlane.advanced.globalMetadata.annotations .Values.controlPlane.backingStore.etcd.deploy.headlessService.annotations }}

chart/templates/etcd-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: {{ .Release.Namespace }}
88
labels:
99
app: vcluster-etcd
10-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
10+
chart: "{{ include "vcluster.version.label" $ }}"
1111
release: "{{ .Release.Name }}"
1212
heritage: "{{ .Release.Service }}"
1313
{{- $annotations := merge dict .Values.controlPlane.advanced.globalMetadata.annotations .Values.controlPlane.backingStore.etcd.deploy.service.annotations }}

chart/templates/etcd-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
namespace: {{ .Release.Namespace }}
99
labels:
1010
app: vcluster-etcd
11-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
11+
chart: "{{ include "vcluster.version.label" $ }}"
1212
release: "{{ .Release.Name }}"
1313
heritage: "{{ .Release.Service }}"
1414
{{- if $externalEtcd.labels }}

chart/templates/headless-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: vcluster
9-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9+
chart: "{{ include "vcluster.version.label" $ }}"
1010
release: "{{ .Release.Name }}"
1111
heritage: "{{ .Release.Service }}"
1212
{{- if .Values.controlPlane.advanced.headlessService.labels }}

chart/templates/ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
namespace: {{ .Release.Namespace }}
1212
labels:
1313
app: vcluster
14-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
14+
chart: "{{ include "vcluster.version.label" $ }}"
1515
release: "{{ .Release.Name }}"
1616
heritage: "{{ .Release.Service }}"
1717
{{- if .Values.controlPlane.ingress.labels }}

chart/templates/limitrange.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
{{- end }}
1212
labels:
1313
app: vcluster
14-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
14+
chart: "{{ include "vcluster.version.label" $ }}"
1515
release: "{{ .Release.Name }}"
1616
heritage: "{{ .Release.Service }}"
1717
{{- if .Values.policies.limitRange.labels }}

0 commit comments

Comments
 (0)