diff --git a/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json b/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json index d8730f0376b..5b3232fae3a 100644 --- a/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json +++ b/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json @@ -11,7 +11,7 @@ "name": "validatingadmissionpolicies", "namespaced": false, "singularName": "validatingadmissionpolicy", - "storageVersionHash": "Vd+hadMG3gs=", + "storageVersionHash": "P/h9c6yIbaY=", "verbs": [ "create", "delete", @@ -42,7 +42,7 @@ "name": "validatingadmissionpolicybindings", "namespaced": false, "singularName": "validatingadmissionpolicybinding", - "storageVersionHash": "Yc3M4GKADk4=", + "storageVersionHash": "XYju31JKYek=", "verbs": [ "create", "delete", diff --git a/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json b/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json index 228d2fbea29..05f2215c37a 100644 --- a/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json +++ b/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json @@ -11,7 +11,7 @@ "name": "validatingadmissionpolicies", "namespaced": false, "singularName": "validatingadmissionpolicy", - "storageVersionHash": "Vd+hadMG3gs=", + "storageVersionHash": "P/h9c6yIbaY=", "verbs": [ "create", "delete", @@ -42,7 +42,7 @@ "name": "validatingadmissionpolicybindings", "namespaced": false, "singularName": "validatingadmissionpolicybinding", - "storageVersionHash": "Yc3M4GKADk4=", + "storageVersionHash": "XYju31JKYek=", "verbs": [ "create", "delete", diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index f7700aacffb..f1946415d85 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -69,8 +69,8 @@ func NewStorageFactoryConfig() *StorageFactoryConfig { // // TODO (https://github.com/kubernetes/kubernetes/issues/108451): remove the override in 1.25. // apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"), - admissionregistration.Resource("validatingadmissionpolicies").WithVersion("v1alpha1"), - admissionregistration.Resource("validatingadmissionpolicybindings").WithVersion("v1alpha1"), + admissionregistration.Resource("validatingadmissionpolicies").WithVersion("v1beta1"), + admissionregistration.Resource("validatingadmissionpolicybindings").WithVersion("v1beta1"), networking.Resource("clustercidrs").WithVersion("v1alpha1"), networking.Resource("ipaddresses").WithVersion("v1alpha1"), certificates.Resource("clustertrustbundles").WithVersion("v1alpha1"), diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index 501a5ba961d..0e95c66de34 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -354,12 +354,10 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): { 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"}]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "ValidatingAdmissionPolicy"), }, gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings"): { Stub: `{"metadata":{"name":"pb1b1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "ValidatingAdmissionPolicyBinding"), }, // -- @@ -367,10 +365,12 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): { 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"}]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1", + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicy"), }, gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): { Stub: `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1", + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"), }, // --