mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-08-28 18:01:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #325 from sereinity-forks/master

Browse Source 
Make limits/requests resources of kube-state-metrics removable
This commit is contained in:
Frederic Branczyk 2019-12-12 16:06:58 +01:00 committed by GitHub
commit ce7c5fa3b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet
View File

@ -9,6 +9,9 @@
'kube-rbac-proxy'+: { 'kube-rbac-proxy'+: {
limits: {}, limits: {},
}, },
'kube-state-metrics'+: {
limits: {},
},
'node-exporter'+: { 'node-exporter'+: {
limits: {}, limits: {},
}, },

4
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@ -116,6 +116,10 @@ local configMapList = k3.core.v1.configMapList;
requests: { cpu: '10m', memory: '20Mi' }, requests: { cpu: '10m', memory: '20Mi' },
limits: { cpu: '20m', memory: '40Mi' }, limits: { cpu: '20m', memory: '40Mi' },
}, },
'kube-state-metrics': {
requests: { cpu: '100m', memory: '150Mi' },
limits: { cpu: '100m', memory: '150Mi' },
},
'node-exporter': { 'node-exporter': {
requests: { cpu: '102m', memory: '180Mi' }, requests: { cpu: '102m', memory: '180Mi' },
limits: { cpu: '250m', memory: '180Mi' }, limits: { cpu: '250m', memory: '180Mi' },

7
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
View File

@ -8,9 +8,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
collectors: '', // empty string gets a default set collectors: '', // empty string gets a default set
scrapeInterval: '30s', scrapeInterval: '30s',
scrapeTimeout: '30s', scrapeTimeout: '30s',
baseCPU: '100m',
baseMemory: '150Mi',
}, },
versions+:: { versions+:: {
@ -174,8 +171,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
'--telemetry-host=127.0.0.1', '--telemetry-host=127.0.0.1',
'--telemetry-port=8082', '--telemetry-port=8082',
] + if $._config.kubeStateMetrics.collectors != '' then ['--collectors=' + $._config.kubeStateMetrics.collectors] else []) + ] + if $._config.kubeStateMetrics.collectors != '' then ['--collectors=' + $._config.kubeStateMetrics.collectors] else []) +
container.mixin.resources.withRequests({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory }) + container.mixin.resources.withRequests($._config.resources['kube-state-metrics'].requests) +
container.mixin.resources.withLimits({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory }); container.mixin.resources.withLimits($._config.resources['kube-state-metrics'].limits);
local c = [proxyClusterMetrics, proxySelfMetrics, kubeStateMetrics]; local c = [proxyClusterMetrics, proxySelfMetrics, kubeStateMetrics];