Skip to content

Helm Chart: Add annotations to the service account in the Helm chart #3065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 21, 2022
Merged

Helm Chart: Add annotations to the service account in the Helm chart #3065

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d9e507
Add annotations to the service account in the Helm chart
0m1xa Sep 20, 2022
e4438df
Fixes
0m1xa Sep 21, 2022
f07893b
Fix in README.md
0m1xa Sep 21, 2022
b9f2b53
Update values.yaml
0m1xa Sep 23, 2022
f81edab
Update deployments/helm-chart/values.yaml
0m1xa Oct 20, 2022
939758f
Update deployments/helm-chart/values.yaml
0m1xa Oct 20, 2022
5c89c1e
Update deployments/helm-chart/values.yaml
0m1xa Oct 20, 2022
1f2dba2
Merge branch 'main' into helm-sa-annotations
0m1xa Oct 20, 2022
283d2bd
Merge branch 'main' into helm-sa-annotations
lucacome Oct 21, 2022
752c45a
fix spaces
lucacome Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deployments/helm-chart/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ Parameter | Description | Default
`controller.service.httpsPort.port` | The HTTPS port of the Ingress Controller service. | 443
`controller.service.httpsPort.nodePort` | The custom NodePort for the HTTPS port. Requires `controller.service.type` set to `NodePort`. | ""
`controller.service.httpsPort.targetPort` | The target port of the HTTPS port of the Ingress Controller service. | 443
`controller.serviceAccount.annotations` | The annotations of the Ingress Controller service account. | {}
`controller.serviceAccount.name` | The name of the service account of the Ingress Controller pods. Used for RBAC. | Autogenerated
`controller.serviceAccount.imagePullSecretName` | The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. | ""
`controller.serviceMonitor.name` | The name of the serviceMonitor. | Autogenerated
Expand Down
4 changes: 4 additions & 0 deletions deployments/helm-chart/templates/controller-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
apiVersion: v1
kind: ServiceAccount
metadata:
{{- if .Values.controller.serviceAccount.annotations }}
annotations:
{{- toYaml .Values.controller.serviceAccount.annotations | nindent 4 }}
{{- end }}
name: {{ include "nginx-ingress.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
labels:
Expand Down
7 changes: 5 additions & 2 deletions deployments/helm-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ controller:

## Enable OIDC policies.
enableOIDC: false

## Include year in log header. This parameter will be removed in release 2.7 and the year will be included by default.
includeYear: false

## Enable TLS Passthrough on port 443. Requires controller.enableCustomResources.
enableTLSPassthrough: false

Expand Down Expand Up @@ -309,6 +309,9 @@ controller:
customPorts: []

serviceAccount:
## The annotations of the service account of the Ingress Controller pods.
annotations: {}

## The name of the service account of the Ingress Controller pods. Used for RBAC.
## Autogenerated if not set or set to "".
# name: nginx-ingress
Expand Down