From 274d5856c72932d93c4fee5eea335e2d99134ff7 Mon Sep 17 00:00:00 2001
From: Ricardo Ribeiro <j.ribeiro.fafe@gmail.com>
Date: Wed, 15 Mar 2023 11:47:31 +0000
Subject: [PATCH] Added custom overrides for kube-rbac-proxy. (#1987)
Missing in prometheus-operator, node-exporter and blacbox-exporter.
---
.../components/blackbox-exporter.libsonnet | 8 +++++++-
.../kube-prometheus/components/node-exporter.libsonnet | 8 +++++++-
.../components/prometheus-operator.libsonnet | 8 +++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
index 24deb175..299b29b0 100644
--- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
@@ -11,6 +11,12 @@ local defaults = {
requests: { cpu: '10m', memory: '20Mi' },
limits: { cpu: '20m', memory: '40Mi' },
},
+ kubeRbacProxy:: {
+ resources+: {
+ requests: { cpu: '10m', memory: '20Mi' },
+ limits: { cpu: '20m', memory: '40Mi' },
+ },
+ },
commonLabels:: {
'app.kubernetes.io/name': 'blackbox-exporter',
'app.kubernetes.io/version': defaults.version,
@@ -209,7 +215,7 @@ function(params) {
}],
};
- local kubeRbacProxy = krp({
+ local kubeRbacProxy = krp(bb._config.kubeRbacProxy {
name: 'kube-rbac-proxy',
upstream: 'http://127.0.0.1:' + bb._config.internalPort + '/',
resources: bb._config.resources,
diff --git a/jsonnet/kube-prometheus/components/node-exporter.libsonnet b/jsonnet/kube-prometheus/components/node-exporter.libsonnet
index a866d125..853a439c 100644
--- a/jsonnet/kube-prometheus/components/node-exporter.libsonnet
+++ b/jsonnet/kube-prometheus/components/node-exporter.libsonnet
@@ -13,6 +13,12 @@ local defaults = {
requests: { cpu: '102m', memory: '180Mi' },
limits: { cpu: '250m', memory: '180Mi' },
},
+ kubeRbacProxy:: {
+ resources+: {
+ requests: { cpu: '10m', memory: '20Mi' },
+ limits: { cpu: '20m', memory: '40Mi' },
+ },
+ },
listenAddress:: '127.0.0.1',
filesystemMountPointsExclude:: '^/(dev|proc|sys|run/k3s/containerd/.+|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)',
// NOTE: ignore veth network interface associated with containers.
@@ -220,7 +226,7 @@ function(params) {
},
};
- local kubeRbacProxy = krp({
+ local kubeRbacProxy = krp(ne._config.kubeRbacProxy {
name: 'kube-rbac-proxy',
//image: krpImage,
upstream: 'http://127.0.0.1:' + ne._config.port + '/',
diff --git a/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet
index 7d4bc0a3..d29d41ea 100644
--- a/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet
@@ -15,6 +15,12 @@ local defaults = {
limits: { cpu: '200m', memory: '200Mi' },
requests: { cpu: '100m', memory: '100Mi' },
},
+ kubeRbacProxy:: {
+ resources+: {
+ requests: { cpu: '10m', memory: '20Mi' },
+ limits: { cpu: '20m', memory: '40Mi' },
+ },
+ },
commonLabels:: {
'app.kubernetes.io/name': defaults.name,
'app.kubernetes.io/version': defaults.version,
@@ -141,7 +147,7 @@ function(params)
],
},
- local kubeRbacProxy = krp({
+ local kubeRbacProxy = krp(po._config.kubeRbacProxy {
name: 'kube-rbac-proxy',
upstream: 'http://127.0.0.1:8080/',
secureListenAddress: ':8443',
--
GitLab