diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet index 4d17c8ab2ac3e86e210b8f09d13b52bc3c4077c2..a2f29e671d737fd8c1454fb93fb0bc059e51916f 100644 --- a/jsonnet/kube-prometheus/components/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/components/alertmanager.libsonnet @@ -121,6 +121,7 @@ function(params) { apiVersion: 'v1', kind: 'ServiceAccount', metadata: am._metadata, + automountServiceAccountToken: false, }, service: { diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet index 8a05beff286c1d8f4ae14724b8e3af9ee2242bb2..162bd9a631028d20054aad1fac49127d07b2dc01 100644 --- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet @@ -115,6 +115,7 @@ function(params) { apiVersion: 'v1', kind: 'ServiceAccount', metadata: bb._metadata, + automountServiceAccountToken: false, }, clusterRole: { @@ -238,6 +239,7 @@ function(params) { spec: { containers: [blackboxExporter, reloader, kubeRbacProxy], nodeSelector: { 'kubernetes.io/os': 'linux' }, + automountServiceAccountToken: true, serviceAccountName: 'blackbox-exporter', volumes: [{ name: 'config', diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index 2ba9518c87d1134184860a214f9c0f2d8a342897..a89e170e92d98bc6f28a97e39362fa130fbb7fed 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -88,10 +88,12 @@ function(params) // 'allowPrivilegeEscalation: false' can be deleted when https://github.com/brancz/kubernetes-grafana/pull/128 gets merged. // 'readOnlyRootFilesystem: true' can be deleted when https://github.com/brancz/kubernetes-grafana/pull/129 gets merged. // 'capabilities: { drop: ['ALL'] }' can be deleted when https://github.com/brancz/kubernetes-grafana/pull/130 gets merged. + // FIXME(paulfantom): `automountServiceAccountToken` can be removed after porting to brancz/kuberentes-grafana deployment+: { spec+: { template+: { spec+: { + automountServiceAccountToken: false, containers: std.map(function(c) c { securityContext+: { allowPrivilegeEscalation: false, diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index cd925c0b82f240ab69ceb47c874d0fe0081c86db..c63891ec624603c71575c2d8cfaa405eb9816929 100644 --- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet @@ -129,6 +129,7 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- }, }, spec+: { + automountServiceAccountToken: true, containers: std.map(function(c) c { ports:: null, livenessProbe:: null, diff --git a/jsonnet/kube-prometheus/components/node-exporter.libsonnet b/jsonnet/kube-prometheus/components/node-exporter.libsonnet index c9dd2d2fc7c9c112b89b7f6ad9afd56b5ff3baa7..11ebfbe1bae35e5e041222cbaab31fc51f010d08 100644 --- a/jsonnet/kube-prometheus/components/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/node-exporter.libsonnet @@ -114,6 +114,7 @@ function(params) { apiVersion: 'v1', kind: 'ServiceAccount', metadata: ne._metadata, + automountServiceAccountToken: false, }, service: { @@ -240,6 +241,7 @@ function(params) { { name: 'sys', hostPath: { path: '/sys' } }, { name: 'root', hostPath: { path: '/' } }, ], + automountServiceAccountToken: true, serviceAccountName: ne._config.name, securityContext: { runAsUser: 65534, diff --git a/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet index b0cf3a4bddf294e5a9c188cb2f8191c18e97edd9..1ac3aced0ca4ffee8818e48ac14c0da000392b5d 100644 --- a/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet @@ -253,6 +253,7 @@ function(params) { spec: { containers: [c], serviceAccountName: $.serviceAccount.metadata.name, + automountServiceAccountToken: true, nodeSelector: { 'kubernetes.io/os': 'linux' }, volumes: [ { name: 'tmpfs', emptyDir: {} }, @@ -268,6 +269,7 @@ function(params) { apiVersion: 'v1', kind: 'ServiceAccount', metadata: pa._metadata, + automountServiceAccountToken: false, }, clusterRole: { diff --git a/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet index b6139da1cb96cfc1af45918f4575a11893f1834e..68ebf94cc5b9c85addb018dc34e4a3e65260eb12 100644 --- a/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet @@ -131,6 +131,7 @@ function(params) spec+: { template+: { spec+: { + automountServiceAccountToken: true, containers: std.map(function(c) c { securityContext+: { capabilities: { drop: ['ALL'] }, diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index db1e2cd0e4c635e8a025cb8ea2ef95ed4d719df1..c21a65a92badf2b2f3c7d3230ad4ef4d2418b9c6 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -98,6 +98,7 @@ function(params) { apiVersion: 'v1', kind: 'ServiceAccount', metadata: p._metadata, + automountServiceAccountToken: false, }, service: {