diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eab93dcb9e11dad9ea11af2a180e6c0aef079496..33a824acf6e7c60833d2c6bffc8dade4675e0fbd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -83,8 +83,9 @@ jobs:
strategy:
matrix:
kind-image:
- - 'kindest/node:v1.30.0'
+ - 'kindest/node:v1.31.0'
- 'kindest/node:v1.30.4'
+ - 'kindest/node:v1.29.8'
steps:
- uses: actions/checkout@v4
with:
diff --git a/Makefile b/Makefile
index 5f247182b00769adade49fa758743c370833cd18..4dbcf2df53a2e874ac27bcdceecac3f8a5247aa3 100644
--- a/Makefile
+++ b/Makefile
@@ -54,13 +54,16 @@ update: $(JB_BIN)
$(JB_BIN) update
.PHONY: validate
-validate: validate-1.27 validate-1.28
+validate: validate-1.29 validate-1.30 validate-1.31
-validate-1.27:
- KUBE_VERSION=1.27.5 $(MAKE) kubeconform
+validate-1.29:
+ KUBE_VERSION=1.29.8 $(MAKE) kubeconform
-validate-1.28:
- KUBE_VERSION=1.28.1 $(MAKE) kubeconform
+validate-1.30:
+ KUBE_VERSION=1.30.4 $(MAKE) kubeconform
+
+validate-1.31:
+ KUBE_VERSION=1.31.0 $(MAKE) kubeconform
.PHONY: kubeconform
kubeconform: crdschemas manifests $(KUBECONFORM_BIN)
diff --git a/README.md b/README.md
index e2a7f7ee442cb07d0e286889745a1bf519988048..7ca4a9d8d7dadbc780927c55b2ff712abb923531 100644
--- a/README.md
+++ b/README.md
@@ -41,18 +41,16 @@ no effect, but is still deployed.
The following Kubernetes 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.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 |
-|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
-| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✔ | ✔ | ✗ | ✗ | x | x | x |
-| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗ | ✔ | ✔ | ✗ | x | x | x |
-| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗ | ✗ | ✔ | ✔ | x | x | x |
-| [`release-0.13`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.13) | ✗ | ✗ | ✗ | x | ✔ | ✔ | ✔ |
-| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | x | x | ✔ | ✔ |
+| kube-prometheus stack | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | Kubernetes 1.29 | Kubernetes 1.30 | Kubernetes 1.31 |
+|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
+| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✔ | ✔ | ✗ | x | x | x | x | x | x |
+| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗ | ✔ | ✔ | x | x | x | x | x | x |
+| [`release-0.13`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.13) | ✗ | ✗ | x | ✔ | ✔ | ✔ | x | x | x |
+| [`release-0.14`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.14) | ✗ | ✗ | x | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
+| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | x | x | ✔ | ✔ | ✔ | ✔ | ✔ |
## Quickstart
-> Note: For versions before Kubernetes v1.21.z refer to the [Kubernetes compatibility matrix](#compatibility) in order to choose a compatible branch.
-
This project is intended to be used as a library (i.e. the intent is not for you to create your own modified copy of this repository).
Though for a quickstart a compiled version of the Kubernetes [manifests](manifests) generated with this library (specifically with `example.jsonnet`) is checked into this repository in order to try the content out quickly. To try out the stack un-customized run:
diff --git a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
index ee937d198fc26bc265d2ceed167eee746fd59e33..e778c845163f2e0e78826d5a2837bd156917ec32 100644
--- a/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
+++ b/jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
@@ -14,7 +14,7 @@
// Drop all apiserver metrics which are deprecated in kubernetes.
{
sourceLabels: ['__name__'],
- regex: 'apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit)',
+ regex: 'apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit|flowcontrol_request_concurrency_in_use)',
action: 'drop',
},
// Drop all docker metrics which are deprecated in kubernetes.
diff --git a/jsonnet/kube-prometheus/addons/pyrra.libsonnet b/jsonnet/kube-prometheus/addons/pyrra.libsonnet
index 18621853bbdab1399af5199d94dbd4b96a04422c..c265d50906e3db82ec07c46951021b81d4985546 100644
--- a/jsonnet/kube-prometheus/addons/pyrra.libsonnet
+++ b/jsonnet/kube-prometheus/addons/pyrra.libsonnet
@@ -37,7 +37,7 @@
_config:: defaults + params,
crd: (
- import 'github.com/pyrra-dev/pyrra/config/crd/bases/pyrra.dev_servicelevelobjectives.json'
+ import 'github.com/pyrra-dev/pyrra/jsonnet/controller-gen/pyrra.dev_servicelevelobjectives.json'
),
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 786accc3772401ed8046595e18070d1cad3d75ff..0ee53bb0f665542d66234dda3b9b1be8311d16d0 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -108,10 +108,10 @@
"source": {
"git": {
"remote": "https://github.com/pyrra-dev/pyrra.git",
- "subdir": "config/crd/bases"
+ "subdir": "jsonnet/controller-gen"
}
},
- "version": "release-0.6",
+ "version": "release-0.7",
"name": "pyrra"
},
{
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 8987ecbe13c7bc383bea731464012d642e5b8248..4b41dd4a02d38ada99a7012a849cc88c21c1b4c5 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -208,11 +208,11 @@
"source": {
"git": {
"remote": "https://github.com/pyrra-dev/pyrra.git",
- "subdir": "config/crd/bases"
+ "subdir": "jsonnet/controller-gen"
}
},
- "version": "551856d42dff02ec38c5b0ea6a2d99c4cb127e82",
- "sum": "bY/Pcrrbynguq8/HaI88cQ3B2hLv/xc+76QILY7IL+g=",
+ "version": "d723f4d1a066dd657e9d09c46a158519dda0faa8",
+ "sum": "cxAPQovFkM16zNB5/94O+sk/n3SETk6ao6Oas2Sa6RE=",
"name": "pyrra"
},
{
diff --git a/manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml b/manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml
index e72ba2bb6ef7c82970e0e6cdb0fac1fa34c03478..509467af3cd1b0da09ea751fc2ad8dfbd285d949 100644
--- a/manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml
+++ b/manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml
@@ -20,7 +20,7 @@ spec:
sourceLabels:
- __name__
- action: drop
- regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit)
+ regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit|flowcontrol_request_concurrency_in_use)
sourceLabels:
- __name__
- action: drop
diff --git a/manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml b/manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml
index 621af80b82b85b359947c958b279c035298347af..1b6ef9b64810970b668a2de13a9b30ce8baa9c85 100644
--- a/manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml
+++ b/manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml
@@ -20,7 +20,7 @@ spec:
sourceLabels:
- __name__
- action: drop
- regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit)
+ regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit|flowcontrol_request_concurrency_in_use)
sourceLabels:
- __name__
- action: drop
diff --git a/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml b/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
index ebcbfee0fa66c99c0e72afa8c0dd1ad73ab5e9d0..4519632680d83e7cd5e23adbf6ec6b89389ac816 100644
--- a/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
+++ b/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
@@ -21,7 +21,7 @@ spec:
sourceLabels:
- __name__
- action: drop
- regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit)
+ regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers|storage_db_total_size_in_bytes|flowcontrol_request_concurrency_limit|flowcontrol_request_concurrency_in_use)
sourceLabels:
- __name__
- action: drop