Skip to content
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

feat(helm): adds a flag for tokengen rbac components so that they can be disabled optionally #15882

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+25 −3
Open

feat(helm): adds a flag for tokengen rbac components so that they can be disabled optionally #15882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
463c58a
feat(helm): adds a flag for tokengen rbac components so that they can…
drew0ps Jan 22, 2025
64d4d78
Merge branch 'main' into add-tokengen-rbac-flags
drew0ps Jan 22, 2025
3f18ae6
Merge branch 'main' into add-tokengen-rbac-flags
drew0ps Jan 23, 2025
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
17 changes: 17 additions & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3106,6 +3106,9 @@ null
"labels": {},
"nodeSelector": {},
"priorityClassName": "",
"rbac": {
"create": true
},
"securityContext": {
"fsGroup": 10001,
"runAsGroup": 10001,
Expand Down Expand Up @@ -3475,6 +3478,9 @@ null
"labels": {},
"nodeSelector": {},
"priorityClassName": "",
"rbac": {
"create": true
},
"securityContext": {
"fsGroup": 10001,
"runAsGroup": 10001,
Expand Down Expand Up @@ -3584,6 +3590,17 @@ true
<td><pre lang="json">
""
</pre>
</td>
</tr>
<tr>
<td>enterprise.tokengen.rbac</td>
<td>object</td>
<td>Whether to create a ServiceAccount, a (Cluster)Role and a (Cluster)RoleBinding for the tokengen Job - this allows the components to be created externally when needed</td>
<td><pre lang="json">
{
"create": true
}
</pre>
</td>
</tr>
<tr>
Expand Down
2 changes: 2 additions & 0 deletions production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)

- [FEATURE] Added a Helm Chart value to disable the rbac resource creation for the tokengen job.

## 6.25.0

- [BUGFIX] Removed minio-mc init container from admin-api.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/tokengen/clusterrole-tokengen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled }}
{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.tokengen.rbac.create .Values.enterprise.enabled }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: {{ if not .Values.rbac.namespaced }}Cluster{{ end }}Role
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/tokengen/clusterrolebinding-tokengen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled }}
{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.tokengen.rbac.create .Values.enterprise.enabled }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: {{ if not .Values.rbac.namespaced }}Cluster{{ end }}RoleBinding
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/templates/tokengen/serviceaccount-tokengen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.enabled }}
{{ if and .Values.enterprise.tokengen.enabled .Values.enterprise.tokengen.rbac.create .Values.enterprise.enabled }}
---
apiVersion: v1
kind: ServiceAccount
Expand Down
3 changes: 3 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,9 @@ enterprise:
targetModule: "tokengen"
# -- Additional CLI arguments for the `tokengen` target
extraArgs: []
# -- Whether to create a ServiceAccount, a (Cluster)Role and a (Cluster)RoleBinding for the tokengen Job - this allows the components to be created externally when needed
rbac:
create: true
# -- Additional Kubernetes environment
env: []
# -- Additional labels for the `tokengen` Job
Expand Down
Loading