From 3f388b797da84ac04e83a7ca0dde432f85a4fe31 Mon Sep 17 00:00:00 2001
From: Sereinity <sereinity@online.fr>
Date: Thu, 12 Dec 2019 15:50:34 +0100
Subject: [PATCH] Make limits/requests resources of kube-state-metrics
removable, unify tunning
---
.../kube-prometheus/kube-prometheus-strip-limits.libsonnet | 3 +++
jsonnet/kube-prometheus/kube-prometheus.libsonnet | 4 ++++
.../kube-state-metrics/kube-state-metrics.libsonnet | 7 ++-----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet
index 52660d7b..710489da 100644
--- a/jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet
@@ -9,6 +9,9 @@
'kube-rbac-proxy'+: {
limits: {},
},
+ 'kube-state-metrics'+: {
+ limits: {},
+ },
'node-exporter'+: {
limits: {},
},
diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index a33ccc1a..4c1cb8d5 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -116,6 +116,10 @@ local configMapList = k3.core.v1.configMapList;
requests: { cpu: '10m', memory: '20Mi' },
limits: { cpu: '20m', memory: '40Mi' },
},
+ 'kube-state-metrics': {
+ requests: { cpu: '100m', memory: '150Mi' },
+ limits: { cpu: '100m', memory: '150Mi' },
+ },
'node-exporter': {
requests: { cpu: '102m', memory: '180Mi' },
limits: { cpu: '250m', memory: '180Mi' },
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index e30a63c3..595d646b 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -8,9 +8,6 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
collectors: '', // empty string gets a default set
scrapeInterval: '30s',
scrapeTimeout: '30s',
-
- baseCPU: '100m',
- baseMemory: '150Mi',
},
versions+:: {
@@ -174,8 +171,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
'--telemetry-host=127.0.0.1',
'--telemetry-port=8082',
] + 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.withLimits({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory });
+ container.mixin.resources.withRequests($._config.resources['kube-state-metrics'].requests) +
+ container.mixin.resources.withLimits($._config.resources['kube-state-metrics'].limits);
local c = [proxyClusterMetrics, proxySelfMetrics, kubeStateMetrics];
--
GitLab