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

[kube-prometheus-stack] Add support to make automountServiceAccountToken configurable for Prometheus #4170

Merged
merged 3 commits into from
Jun 25, 2024
Merged

[kube-prometheus-stack] Add support to make automountServiceAccountToken configurable for Prometheus #4170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cccf836
Added support to turn off automountServiceAccountToken for Prometheus
Sheikh-Abubaker Jan 22, 2024
9a109d2
Resolve Conflict
Sheikh-Abubaker Jun 23, 2024
eec4bce
Merge branch 'main' of https://github.com/Sheikh-Abubaker/prometheus-…
Sheikh-Abubaker Jun 23, 2024
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
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 56.0.3
version: 56.0.4
appVersion: v0.71.0
kubeVersion: ">=1.19.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
Expand Down
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/charts/crds/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
apiVersion: v2
name: crds
version: 0.0.0
version: 1.0.0
3 changes: 3 additions & 0 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ spec:
description: 'Specification of the desired behavior of the Prometheus
cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
properties:
automountServiceAccountToken:
description: Controls whether a service account token is automatically mounted for the Prometheus pods.
type: boolean
jkroepke marked this conversation as resolved.
Show resolved Hide resolved
additionalAlertManagerConfigs:
description: "AdditionalAlertManagerConfigs specifies a key of a Secret
containing additional Prometheus Alertmanager configurations. The
Expand Down
1 change: 1 addition & 0 deletions charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ metadata:
{{ toYaml .Values.prometheus.annotations | indent 4 }}
{{- end }}
spec:
automountServiceAccountToken: {{ .Values.prometheus.prometheusSpec.automountServiceAccountToken }}
{{- if and (not .Values.prometheus.agentMode) (or .Values.prometheus.prometheusSpec.alertingEndpoints .Values.alertmanager.enabled) }}
alerting:
alertmanagers:
Expand Down
3 changes: 3 additions & 0 deletions charts/kube-prometheus-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3166,6 +3166,9 @@ prometheus:
prometheusSpec:
## If true, pass --storage.tsdb.max-block-duration=2h to prometheus. This is already done if using Thanos
##
## automountServiceAccountToken set to false to prevent auto mount of service account token.
automountServiceAccountToken: false

disableCompaction: false
## APIServerConfig
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#apiserverconfig
Expand Down