Skip to content

Commit f749759

Browse files
tariq1890tariq1890
committed
switch mutatingwebhookconfiguration to v1
(cherry picked from commit 59e0e0c) # Conflicts: # internal/store/builder.go
1 parent 3776bbf commit f749759

6 files changed

Lines changed: 27 additions & 24 deletions

‎internal/store/builder.go‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 8 additions & 8 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 6 additions & 6 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 4 additions & 1 deletion
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)