easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/configRbacImage

Browse Source
This commit is contained in:
Paweł Krupa
2021-05-03 09:57:23 +02:00
committed by GitHub
parent f107e8fb16 db7f3c9107
commit 624c6c0108
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@@ -105,13 +105,13 @@ $ minikube addons disable metrics-server
The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
| kube-prometheus stack | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 |
|-----------------------|-----------------|-----------------|-----------------|-----------------|
| `release-0.5` | ✔ | ✗ | ✗ | ✗ |
| `release-0.6` | ✗ | ✔ | ✗ | ✗ |
| `release-0.7` | ✗ | ✔ | ✔ | ✗ |
| `release-0.8` | ✗ | ✗ | ✔ | ✔ |
| `HEAD` | ✗ | ✗ | ✔ | ✔ |
| kube-prometheus stack | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 |
|--------------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|
| [`release-0.5`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.5) | ✔ | ✗ | ✗ | ✗ |
| [`release-0.6`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.6) | ✗ | ✔ | ✗ | ✗ |
| [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7) | ✗ | ✔ | ✔ | ✗ |
| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8) | ✗ | ✗ | ✔ | ✔ |
| [`HEAD`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✔ | ✔ |
## Quickstart

10
jsonnet/kube-prometheus/addons/anti-affinity.libsonnet
View File

@@ -18,7 +18,7 @@
},
},
local antiaffinity(labelSelector, namespace, type, topologyKey) = {
antiaffinity(labelSelector, namespace, type, topologyKey): {
local podAffinityTerm = {
namespaces: [namespace],
topologyKey: topologyKey,
@@ -44,7 +44,7 @@
alertmanager+: {
alertmanager+: {
spec+:
antiaffinity(
$.antiaffinity(
$.alertmanager._config.selectorLabels,
$.values.common.namespace,
$.values.alertmanager.podAntiAffinity,
@@ -56,7 +56,7 @@
prometheus+: {
prometheus+: {
spec+:
antiaffinity(
$.antiaffinity(
$.prometheus._config.selectorLabels,
$.values.common.namespace,
$.values.prometheus.podAntiAffinity,
@@ -70,7 +70,7 @@
spec+: {
template+: {
spec+:
antiaffinity(
$.antiaffinity(
$.blackboxExporter._config.selectorLabels,
$.values.common.namespace,
$.values.blackboxExporter.podAntiAffinity,
@@ -86,7 +86,7 @@
spec+: {
template+: {
spec+:
antiaffinity(
$.antiaffinity(
$.prometheusAdapter._config.selectorLabels,
$.values.common.namespace,
$.values.prometheusAdapter.podAntiAffinity,

1
jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet
View File

@@ -22,6 +22,7 @@ local defaults = {
},
configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0',
kubeRbacProxyImage: error 'must provide kubeRbacProxyImage',
port: 9115,
internalPort: 19115,

5
jsonnet/kube-prometheus/components/grafana.libsonnet
View File

@@ -3,8 +3,7 @@ local defaults = {
name: 'grafana',
namespace: error 'must provide namespace',
version: error 'must provide version',
// image: error 'must provide image',
imageRepos: 'grafana/grafana',
image: error 'must provide image',
resources: {
requests: { cpu: '100m', memory: '100Mi' },
limits: { cpu: '200m', memory: '200Mi' },
@@ -44,7 +43,7 @@ function(params) {
grafana: g._config.version,
},
imageRepos+:: {
grafana: g._config.imageRepos,
grafana: std.split(g._config.image, ':')[0],
},
prometheus+:: {
name: g._config.prometheusName,

3
jsonnet/kube-prometheus/main.libsonnet
View File

@@ -31,6 +31,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
prometheusAdapter: error 'must provide version',
prometheusOperator: error 'must provide version',
kubeRbacProxy: error 'must provide version',
configmapReload: error 'must provide version',
} + (import 'versions.json'),
images: {
alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
@@ -43,6 +44,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
prometheusOperator: 'quay.io/prometheus-operator/prometheus-operator:v' + $.values.common.versions.prometheusOperator,
prometheusOperatorReloader: 'quay.io/prometheus-operator/prometheus-config-reloader:v' + $.values.common.versions.prometheusOperator,
kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy,
configmapReload: 'jimmidyson/configmap-reload:v' + $.values.common.versions.configmapReload,
},
},
alertmanager: {
@@ -57,6 +59,7 @@ local platformPatch = import './platforms/platforms.libsonnet';
version: $.values.common.versions.blackboxExporter,
image: $.values.common.images.blackboxExporter,
kubeRbacProxyImage: $.values.common.images.kubeRbacProxy,
configmapReloaderImage: $.values.common.images.configmapReload,
},
grafana: {
namespace: $.values.common.namespace,

1
jsonnet/kube-prometheus/versions.json
View File

@@ -8,4 +8,5 @@
"prometheusAdapter": "0.8.4",
"prometheusOperator": "0.47.0",
"kubeRbacProxy": "0.8.0"
"configmapReload": "0.5.0"
}