diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c7479add43822c999d56a32ddc9fa9ed47e4f4..8eb41e6c8927eeced465227992b0af4ca68cced0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ * [ENHANCEMENT] Exclude k3s containerd mountpoints [#1497](https://github.com/prometheus-operator/kube-prometheus/pull/1497) * [ENHANCEMENT] Alertmanager now uses the new `matcher` syntax in the routing tree and inhibition rules [#1508](https://github.com/prometheus-operator/kube-prometheus/pull/1508) * [ENHANCEMENT] Deprecate `thanosSelector` and expose `mixin._config.thanos` config variable for thanos sidecar [#1543](https://github.com/prometheus-operator/kube-prometheus/pull/1543) +* [ENHANCEMENT] Added configurable default values for sidecar container kube-rbac-proxy-self in deployment kube-statate-metrics. [#1637](https://github.com/prometheus-operator/kube-prometheus/pull/1637) * [FEATURE] Support scraping config-reloader sidecar for Prometheus and AlertManager StatefulSets [#1344](https://github.com/prometheus-operator/kube-prometheus/pull/1344) * [FEATURE] Expose prometheus alerting configuration in $.values.prometheus configuration [#1476](https://github.com/prometheus-operator/kube-prometheus/pull/1476) * [BUGFIX] Remove deprecated policy/v1beta1 Kubernetes API [#1433](https://github.com/prometheus-operator/kube-prometheus/pull/1433) diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index deaeb085c8a46dc50444706a04166161f0367b85..5162141e07917c621eaea182572e64c9a093577f 100644 --- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet @@ -20,6 +20,12 @@ local defaults = { requests+: { cpu: '20m' }, }, }, + kubeRbacProxySelf:: { + resources+: { + limits+: { cpu: '20m' }, + requests+: { cpu: '10m' }, + }, + }, scrapeInterval:: '30s', scrapeTimeout:: '30s', commonLabels:: { @@ -108,7 +114,7 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- image: ksm._config.kubeRbacProxyImage, }), - local kubeRbacProxySelf = krp({ + local kubeRbacProxySelf = krp(ksm._config.kubeRbacProxySelf { name: 'kube-rbac-proxy-self', upstream: 'http://127.0.0.1:8082/', secureListenAddress: ':9443',