Skip to content

Commit 7f09ca7

Browse files
authored
Merge pull request #1747 from kubernetes/release-2.5
Merge Release 2.5 back to master
2 parents 66ce101 + 0567e1e commit 7f09ca7

15 files changed

+39
-23
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## v2.5.0 / 2022-06-03
2+
3+
* [FEATURE] Add experimental Custom-Resource State Metrics #1710 @iamnoah
4+
* [FEATURE] Add kube_pod_ips metric #1740 @bjschafer
5+
* [FEATURE] Add kube_pod_nodeselector metric #1675 @geojaz
6+
* [FEATURE] Add CSIPersistentVolumeSource to persistent volume metric #1727 @luke-sprig
7+
* [FEATURE] Add kube_cronjob_status_last_successful_time metric #1732 @splitice
8+
* [FEATURE] Add kube_persistentvolumeclaim_created metric #1741 @aidan-ogorman-dev
9+
* [ENHANCEMENT] Build with Go 1.18 #1726, #1745 @mrueg
10+
* [ENHANCEMENT] Bump kubernetes 1.24 and other go dependencies #1726, #1743 @mrueg
11+
* [ENHANCEMENT] Update x/crypto to mitigate CVE-2022-27191 #1721 @pgvishnuram
12+
* [BUGFIX] Assert that newlines in comma separated arguments are ignored #1706 @sthaha
13+
* [BUGFIX] Fix potential panic in pod store #1723 @mfojtik
14+
* [BUGFIX] Fix potential panic in internal store #1731 @jan--f
15+
* [BUGFIX] Properly initialize KSM Server test #1699 @fpetkovski
16+
117
## v2.4.2 / 2022-02-10
218
* [BUGFIX] Publish images with with the correct tag
319

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ All additional compatibility is only best effort, or happens to still/already be
6666

6767
At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kubernetes/kubernetes/releases) will be recorded below.
6868

69-
| kube-state-metrics | **Kubernetes 1.19** | **Kubernetes 1.20** | **Kubernetes 1.21** | **Kubernetes 1.22** | **Kubernetes 1.23** |
69+
| kube-state-metrics | **Kubernetes 1.20** | **Kubernetes 1.21** | **Kubernetes 1.22** | **Kubernetes 1.23** | **Kubernetes 1.24** |
7070
|--------------------|:--------------------:|:---------------------:|:-------------------:|:-------------------:|:-------------------:|
71-
| **v2.1.1** |||| -/| -/✓ |
72-
| **v2.2.4** ||||| |
73-
| **v2.3.0** | | ||| |
74-
| **v2.4.2** | -/✓ | -/✓ ||||
71+
| **v2.2.4** |||| | - |
72+
| **v2.3.0** ||||| - |
73+
| **v2.4.2** | -/| -/||| - |
74+
| **v2.5.0** | -/✓ | -/✓ ||||
7575
| **master** | -/✓ | -/✓ ||||
7676

7777
- `` Fully supported version range.
@@ -88,7 +88,7 @@ release.
8888
#### Container Image
8989

9090
The latest container image can be found at:
91-
* `k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.4.2` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
91+
* `k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.5.0` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
9292

9393
### Metrics Documentation
9494

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.2
1+
2.5.0

examples/autosharding/cluster-role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
7-
app.kubernetes.io/version: 2.4.2
7+
app.kubernetes.io/version: 2.5.0
88
name: kube-state-metrics
99
roleRef:
1010
apiGroup: rbac.authorization.k8s.io

examples/autosharding/cluster-role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
7-
app.kubernetes.io/version: 2.4.2
7+
app.kubernetes.io/version: 2.5.0
88
name: kube-state-metrics
99
rules:
1010
- apiGroups:

examples/autosharding/role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
7-
app.kubernetes.io/version: 2.4.2
7+
app.kubernetes.io/version: 2.5.0
88
name: kube-state-metrics
99
namespace: kube-system
1010
roleRef:

examples/autosharding/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
7-
app.kubernetes.io/version: 2.4.2
7+
app.kubernetes.io/version: 2.5.0
88
name: kube-state-metrics
99
namespace: kube-system
1010
rules:

examples/autosharding/service-account.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ metadata:
55
labels:
66
app.kubernetes.io/component: exporter
77
app.kubernetes.io/name: kube-state-metrics
8-
app.kubernetes.io/version: 2.4.2
8+
app.kubernetes.io/version: 2.5.0
99
name: kube-state-metrics
1010
namespace: kube-system

examples/autosharding/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
7-
app.kubernetes.io/version: 2.4.2
7+
app.kubernetes.io/version: 2.5.0
88
name: kube-state-metrics
99
namespace: kube-system
1010
spec:

examples/autosharding/statefulset.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
7-
app.kubernetes.io/version: 2.4.2
7+
app.kubernetes.io/version: 2.5.0
88
name: kube-state-metrics
99
namespace: kube-system
1010
spec:
@@ -18,7 +18,7 @@ spec:
1818
labels:
1919
app.kubernetes.io/component: exporter
2020
app.kubernetes.io/name: kube-state-metrics
21-
app.kubernetes.io/version: 2.4.2
21+
app.kubernetes.io/version: 2.5.0
2222
spec:
2323
automountServiceAccountToken: true
2424
containers:
@@ -34,7 +34,7 @@ spec:
3434
valueFrom:
3535
fieldRef:
3636
fieldPath: metadata.namespace
37-
image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.4.2
37+
image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.5.0
3838
livenessProbe:
3939
httpGet:
4040
path: /healthz

0 commit comments

Comments
 (0)