-
Notifications
You must be signed in to change notification settings - Fork 486
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.
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: Allow user to add service account labels #6022
Conversation
Just to say I signed the CLA, should get updated soon enough |
@@ -2,7 +2,7 @@ apiVersion: v2 | |||
name: grafana-agent | |||
description: 'Grafana Agent' | |||
type: application | |||
version: 0.29.0 | |||
version: 0.30.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's not increment the version quite yet. There is one other pending PR for helm, and then I'll make a new release shortly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi! Thanks for the contribution. I have a few comments but LGTM after that.
@@ -2,7 +2,7 @@ apiVersion: v2 | |||
name: grafana-agent | |||
description: 'Grafana Agent' | |||
type: application | |||
version: 0.29.0 | |||
version: 0.30.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, can you roll this change back? We'll increment the version when the Helm chart is ready for a release; there's a small process to follow so I don't want to tie up the release with this PR.
@@ -14,6 +14,8 @@ Unreleased | |||
|
|||
- Update `rbac` to include necessary rules for the `otelcol.processor.k8sattributes` component. (@rlankfo) | |||
|
|||
- Allow helm chart users to set additional labels on the service account. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to see the name of the new field in the changelog entry:
- Allow helm chart users to set additional labels on the service account. | |
- Add `serviceAccount.additionalLabels` to values.yaml to enable setting additional labels on the created service account. |
{{- with .Values.serviceAccount.additionalLabels }} | ||
{{- toYaml . | nindent 4 }} | ||
{{- end }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a corresponding test values.yaml file for this in operations/helm/charts/grafana-agent/ci
and run make generate-helm-tests
to generate the manifests for it? That way we can have regression tests in case this breaks.
310eb1c
to
aa6bb14
Compare
This can be useful to use OIDC required labels for grafana-agent to authenticate to services. For example, Azure Workload Identity requires a labels to set additional labels on the service account for it to function properly.
@rfratto: I've made the requested changes, I've also rebased on upstream since there were merge conflicts, should be good to go. Thanks for the feedback |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you! Waiting for CI to pass and then I'll merge.
This can be useful to use OIDC required labels for grafana-agent to authenticate to services. For example, Azure Workload Identity requires a labels to set additional labels on the service account for it to function properly. Co-authored-by: christophe.vandekerchove <[email protected]>
This can be useful to use OIDC required labels for grafana-agent to authenticate to services. For example, Azure Workload Identity requires a labels to set additional labels on the service account for it to function properly. Co-authored-by: christophe.vandekerchove <[email protected]>
PR Description
Allow helm chart users to add service account labels
This can be useful to use OIDC required labels for grafana-agent to authenticate to services.
For example, Azure Workload Identity requires a labels to set additional labels on the service account for it to function properly.
Which issue(s) this PR fixes
n/a
Notes to the Reviewer
PR Checklist