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

Merge pull request #1337 from dgrisonnet/kubernetes-1.22

Browse Source 
Test against Kubernetes 1.22
This commit is contained in:
Damien Grisonnet
2021-08-18 19:03:21 +02:00
committed by GitHub
parent 35397089d1 da35954628
commit 0df510d1fa
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yaml vendored
View File

@@ -4,7 +4,7 @@ on:
- pull_request - pull_request
env: env:
golang-version: '1.15' golang-version: '1.15'
kind-version: 'v0.11.0' kind-version: 'v0.11.1'
jobs: jobs:
generate: generate:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@@ -52,8 +52,8 @@ jobs:
strategy: strategy:
matrix: matrix:
kind-image: kind-image:
- 'kindest/node:v1.20.0'
- 'kindest/node:v1.21.1' - 'kindest/node:v1.21.1'
- 'kindest/node:v1.22.0'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

14
README.md
View File

@@ -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! 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 | | 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.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.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.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) | ✗ | ✗ | ✔ | ✔ | | [`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 ## Quickstart

2
jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
View File

@@ -32,7 +32,7 @@
// Drop all etcd metrics which are deprecated in kubernetes. // Drop all etcd metrics which are deprecated in kubernetes.
{ {
sourceLabels: ['__name__'], 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', action: 'drop',
}, },
// Drop all transformation metrics which are deprecated in kubernetes. // Drop all transformation metrics which are deprecated in kubernetes.

2
manifests/kubernetes-serviceMonitorApiserver.yaml
View File

@@ -31,7 +31,7 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - 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: sourceLabels:
- __name__ - __name__
- action: drop - action: drop

2
manifests/kubernetes-serviceMonitorKubeControllerManager.yaml
View File

@@ -31,7 +31,7 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - 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: sourceLabels:
- __name__ - __name__
- action: drop - action: drop

2
manifests/kubernetes-serviceMonitorKubelet.yaml
View File

@@ -32,7 +32,7 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - 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: sourceLabels:
- __name__ - __name__
- action: drop - action: drop