Skip to content

Commit 995f83e

Browse files
committed
docs: fix rebase conflicts around linting
1 parent 98ade63 commit 995f83e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
## v2.10.1 / 2023-09-13
22

33
### Note
4-
- This release addresses a regression introduced in https://github.com/kubernetes/kube-state-metrics/pull/2105.
54

6-
* [BUGFIX] Remove FieldSelector from non-namespaced resources by @mrueg and @dgrisonnet in https://github.com/kubernetes/kube-state-metrics/pull/2190
7-
* [ENHANCEMENT] Bump Go to v1.20.8
5+
* This release addresses a regression introduced in <https://github.com/kubernetes/kube-state-metrics/pull/2105>.
6+
7+
* [BUGFIX] Remove FieldSelector from non-namespaced resources by @mrueg and @dgrisonnet in <https://github.com/kubernetes/kube-state-metrics/pull/2190>
8+
* [ENHANCEMENT] Bump Go to v1.20.8
89

910
## v2.10.0 / 2023-08-31
1011

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ Generally, it is recommended to use the latest release of kube-state-metrics. If
8080
| **v2.10.1** | v1.27 |
8181
| **main** | v1.28 |
8282

83-
8483
#### Resource group version compatibility
8584

8685
Resources in Kubernetes can evolve, i.e., the group version for a resource may change from alpha to beta and finally GA
@@ -90,6 +89,7 @@ release.
9089
#### Container Image
9190

9291
The latest container image can be found at:
92+
9393
* `registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.1` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
9494
* View all multi-architecture images at [here](https://explore.ggcr.dev/?image=registry.k8s.io%2Fkube-state-metrics%2Fkube-state-metrics:v2.10.1)
9595

0 commit comments

Comments
 (0)