From fa05e2cde8e4a41175812908c8ceca5f802be835 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Tue, 27 Apr 2021 15:30:06 +0200 Subject: [PATCH 1/7] jsonnet: export anti-affinity addon Export the antiaffinity function of the anti-affinity addon to make it possible to extend the addon to component that are not present in the kube-prometheus stack. Signed-off-by: Damien Grisonnet --- jsonnet/kube-prometheus/addons/anti-affinity.libsonnet | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet index 2053e950..f71c4589 100644 --- a/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet +++ b/jsonnet/kube-prometheus/addons/anti-affinity.libsonnet @@ -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, From be2964887f96d37bbb052fb6e5151f5cb988cb58 Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Fri, 30 Apr 2021 12:46:48 +0200 Subject: [PATCH 2/7] can change configmapReload over $.values.common.images --- .../kube-prometheus/components/blackbox-exporter.libsonnet | 2 +- jsonnet/kube-prometheus/main.libsonnet | 3 +++ jsonnet/kube-prometheus/versions.json | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet index e574c9f2..71af4056 100644 --- a/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet +++ b/jsonnet/kube-prometheus/components/blackbox-exporter.libsonnet @@ -20,7 +20,7 @@ local defaults = { for labelName in std.objectFields(defaults.commonLabels) if !std.setMember(labelName, ['app.kubernetes.io/version']) }, - configmapReloaderImage: 'jimmidyson/configmap-reload:v0.5.0', + configmapReloaderImage: error 'must provide version', port: 9115, internalPort: 19115, diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index 1c13b7b9..d35ce215 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -30,6 +30,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; prometheus: error 'must provide version', prometheusAdapter: error 'must provide version', prometheusOperator: error 'must provide version', + configmapReload: error 'must provide version' } + (import 'versions.json'), images: { alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager, @@ -41,6 +42,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; prometheusAdapter: 'directxman12/k8s-prometheus-adapter:v' + $.values.common.versions.prometheusAdapter, 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, + configmapReload: 'jimmidyson/configmap-reload:v' + $.values.common.versions.configmapReload, }, }, alertmanager: { @@ -54,6 +56,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; namespace: $.values.common.namespace, version: $.values.common.versions.blackboxExporter, image: $.values.common.images.blackboxExporter, + configmapReloaderImage: $.values.common.images.configmapReload, }, grafana: { namespace: $.values.common.namespace, diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 72f91628..892e6053 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -6,5 +6,6 @@ "nodeExporter": "1.1.2", "prometheus": "2.26.0", "prometheusAdapter": "0.8.4", - "prometheusOperator": "0.47.0" -} + "prometheusOperator": "0.47.0", + "configmapReload": "0.5.0" +} \ No newline at end of file From 7e5d4196b960ce8c6cfc1c7527cc9af2d8cdd6f9 Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Fri, 30 Apr 2021 14:05:23 +0200 Subject: [PATCH 3/7] can change grafanaImage over $.values.common.images --- jsonnet/kube-prometheus/components/grafana.libsonnet | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index 5d2eeb5b..1fd668f3 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -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, From 80408c60570f937b32781d39f04875d223147aee Mon Sep 17 00:00:00 2001 From: Junaid Ali Date: Sat, 1 May 2021 16:28:42 +0100 Subject: [PATCH 4/7] Adding release branch URLs to compatibility matrix --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bad0188c..bb765343 100644 --- a/README.md +++ b/README.md @@ -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.5) | ✗ | ✔ | ✔ | ✗ | +| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.5) | ✗ | ✗ | ✔ | ✔ | +| [`HEAD`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✔ | ✔ | ## Quickstart From 78b88e1b17b30c7a4cb530461668ce4c290c5e50 Mon Sep 17 00:00:00 2001 From: Junaid Ali Date: Sat, 1 May 2021 16:30:03 +0100 Subject: [PATCH 5/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb765343..1dd99522 100644 --- a/README.md +++ b/README.md @@ -109,8 +109,8 @@ The following versions are supported and work as we test against these versions |--------------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------| | [`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.5) | ✗ | ✔ | ✔ | ✗ | -| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.5) | ✗ | ✗ | ✔ | ✔ | +| [`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 From 14e61430375de8f3227900c5ade308112fb3a672 Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Mon, 3 May 2021 06:35:59 +0200 Subject: [PATCH 6/7] replace double quotes with single quotes --- jsonnet/kube-prometheus/components/grafana.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/grafana.libsonnet b/jsonnet/kube-prometheus/components/grafana.libsonnet index 1fd668f3..f45d75f8 100644 --- a/jsonnet/kube-prometheus/components/grafana.libsonnet +++ b/jsonnet/kube-prometheus/components/grafana.libsonnet @@ -43,7 +43,7 @@ function(params) { grafana: g._config.version, }, imageRepos+:: { - grafana: std.split(g._config.image, ":")[0], + grafana: std.split(g._config.image, ':')[0], }, prometheus+:: { name: g._config.prometheusName, From 8c221441d136ccb17f0fcb6143272980fc7cb23d Mon Sep 17 00:00:00 2001 From: "Nagel, Felix" Date: Mon, 3 May 2021 07:02:28 +0200 Subject: [PATCH 7/7] fix formatting issues --- jsonnet/kube-prometheus/main.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index d35ce215..48b1f4e9 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -30,7 +30,7 @@ local platformPatch = import './platforms/platforms.libsonnet'; prometheus: error 'must provide version', prometheusAdapter: error 'must provide version', prometheusOperator: error 'must provide version', - configmapReload: error 'must provide version' + configmapReload: error 'must provide version', } + (import 'versions.json'), images: { alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,