-
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
operations/helm/charts/grafana-agent/ci/additional-serviceaccount-label-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| serviceAccount: | ||
| additionalLabels: | ||
| test: "true" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- | ||
| # Source: grafana-agent/templates/configmap.yaml | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: grafana-agent | ||
| labels: | ||
| helm.sh/chart: grafana-agent | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| app.kubernetes.io/version: "vX.Y.Z" | ||
| app.kubernetes.io/managed-by: Helm | ||
| data: | ||
| config.river: |- | ||
| logging { | ||
| level = "info" | ||
| format = "logfmt" | ||
| } | ||
|
|
||
| discovery.kubernetes "pods" { | ||
| role = "pod" | ||
| } | ||
|
|
||
| discovery.kubernetes "nodes" { | ||
| role = "node" | ||
| } | ||
|
|
||
| discovery.kubernetes "services" { | ||
| role = "service" | ||
| } | ||
|
|
||
| discovery.kubernetes "endpoints" { | ||
| role = "endpoints" | ||
| } | ||
|
|
||
| discovery.kubernetes "endpointslices" { | ||
| role = "endpointslice" | ||
| } | ||
|
|
||
| discovery.kubernetes "ingresses" { | ||
| role = "ingress" | ||
| } |
73 changes: 73 additions & 0 deletions
73
.../tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| --- | ||
| # Source: grafana-agent/templates/controllers/daemonset.yaml | ||
| apiVersion: apps/v1 | ||
| kind: DaemonSet | ||
| metadata: | ||
| name: grafana-agent | ||
| labels: | ||
| helm.sh/chart: grafana-agent | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| app.kubernetes.io/version: "vX.Y.Z" | ||
| app.kubernetes.io/managed-by: Helm | ||
| spec: | ||
| minReadySeconds: 10 | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| spec: | ||
| serviceAccountName: grafana-agent | ||
| containers: | ||
| - name: grafana-agent | ||
| image: docker.io/grafana/agent:v0.38.1 | ||
| imagePullPolicy: IfNotPresent | ||
| args: | ||
| - run | ||
| - /etc/agent/config.river | ||
| - --storage.path=/tmp/agent | ||
| - --server.http.listen-addr=0.0.0.0:80 | ||
| - --server.http.ui-path-prefix=/ | ||
| env: | ||
| - name: AGENT_MODE | ||
| value: flow | ||
| - name: AGENT_DEPLOY_MODE | ||
| value: "helm" | ||
| - name: HOSTNAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| ports: | ||
| - containerPort: 80 | ||
| name: http-metrics | ||
| readinessProbe: | ||
| httpGet: | ||
| path: /-/ready | ||
| port: 80 | ||
| initialDelaySeconds: 10 | ||
| timeoutSeconds: 1 | ||
| volumeMounts: | ||
| - name: config | ||
| mountPath: /etc/agent | ||
| - name: config-reloader | ||
| image: docker.io/jimmidyson/configmap-reload:v0.8.0 | ||
| args: | ||
| - --volume-dir=/etc/agent | ||
| - --webhook-url=http://localhost:80/-/reload | ||
| volumeMounts: | ||
| - name: config | ||
| mountPath: /etc/agent | ||
| resources: | ||
| requests: | ||
| cpu: 1m | ||
| memory: 5Mi | ||
| dnsPolicy: ClusterFirst | ||
| volumes: | ||
| - name: config | ||
| configMap: | ||
| name: grafana-agent |
117 changes: 117 additions & 0 deletions
117
operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/rbac.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| --- | ||
| # Source: grafana-agent/templates/rbac.yaml | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: grafana-agent | ||
| labels: | ||
| helm.sh/chart: grafana-agent | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| app.kubernetes.io/version: "vX.Y.Z" | ||
| app.kubernetes.io/managed-by: Helm | ||
| rules: | ||
| # Rules which allow discovery.kubernetes to function. | ||
| - apiGroups: | ||
| - "" | ||
| - "discovery.k8s.io" | ||
| - "networking.k8s.io" | ||
| resources: | ||
| - endpoints | ||
| - endpointslices | ||
| - ingresses | ||
| - nodes | ||
| - nodes/proxy | ||
| - nodes/metrics | ||
| - pods | ||
| - services | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| # Rules which allow loki.source.kubernetes and loki.source.podlogs to work. | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - pods | ||
| - pods/log | ||
| - namespaces | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - apiGroups: | ||
| - "monitoring.grafana.com" | ||
| resources: | ||
| - podlogs | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| # Rules which allow mimir.rules.kubernetes to work. | ||
| - apiGroups: ["monitoring.coreos.com"] | ||
| resources: | ||
| - prometheusrules | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| - nonResourceURLs: | ||
| - /metrics | ||
| verbs: | ||
| - get | ||
| # Rules for prometheus.kubernetes.* | ||
| - apiGroups: ["monitoring.coreos.com"] | ||
| resources: | ||
| - podmonitors | ||
| - servicemonitors | ||
| - probes | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| # Rules which allow eventhandler to work. | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| # needed for remote.kubernetes.* | ||
| - apiGroups: [""] | ||
| resources: | ||
| - "configmaps" | ||
| - "secrets" | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
| # needed for otelcol.processor.k8sattributes | ||
| - apiGroups: ["apps"] | ||
| resources: ["replicasets"] | ||
| verbs: ["get", "list", "watch"] | ||
| - apiGroups: ["extensions"] | ||
| resources: ["replicasets"] | ||
| verbs: ["get", "list", "watch"] | ||
| --- | ||
| # Source: grafana-agent/templates/rbac.yaml | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| name: grafana-agent | ||
| labels: | ||
| helm.sh/chart: grafana-agent | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| app.kubernetes.io/version: "vX.Y.Z" | ||
| app.kubernetes.io/managed-by: Helm | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: grafana-agent | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: grafana-agent | ||
| namespace: default |
22 changes: 22 additions & 0 deletions
22
operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/service.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- | ||
| # Source: grafana-agent/templates/service.yaml | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: grafana-agent | ||
| labels: | ||
| helm.sh/chart: grafana-agent | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| app.kubernetes.io/version: "vX.Y.Z" | ||
| app.kubernetes.io/managed-by: Helm | ||
| spec: | ||
| type: ClusterIP | ||
| selector: | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| ports: | ||
| - name: http-metrics | ||
| port: 80 | ||
| targetPort: 80 | ||
| protocol: "TCP" |
13 changes: 13 additions & 0 deletions
13
...ns/helm/tests/additional-serviceaccount-label/grafana-agent/templates/serviceaccount.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- | ||
| # Source: grafana-agent/templates/serviceaccount.yaml | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| name: grafana-agent | ||
| labels: | ||
| helm.sh/chart: grafana-agent | ||
| app.kubernetes.io/name: grafana-agent | ||
| app.kubernetes.io/instance: grafana-agent | ||
| app.kubernetes.io/version: "vX.Y.Z" | ||
| app.kubernetes.io/managed-by: Helm | ||
| test: "true" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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/ciand runmake generate-helm-teststo generate the manifests for it? That way we can have regression tests in case this breaks.