Skip to content

Commit 012bc76

Browse files
fix: service account name (#530)
1 parent 10c4390 commit 012bc76

File tree

1 file changed

+58
-62
lines changed

1 file changed

+58
-62
lines changed
Lines changed: 58 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,58 @@
1-
{{/*
2-
Expand the name of the chart.
3-
*/}}
4-
{{- define "oidc-guard.name" -}}
5-
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
6-
{{- end }}
7-
8-
{{/*
9-
Create a default fully qualified app name.
10-
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
11-
If release name contains chart name it will be used as a full name.
12-
*/}}
13-
{{- define "oidc-guard.fullname" -}}
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 }}
25-
26-
{{/*
27-
Create chart name and version as used by the chart label.
28-
*/}}
29-
{{- define "oidc-guard.chart" -}}
30-
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
31-
{{- end }}
32-
33-
{{/*
34-
Common labels
35-
*/}}
36-
{{- define "oidc-guard.labels" -}}
37-
helm.sh/chart: {{ include "oidc-guard.chart" . }}
38-
{{ include "oidc-guard.selectorLabels" . }}
39-
{{- if .Chart.AppVersion }}
40-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
41-
{{- end }}
42-
app.kubernetes.io/managed-by: {{ .Release.Service }}
43-
{{- end }}
44-
45-
{{/*
46-
Selector labels
47-
*/}}
48-
{{- define "oidc-guard.selectorLabels" -}}
49-
app.kubernetes.io/name: {{ include "oidc-guard.name" . }}
50-
app.kubernetes.io/instance: {{ .Release.Name }}
51-
{{- end }}
52-
53-
{{/*
54-
Create the name of the service account to use
55-
*/}}
56-
{{- define "oidc-guard.serviceAccountName" -}}
57-
{{- if .Values.serviceAccount.create }}
58-
{{- default (include "oidc-guard.fullname" .) .Values.serviceAccount.name }}
59-
{{- else }}
60-
{{- default "default" .Values.serviceAccount.name }}
61-
{{- end }}
62-
{{- end }}
1+
{{/*
2+
Expand the name of the chart.
3+
*/}}
4+
{{- define "oidc-guard.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
6+
{{- end }}
7+
8+
{{/*
9+
Create a default fully qualified app name.
10+
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
11+
If release name contains chart name it will be used as a full name.
12+
*/}}
13+
{{- define "oidc-guard.fullname" -}}
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 }}
25+
26+
{{/*
27+
Create chart name and version as used by the chart label.
28+
*/}}
29+
{{- define "oidc-guard.chart" -}}
30+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
31+
{{- end }}
32+
33+
{{/*
34+
Common labels
35+
*/}}
36+
{{- define "oidc-guard.labels" -}}
37+
helm.sh/chart: {{ include "oidc-guard.chart" . }}
38+
{{ include "oidc-guard.selectorLabels" . }}
39+
{{- if .Chart.AppVersion }}
40+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
41+
{{- end }}
42+
app.kubernetes.io/managed-by: {{ .Release.Service }}
43+
{{- end }}
44+
45+
{{/*
46+
Selector labels
47+
*/}}
48+
{{- define "oidc-guard.selectorLabels" -}}
49+
app.kubernetes.io/name: {{ include "oidc-guard.name" . }}
50+
app.kubernetes.io/instance: {{ .Release.Name }}
51+
{{- end }}
52+
53+
{{/*
54+
Create the name of the service account to use
55+
*/}}
56+
{{- define "oidc-guard.serviceAccountName" -}}
57+
{{- default (include "oidc-guard.fullname" .) .Values.serviceAccount.name }}
58+
{{- end }}

0 commit comments

Comments
 (0)