Merge pull request #1637 from ahysing/custom-requests-kube-rbacc-proxy-self

Added custom overrides for kube-rbac-proxy-self.
This commit is contained in:
Philip Gough
2022-02-18 16:32:30 +00:00
committed by GitHub
2 changed files with 8 additions and 1 deletions

View File

@@ -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)

View File

@@ -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',