Skip to content

Commit

Permalink
docs: fix rebase conflicts around linting
Browse files Browse the repository at this point in the history
  • Loading branch information
rexagod committed Sep 20, 2023
1 parent 98ade63 commit 995f83e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
## v2.10.1 / 2023-09-13

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

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

* [BUGFIX] Remove FieldSelector from non-namespaced resources by @mrueg and @dgrisonnet in <https://github.com/kubernetes/kube-state-metrics/pull/2190>
* [ENHANCEMENT] Bump Go to v1.20.8

## v2.10.0 / 2023-08-31

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ Generally, it is recommended to use the latest release of kube-state-metrics. If
| **v2.10.1** | v1.27 |
| **main** | v1.28 |


#### Resource group version compatibility

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

The latest container image can be found at:

* `registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.1` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
* View all multi-architecture images at [here](https://explore.ggcr.dev/?image=registry.k8s.io%2Fkube-state-metrics%2Fkube-state-metrics:v2.10.1)

Expand Down

0 comments on commit 995f83e

Please sign in to comment.