From 518c37d72dd3f4233969b426e3abbc205a08560b Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Wed, 18 Aug 2021 14:04:33 +0200 Subject: [PATCH 1/3] .github: test against Kubernetes 1.22 Signed-off-by: Damien Grisonnet --- .github/workflows/ci.yaml | 5 +++-- README.md | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1dae051b..21a47596 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,7 @@ on: - pull_request env: golang-version: '1.15' - kind-version: 'v0.11.0' + kind-version: 'v0.11.1' jobs: generate: runs-on: ${{ matrix.os }} @@ -52,8 +52,9 @@ jobs: strategy: matrix: kind-image: - - 'kindest/node:v1.20.0' + - 'kindest/node:v1.20.7' - 'kindest/node:v1.21.1' + - 'kindest/node:v1.22.0' steps: - uses: actions/checkout@v2 with: diff --git a/README.md b/README.md index 425b2d40..328b9295 100644 --- a/README.md +++ b/README.md @@ -106,13 +106,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`](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) | ✗ | ✗ | ✔ | ✔ | +| kube-prometheus stack | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | +|------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------| +| [`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 From b5ec93208bcb044a1d78311e18b9280f4c25a3e2 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Wed, 18 Aug 2021 17:25:13 +0200 Subject: [PATCH 2/3] jsonnet: drop deprecated etcd metric Signed-off-by: Damien Grisonnet --- .../addons/dropping-deprecated-metrics-relabelings.libsonnet | 2 +- manifests/kubernetes-serviceMonitorApiserver.yaml | 2 +- manifests/kubernetes-serviceMonitorKubeControllerManager.yaml | 2 +- manifests/kubernetes-serviceMonitorKubelet.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet index 39eba122..374b8601 100644 --- a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet +++ b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet @@ -32,7 +32,7 @@ // Drop all etcd metrics which are deprecated in kubernetes. { sourceLabels: ['__name__'], - regex: 'etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)', + regex: 'etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)', action: 'drop', }, // Drop all transformation metrics which are deprecated in kubernetes. diff --git a/manifests/kubernetes-serviceMonitorApiserver.yaml b/manifests/kubernetes-serviceMonitorApiserver.yaml index 58ba773b..cce20bf7 100644 --- a/manifests/kubernetes-serviceMonitorApiserver.yaml +++ b/manifests/kubernetes-serviceMonitorApiserver.yaml @@ -31,7 +31,7 @@ spec: sourceLabels: - __name__ - action: drop - regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary) + regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary) sourceLabels: - __name__ - action: drop diff --git a/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml b/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml index dadc9a26..4aab7701 100644 --- a/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml +++ b/manifests/kubernetes-serviceMonitorKubeControllerManager.yaml @@ -31,7 +31,7 @@ spec: sourceLabels: - __name__ - action: drop - regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary) + regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary) sourceLabels: - __name__ - action: drop diff --git a/manifests/kubernetes-serviceMonitorKubelet.yaml b/manifests/kubernetes-serviceMonitorKubelet.yaml index ea050274..5c6fc6ff 100644 --- a/manifests/kubernetes-serviceMonitorKubelet.yaml +++ b/manifests/kubernetes-serviceMonitorKubelet.yaml @@ -32,7 +32,7 @@ spec: sourceLabels: - __name__ - action: drop - regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary) + regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|object_counts|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary) sourceLabels: - __name__ - action: drop From da359546283a63f13a0946baa9e86ac7cbebbd15 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Wed, 18 Aug 2021 17:53:40 +0200 Subject: [PATCH 3/3] .github: drop support for 1.20 on main According to our policy, main branch of kube-prometheus should support the 2 latest versions of Kubernetes. These changes update the tests and the compatibility matrix to reflect that. Signed-off-by: Damien Grisonnet --- .github/workflows/ci.yaml | 1 - README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 21a47596..e4b5c79e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,7 +52,6 @@ jobs: strategy: matrix: kind-image: - - 'kindest/node:v1.20.7' - 'kindest/node:v1.21.1' - 'kindest/node:v1.22.0' steps: diff --git a/README.md b/README.md index 328b9295..2eb2ccfb 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ The following versions are supported and work as we test against these versions | [`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) | ✗ | ✗ | ✔ | ✔ | ✔ | +| [`HEAD`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | ✔ | ✔ | ## Quickstart