Skip to content

Commit 99cb3eb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#125101 from alexzielenski/apiserver/vap-storageversion-bump
store validatingadmissionpolicy and bindings at v1
2 parents cfe5a7d + cd41a7d commit 99cb3eb

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

‎api/discovery/apis__admissionregistration.k8s.io__v1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"name": "validatingadmissionpolicies",
3232
"namespaced": false,
3333
"singularName": "validatingadmissionpolicy",
34-
"storageVersionHash": "P/h9c6yIbaY=",
34+
"storageVersionHash": "6OxvlMmQ6is=",
3535
"verbs": [
3636
"create",
3737
"delete",
@@ -62,7 +62,7 @@
6262
"name": "validatingadmissionpolicybindings",
6363
"namespaced": false,
6464
"singularName": "validatingadmissionpolicybinding",
65-
"storageVersionHash": "XYju31JKYek=",
65+
"storageVersionHash": "v9715VZqakg=",
6666
"verbs": [
6767
"create",
6868
"delete",

‎api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"name": "validatingadmissionpolicies",
1212
"namespaced": false,
1313
"singularName": "validatingadmissionpolicy",
14-
"storageVersionHash": "P/h9c6yIbaY=",
14+
"storageVersionHash": "6OxvlMmQ6is=",
1515
"verbs": [
1616
"create",
1717
"delete",
@@ -42,7 +42,7 @@
4242
"name": "validatingadmissionpolicybindings",
4343
"namespaced": false,
4444
"singularName": "validatingadmissionpolicybinding",
45-
"storageVersionHash": "XYju31JKYek=",
45+
"storageVersionHash": "v9715VZqakg=",
4646
"verbs": [
4747
"create",
4848
"delete",

‎api/discovery/apis__admissionregistration.k8s.io__v1beta1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"name": "validatingadmissionpolicies",
1212
"namespaced": false,
1313
"singularName": "validatingadmissionpolicy",
14-
"storageVersionHash": "P/h9c6yIbaY=",
14+
"storageVersionHash": "6OxvlMmQ6is=",
1515
"verbs": [
1616
"create",
1717
"delete",
@@ -42,7 +42,7 @@
4242
"name": "validatingadmissionpolicybindings",
4343
"namespaced": false,
4444
"singularName": "validatingadmissionpolicybinding",
45-
"storageVersionHash": "XYju31JKYek=",
45+
"storageVersionHash": "v9715VZqakg=",
4646
"verbs": [
4747
"create",
4848
"delete",

‎pkg/controlplane/storageversionhashdata/data.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ var GVRToStorageVersionHash = map[string]string{
8181
"apps/v1/statefulsets": "H+vl74LkKdo=",
8282
"admissionregistration.k8s.io/v1/mutatingwebhookconfigurations": "Sqi0GUgDaX0=",
8383
"admissionregistration.k8s.io/v1/validatingwebhookconfigurations": "B0wHjQmsGNk=",
84-
"admissionregistration.k8s.io/v1/validatingadmissionpolicies": "P/h9c6yIbaY=",
85-
"admissionregistration.k8s.io/v1/validatingadmissionpolicybindings": "XYju31JKYek=",
84+
"admissionregistration.k8s.io/v1/validatingadmissionpolicies": "6OxvlMmQ6is=",
85+
"admissionregistration.k8s.io/v1/validatingadmissionpolicybindings": "v9715VZqakg=",
8686
"events.k8s.io/v1/events": "r2yiGXH7wu8=",
8787
"flowcontrol.apiserver.k8s.io/v1beta3/flowschemas": "GJVAJZSZBIw=",
8888
"flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "Kir5PVfvNeI=",

‎pkg/kubeapiserver/default_storage_factory_builder.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
serverstorage "k8s.io/apiserver/pkg/server/storage"
2727
"k8s.io/apiserver/pkg/storage/storagebackend"
2828
"k8s.io/kubernetes/pkg/api/legacyscheme"
29-
"k8s.io/kubernetes/pkg/apis/admissionregistration"
3029
"k8s.io/kubernetes/pkg/apis/apps"
3130
"k8s.io/kubernetes/pkg/apis/certificates"
3231
api "k8s.io/kubernetes/pkg/apis/core"
@@ -71,8 +70,6 @@ func NewStorageFactoryConfig() *StorageFactoryConfig {
7170
//
7271
// TODO (https://github.com/kubernetes/kubernetes/issues/108451): remove the override in 1.25.
7372
// apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"),
74-
admissionregistration.Resource("validatingadmissionpolicies").WithVersion("v1beta1"),
75-
admissionregistration.Resource("validatingadmissionpolicybindings").WithVersion("v1beta1"),
7673
networking.Resource("ipaddresses").WithVersion("v1alpha1"),
7774
networking.Resource("servicecidrs").WithVersion("v1alpha1"),
7875
certificates.Resource("clustertrustbundles").WithVersion("v1alpha1"),

‎test/integration/etcd/data.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,36 +348,36 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
348348
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies"): {
349349
Stub: `{"metadata":{"name":"vap1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
350350
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1",
351-
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicy"),
352351
},
353352
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings"): {
354353
Stub: `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
355354
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1",
356-
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"),
357355
},
358356
// --
359357

360358
// k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1
361359
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): {
362360
Stub: `{"metadata":{"name":"vap1b1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
363361
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1",
362+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"),
364363
},
365364
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings"): {
366365
Stub: `{"metadata":{"name":"pb1b1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
367366
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1",
367+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"),
368368
},
369369
// --
370370

371371
// k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1
372372
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): {
373373
Stub: `{"metadata":{"name":"vap1a1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
374374
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1a1",
375-
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicy"),
375+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"),
376376
},
377377
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): {
378378
Stub: `{"metadata":{"name":"pb1a1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`,
379379
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1a1",
380-
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"),
380+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"),
381381
},
382382
// --
383383

0 commit comments

Comments
 (0)