Skip to content

Commit b3fa585

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1150 from kubernetes/pick-mwc-fix
*: cut release-1.9.7
2 parents 3776bbf + f8e013c commit b3fa585

21 files changed

+51
-44
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v1.9.7 / 2020-05-24
2+
3+
* [BUGFIX] internal/store/mutatingwebhookconfiguration.go: Switch to v1 #1144
4+
15
## v1.9.6 / 2020-05-06
26

37
* [BUGFIX] Fix VolumeAttachment API version mismatch: expected v1 but watching v1beta1 #1136

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub
6666
| **v1.6.0** | ✓ | ✓ | - | - | - |
6767
| **v1.7.2** | ✓ | ✓ | ✓ | - | - |
6868
| **v1.8.0** | ✓ | ✓ | ✓ | ✓ | - |
69-
| **v1.9.6** | ✓ | ✓ | ✓ | ✓ | ✓ |
69+
| **v1.9.7** | ✓ | ✓ | ✓ | ✓ | ✓ |
7070
| **master** | ✓ | ✓ | ✓ | ✓ | ✓ |
7171
- `✓` Fully supported version range.
7272
- `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, etc).
@@ -79,8 +79,8 @@ release.
7979
#### Container Image
8080

8181
The latest container image can be found at:
82-
* `quay.io/coreos/kube-state-metrics:v1.9.6`
83-
* `k8s.gcr.io/kube-state-metrics:v1.9.6`
82+
* `quay.io/coreos/kube-state-metrics:v1.9.7`
83+
* `k8s.gcr.io/kube-state-metrics:v1.9.7`
8484

8585
**Note**:
8686
The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.6
1+
1.9.7

‎examples/autosharding/cluster-role-binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
roleRef:
99
apiGroup: rbac.authorization.k8s.io

‎examples/autosharding/cluster-role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRole
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
rules:
99
- apiGroups:

‎examples/autosharding/role-binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: RoleBinding
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
roleRef:
99
apiGroup: rbac.authorization.k8s.io

‎examples/autosharding/role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Role
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system
99
rules:

‎examples/autosharding/service-account.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: ServiceAccount
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system

‎examples/autosharding/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Service
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system
99
spec:

‎examples/autosharding/statefulset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: StatefulSet
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system
99
spec:
@@ -16,7 +16,7 @@ spec:
1616
metadata:
1717
labels:
1818
app.kubernetes.io/name: kube-state-metrics
19-
app.kubernetes.io/version: v1.9.6
19+
app.kubernetes.io/version: v1.9.7
2020
spec:
2121
containers:
2222
- args:
@@ -33,7 +33,7 @@ spec:
3333
valueFrom:
3434
fieldRef:
3535
fieldPath: metadata.namespace
36-
image: quay.io/coreos/kube-state-metrics:v1.9.6
36+
image: quay.io/coreos/kube-state-metrics:v1.9.7
3737
livenessProbe:
3838
httpGet:
3939
path: /healthz

‎examples/standard/cluster-role-binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
roleRef:
99
apiGroup: rbac.authorization.k8s.io

‎examples/standard/cluster-role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterRole
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
rules:
99
- apiGroups:

‎examples/standard/deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Deployment
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system
99
spec:
@@ -15,10 +15,10 @@ spec:
1515
metadata:
1616
labels:
1717
app.kubernetes.io/name: kube-state-metrics
18-
app.kubernetes.io/version: v1.9.6
18+
app.kubernetes.io/version: v1.9.7
1919
spec:
2020
containers:
21-
- image: quay.io/coreos/kube-state-metrics:v1.9.6
21+
- image: quay.io/coreos/kube-state-metrics:v1.9.7
2222
livenessProbe:
2323
httpGet:
2424
path: /healthz

‎examples/standard/service-account.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: ServiceAccount
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system

‎examples/standard/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Service
33
metadata:
44
labels:
55
app.kubernetes.io/name: kube-state-metrics
6-
app.kubernetes.io/version: v1.9.6
6+
app.kubernetes.io/version: v1.9.7
77
name: kube-state-metrics
88
namespace: kube-system
99
spec:

‎internal/store/builder.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/pkg/errors"
2626
"github.com/prometheus/client_golang/prometheus"
27-
admissionregistration "k8s.io/api/admissionregistration/v1"
27+
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2828
appsv1 "k8s.io/api/apps/v1"
2929
autoscaling "k8s.io/api/autoscaling/v2beta1"
3030
batchv1 "k8s.io/api/batch/v1"
@@ -229,7 +229,7 @@ func (b *Builder) buildLimitRangeStore() *metricsstore.MetricsStore {
229229
}
230230

231231
func (b *Builder) buildMutatingWebhookConfigurationStore() *metricsstore.MetricsStore {
232-
return b.buildStore(mutatingWebhookConfigurationMetricFamilies, &admissionregistration.MutatingWebhookConfiguration{}, createMutatingWebhookConfigurationListWatch)
232+
return b.buildStore(mutatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.MutatingWebhookConfiguration{}, createMutatingWebhookConfigurationListWatch)
233233
}
234234

235235
func (b *Builder) buildNamespaceStore() *metricsstore.MetricsStore {
@@ -293,7 +293,7 @@ func (b *Builder) buildCsrStore() *metricsstore.MetricsStore {
293293
}
294294

295295
func (b *Builder) buildValidatingWebhookConfigurationStore() *metricsstore.MetricsStore {
296-
return b.buildStore(validatingWebhookConfigurationMetricFamilies, &admissionregistration.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch)
296+
return b.buildStore(validatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch)
297297
}
298298

299299
func (b *Builder) buildVolumeAttachmentStore() *metricsstore.MetricsStore {

‎internal/store/mutatingwebhookconfiguration.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package store
1818

1919
import (
20-
admissionregistration "k8s.io/api/admissionregistration/v1beta1"
20+
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/apimachinery/pkg/runtime"
2323
"k8s.io/apimachinery/pkg/watch"
@@ -36,7 +36,7 @@ var (
3636
Name: "kube_mutatingwebhookconfiguration_info",
3737
Type: metric.Gauge,
3838
Help: "Information about the MutatingWebhookConfiguration.",
39-
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
39+
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
4040
return &metric.Family{
4141
Metrics: []*metric.Metric{
4242
{
@@ -50,7 +50,7 @@ var (
5050
Name: "kube_mutatingwebhookconfiguration_created",
5151
Type: metric.Gauge,
5252
Help: "Unix creation timestamp.",
53-
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
53+
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
5454
ms := []*metric.Metric{}
5555

5656
if !mwc.CreationTimestamp.IsZero() {
@@ -67,7 +67,7 @@ var (
6767
Name: "kube_mutatingwebhookconfiguration_metadata_resource_version",
6868
Type: metric.Gauge,
6969
Help: "Resource version representing a specific version of the MutatingWebhookConfiguration.",
70-
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
70+
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
7171
return &metric.Family{
7272
Metrics: resourceVersionMetric(mwc.ObjectMeta.ResourceVersion),
7373
}
@@ -79,17 +79,17 @@ var (
7979
func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string) cache.ListerWatcher {
8080
return &cache.ListWatch{
8181
ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
82-
return kubeClient.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().List(opts)
82+
return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().List(opts)
8383
},
8484
WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
85-
return kubeClient.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Watch(opts)
85+
return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Watch(opts)
8686
},
8787
}
8888
}
8989

90-
func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistration.MutatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
90+
func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
9191
return func(obj interface{}) *metric.Family {
92-
mutatingWebhookConfiguration := obj.(*admissionregistration.MutatingWebhookConfiguration)
92+
mutatingWebhookConfiguration := obj.(*admissionregistrationv1.MutatingWebhookConfiguration)
9393

9494
metricFamily := f(mutatingWebhookConfiguration)
9595

‎internal/store/mutatingwebhookconfiguration_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package store
1919
import (
2020
"testing"
2121

22-
admissionregistration "k8s.io/api/admissionregistration/v1beta1"
22+
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424

2525
"k8s.io/kube-state-metrics/pkg/metric"
@@ -31,7 +31,7 @@ func TestMutatingWebhookConfigurationStore(t *testing.T) {
3131

3232
cases := []generateMetricsTestCase{
3333
{
34-
Obj: &admissionregistration.MutatingWebhookConfiguration{
34+
Obj: &admissionregistrationv1.MutatingWebhookConfiguration{
3535
ObjectMeta: metav1.ObjectMeta{
3636
Name: "mutatingwebhookconfiguration1",
3737
Namespace: "ns1",
@@ -49,7 +49,7 @@ func TestMutatingWebhookConfigurationStore(t *testing.T) {
4949
MetricNames: []string{"kube_mutatingwebhookconfiguration_info", "kube_mutatingwebhookconfiguration_metadata_resource_version"},
5050
},
5151
{
52-
Obj: &admissionregistration.MutatingWebhookConfiguration{
52+
Obj: &admissionregistrationv1.MutatingWebhookConfiguration{
5353
ObjectMeta: metav1.ObjectMeta{
5454
Name: "mutatingwebhookconfiguration2",
5555
Namespace: "ns2",

‎internal/store/validatingwebhookconfiguration.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package store
1818

1919
import (
20-
admissionregistration "k8s.io/api/admissionregistration/v1"
20+
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/apimachinery/pkg/runtime"
2323
"k8s.io/apimachinery/pkg/watch"
@@ -36,7 +36,7 @@ var (
3636
Name: "kube_validatingwebhookconfiguration_info",
3737
Type: metric.Gauge,
3838
Help: "Information about the ValidatingWebhookConfiguration.",
39-
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
39+
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
4040
return &metric.Family{
4141
Metrics: []*metric.Metric{
4242
{
@@ -50,7 +50,7 @@ var (
5050
Name: "kube_validatingwebhookconfiguration_created",
5151
Type: metric.Gauge,
5252
Help: "Unix creation timestamp.",
53-
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
53+
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
5454
ms := []*metric.Metric{}
5555

5656
if !vwc.CreationTimestamp.IsZero() {
@@ -67,7 +67,7 @@ var (
6767
Name: "kube_validatingwebhookconfiguration_metadata_resource_version",
6868
Type: metric.Gauge,
6969
Help: "Resource version representing a specific version of the ValidatingWebhookConfiguration.",
70-
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
70+
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
7171
return &metric.Family{
7272
Metrics: resourceVersionMetric(vwc.ObjectMeta.ResourceVersion),
7373
}
@@ -87,9 +87,9 @@ func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interfac
8787
}
8888
}
8989

90-
func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistration.ValidatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
90+
func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
9191
return func(obj interface{}) *metric.Family {
92-
mutatingWebhookConfiguration := obj.(*admissionregistration.ValidatingWebhookConfiguration)
92+
mutatingWebhookConfiguration := obj.(*admissionregistrationv1.ValidatingWebhookConfiguration)
9393

9494
metricFamily := f(mutatingWebhookConfiguration)
9595

‎internal/store/validatingwebhookconfiguration_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package store
1919
import (
2020
"testing"
2121

22-
admissionregistration "k8s.io/api/admissionregistration/v1"
22+
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424

2525
"k8s.io/kube-state-metrics/pkg/metric"
@@ -31,7 +31,7 @@ func TestValidatingWebhookConfigurationStore(t *testing.T) {
3131

3232
cases := []generateMetricsTestCase{
3333
{
34-
Obj: &admissionregistration.ValidatingWebhookConfiguration{
34+
Obj: &admissionregistrationv1.ValidatingWebhookConfiguration{
3535
ObjectMeta: metav1.ObjectMeta{
3636
Name: "validatingwebhookconfiguration1",
3737
Namespace: "ns1",
@@ -49,7 +49,7 @@ func TestValidatingWebhookConfigurationStore(t *testing.T) {
4949
MetricNames: []string{"kube_validatingwebhookconfiguration_info", "kube_validatingwebhookconfiguration_metadata_resource_version"},
5050
},
5151
{
52-
Obj: &admissionregistration.ValidatingWebhookConfiguration{
52+
Obj: &admissionregistrationv1.ValidatingWebhookConfiguration{
5353
ObjectMeta: metav1.ObjectMeta{
5454
Name: "validatingwebhookconfiguration2",
5555
Namespace: "ns2",

‎tests/manifests/mutatingwebhookconfiguration.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: admissionregistration.k8s.io/v1beta1
1+
apiVersion: admissionregistration.k8s.io/v1
22
kind: MutatingWebhookConfiguration
33
metadata:
44
name: example-mutatingwebhookconfiguration
@@ -11,6 +11,9 @@ webhooks:
1111
namespace: apples
1212
path: /apple
1313
caBundle: "YXBwbGVz"
14+
admissionReviewVersions: ["v1", "v1beta1"]
15+
sideEffects: None
16+
timeoutSeconds: 5
1417
namespaceSelector:
1518
matchExpressions:
1619
- key: production

0 commit comments

Comments
 (0)