Merge pull request prometheus-operator#1337 from dgrisonnet/kubernetes-1.22

Test against Kubernetes 1.22

Author: dgrisonnet

.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,8 @@ jobs:
     strategy:
       matrix:
         kind-image:
-          - 'kindest/node:v1.20.0'
           - 'kindest/node:v1.21.1'
+          - 'kindest/node:v1.22.0'
     steps:
     - uses: actions/checkout@v2
       with:

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
 

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.

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

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

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