Skip to content

Commit

Permalink
fix chart typos
Browse files Browse the repository at this point in the history
  • Loading branch information
hugoShaka committed Nov 15, 2024
1 parent 358c405 commit 0d511a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions examples/chart/teleport-cluster/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if serviceAccount is not defined or serviceAccount.name is empty, use .Release.N
Create the name of the service account to use in the auth config check hook.
If the chart is creating service accounts, we know we can create new arbitrary service accounts.
We cannot reuse the same name as the deployment SA because the non-hook sevrice account might
We cannot reuse the same name as the deployment SA because the non-hook service account might
not exist yet. We tried being smart with hooks but ArgoCD doesn't differentiate between install
and upgrade, causing various issues on update and eventually forcing us to use a separate SA.
Expand All @@ -22,7 +22,7 @@ so we can use the same SA for deployments and hooks.
{{- include "teleport-cluster.auth.serviceAccountName" . -}}
{{- if .Values.serviceAccount.create -}}
-hook
{{- end}}
{{- end -}}
{{- end -}}

{{- define "teleport-cluster.proxy.serviceAccountName" -}}
Expand All @@ -33,7 +33,7 @@ so we can use the same SA for deployments and hooks.
Create the name of the service account to use in the proxy config check hook.
If the chart is creating service accounts, we know we can create new arbitrary service accounts.
We cannot reuse the same name as the deployment SA because the non-hook sevrice account might
We cannot reuse the same name as the deployment SA because the non-hook service account might
not exist yet. We tried being smart with hooks but ArgoCD doesn't differentiate between install
and upgrade, causing various issues on update and eventually forcing us to use a separate SA.
Expand All @@ -45,7 +45,7 @@ so we can use the same SA for deployments and hooks.
{{- include "teleport-cluster.proxy.serviceAccountName" . -}}
{{- if .Values.serviceAccount.create -}}
-hook
{{- end}}
{{- end -}}
{{- end -}}

{{- define "teleport-cluster.version" -}}
Expand Down
4 changes: 2 additions & 2 deletions examples/chart/teleport-cluster/tests/predeploy_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ tests:
path: spec.template.spec.serviceAccountName
value: helm-test-sa-hook

- it: should use serviceAccount.name for auth predeploy job SA when set in values and we're not cretaing SAs
- it: should use serviceAccount.name for auth predeploy job SA when set in values and we're not creating SAs
template: auth/predeploy_job.yaml
set:
clusterName: helm-lint
Expand Down Expand Up @@ -244,7 +244,7 @@ tests:
path: spec.template.spec.serviceAccountName
value: helm-test-sa-proxy-hook

- it: should use serviceAccount.name for proxy predeploy job SA when set in values and we're not cretaing SAs
- it: should use serviceAccount.name for proxy predeploy job SA when set in values and we're not creating SAs
template: proxy/predeploy_job.yaml
set:
clusterName: helm-lint
Expand Down

0 comments on commit 0d511a6

Please sign in to comment.