Skip to content

Commit 0237578

Browse files
authored
Merge pull request #2811 from slashpai/cut-0.17
2 parents d6d094d + 113cd0d commit 0237578

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
matrix:
1212
branch:
1313
# testing will be done against last two release branches and main branch
14-
- "release-0.15"
1514
- "release-0.16"
15+
- "release-0.17"
1616
- "main"
1717
steps:
1818
- uses: actions/checkout@v6

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* [CHANGE] Alertmanager: select AlertmanagerConfig CRs within its own namespace by default. [#2747](https://github.com/prometheus-operator/kube-prometheus/pull/2747)
66
* [BUGFIX] Fix InfoInhibitor alert failing with duplicate series error when multiple info-level alerts fire in the same namespace. [#2786](https://github.com/prometheus-operator/kube-prometheus/pull/2786)
77
* [BUGFIX] Add EndpointSlices RBAC to all-namespaces addon. [#2760](https://github.com/prometheus-operator/kube-prometheus/pull/2760)
8-
* [BUGFIX] Drop deprecated `apiserver_storage_objects` metric (replaced by `apiserver_resource_objects` since Kubernetes 1.34).
8+
* [BUGFIX] Drop deprecated `apiserver_storage_objects` metric (replaced by `apiserver_resource_objects` since Kubernetes 1.34). [#2809](https://github.com/prometheus-operator/kube-prometheus/pull/2809)
99

1010
## release-0.16 / 2025-08-28
1111

jsonnet/kube-prometheus/jsonnetfile.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "grafana"
99
}
1010
},
11-
"version": "5698c8940b6dadca3f42107b7839557bc041761f"
11+
"version": "master"
1212
},
1313
{
1414
"source": {
@@ -17,7 +17,7 @@
1717
"subdir": "grafana-mixin"
1818
}
1919
},
20-
"version": "v12.4.1",
20+
"version": "main",
2121
"name": "grafana-mixin"
2222
},
2323
{
@@ -27,7 +27,7 @@
2727
"subdir": "contrib/mixin"
2828
}
2929
},
30-
"version": "v3.6.8"
30+
"version": "main"
3131
},
3232
{
3333
"source": {
@@ -36,7 +36,7 @@
3636
"subdir": "jsonnet/prometheus-operator"
3737
}
3838
},
39-
"version": "v0.90.0"
39+
"version": "main"
4040
},
4141
{
4242
"source": {
@@ -45,7 +45,7 @@
4545
"subdir": "jsonnet/mixin"
4646
}
4747
},
48-
"version": "v0.90.0",
48+
"version": "main",
4949
"name": "prometheus-operator-mixin"
5050
},
5151
{
@@ -55,7 +55,7 @@
5555
"subdir": ""
5656
}
5757
},
58-
"version": "d2c92d3f64efc8e12afa9d3e1cc5aae01eb5d7e6"
58+
"version": "master"
5959
},
6060
{
6161
"source": {
@@ -64,7 +64,7 @@
6464
"subdir": "jsonnet/kube-state-metrics"
6565
}
6666
},
67-
"version": "v2.18.0"
67+
"version": "main"
6868
},
6969
{
7070
"source": {
@@ -73,7 +73,7 @@
7373
"subdir": "jsonnet/kube-state-metrics-mixin"
7474
}
7575
},
76-
"version": "v2.18.0"
76+
"version": "main"
7777
},
7878
{
7979
"source": {
@@ -82,7 +82,7 @@
8282
"subdir": "docs/node-mixin"
8383
}
8484
},
85-
"version": "4c337ddcd43feb86b21789ab0a61d82ae03e3c33"
85+
"version": "master"
8686
},
8787
{
8888
"source": {
@@ -91,7 +91,7 @@
9191
"subdir": "documentation/prometheus-mixin"
9292
}
9393
},
94-
"version": "v3.10.0",
94+
"version": "main",
9595
"name": "prometheus"
9696
},
9797
{
@@ -101,7 +101,7 @@
101101
"subdir": "doc/alertmanager-mixin"
102102
}
103103
},
104-
"version": "v0.31.1",
104+
"version": "main",
105105
"name": "alertmanager"
106106
},
107107
{
@@ -111,7 +111,7 @@
111111
"subdir": "jsonnet/controller-gen"
112112
}
113113
},
114-
"version": "7c7cf366f4cc74f705e9677e6de99cd070d2a5c2",
114+
"version": "main",
115115
"name": "pyrra"
116116
},
117117
{
@@ -121,7 +121,7 @@
121121
"subdir": "mixin"
122122
}
123123
},
124-
"version": "v0.41.0",
124+
"version": "main",
125125
"name": "thanos-mixin"
126126
}
127127
],

0 commit comments

Comments
 (0)