Skip to content

Commit 59e0e0c

Browse files
qw1mb0qw1mb0
committed
switch mutatingwebhookconfiguration to v1
1 parent d249c1d commit 59e0e0c

6 files changed

+27
-24
lines changed

‎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"
@@ -241,7 +241,7 @@ func (b *Builder) buildLimitRangeStore() cache.Store {
241241
}
242242

243243
func (b *Builder) buildMutatingWebhookConfigurationStore() cache.Store {
244-
return b.buildStoreFunc(mutatingWebhookConfigurationMetricFamilies, &admissionregistration.MutatingWebhookConfiguration{}, createMutatingWebhookConfigurationListWatch)
244+
return b.buildStoreFunc(mutatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.MutatingWebhookConfiguration{}, createMutatingWebhookConfigurationListWatch)
245245
}
246246

247247
func (b *Builder) buildNamespaceStore() cache.Store {
@@ -305,7 +305,7 @@ func (b *Builder) buildCsrStore() cache.Store {
305305
}
306306

307307
func (b *Builder) buildValidatingWebhookConfigurationStore() cache.Store {
308-
return b.buildStoreFunc(validatingWebhookConfigurationMetricFamilies, &admissionregistration.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch)
308+
return b.buildStoreFunc(validatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch)
309309
}
310310

311311
func (b *Builder) buildVolumeAttachmentStore() cache.Store {

‎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"
@@ -37,7 +37,7 @@ var (
3737
Name: "kube_mutatingwebhookconfiguration_info",
3838
Type: metric.Gauge,
3939
Help: "Information about the MutatingWebhookConfiguration.",
40-
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
40+
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
4141
return &metric.Family{
4242
Metrics: []*metric.Metric{
4343
{
@@ -51,7 +51,7 @@ var (
5151
Name: "kube_mutatingwebhookconfiguration_created",
5252
Type: metric.Gauge,
5353
Help: "Unix creation timestamp.",
54-
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
54+
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
5555
ms := []*metric.Metric{}
5656

5757
if !mwc.CreationTimestamp.IsZero() {
@@ -68,7 +68,7 @@ var (
6868
Name: "kube_mutatingwebhookconfiguration_metadata_resource_version",
6969
Type: metric.Gauge,
7070
Help: "Resource version representing a specific version of the MutatingWebhookConfiguration.",
71-
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistration.MutatingWebhookConfiguration) *metric.Family {
71+
GenerateFunc: wrapMutatingWebhookConfigurationFunc(func(mwc *admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family {
7272
return &metric.Family{
7373
Metrics: resourceVersionMetric(mwc.ObjectMeta.ResourceVersion),
7474
}
@@ -80,17 +80,17 @@ var (
8080
func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string) cache.ListerWatcher {
8181
return &cache.ListWatch{
8282
ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
83-
return kubeClient.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().List(opts)
83+
return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().List(opts)
8484
},
8585
WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
86-
return kubeClient.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Watch(opts)
86+
return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Watch(opts)
8787
},
8888
}
8989
}
9090

91-
func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistration.MutatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
91+
func wrapMutatingWebhookConfigurationFunc(f func(*admissionregistrationv1.MutatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
9292
return func(obj interface{}) *metric.Family {
93-
mutatingWebhookConfiguration := obj.(*admissionregistration.MutatingWebhookConfiguration)
93+
mutatingWebhookConfiguration := obj.(*admissionregistrationv1.MutatingWebhookConfiguration)
9494

9595
metricFamily := f(mutatingWebhookConfiguration)
9696

‎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
generator "k8s.io/kube-state-metrics/pkg/metric_generator"
@@ -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"
@@ -37,7 +37,7 @@ var (
3737
Name: "kube_validatingwebhookconfiguration_info",
3838
Type: metric.Gauge,
3939
Help: "Information about the ValidatingWebhookConfiguration.",
40-
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
40+
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
4141
return &metric.Family{
4242
Metrics: []*metric.Metric{
4343
{
@@ -51,7 +51,7 @@ var (
5151
Name: "kube_validatingwebhookconfiguration_created",
5252
Type: metric.Gauge,
5353
Help: "Unix creation timestamp.",
54-
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistration.ValidatingWebhookConfiguration) *metric.Family {
54+
GenerateFunc: wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
5555
ms := []*metric.Metric{}
5656

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

91-
func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistration.ValidatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
91+
func wrapValidatingWebhookConfigurationFunc(f func(*admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family) func(interface{}) *metric.Family {
9292
return func(obj interface{}) *metric.Family {
93-
mutatingWebhookConfiguration := obj.(*admissionregistration.ValidatingWebhookConfiguration)
93+
mutatingWebhookConfiguration := obj.(*admissionregistrationv1.ValidatingWebhookConfiguration)
9494

9595
metricFamily := f(mutatingWebhookConfiguration)
9696

‎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
generator "k8s.io/kube-state-metrics/pkg/metric_generator"
@@ -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)