diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index a3ba1c8cfaf..7378db0319a 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -81,8 +81,8 @@ func NewStorageFactoryConfigEffectiveVersion(effectiveVersion basecompatibility. // TODO (https://github.com/kubernetes/kubernetes/issues/108451): remove the override in 1.25. // apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"), coordination.Resource("leasecandidates").WithVersion("v1beta1"), - admissionregistration.Resource("mutatingadmissionpolicies").WithVersion("v1alpha1"), - admissionregistration.Resource("mutatingadmissionpolicybindings").WithVersion("v1alpha1"), + admissionregistration.Resource("mutatingadmissionpolicies").WithVersion("v1beta1"), + admissionregistration.Resource("mutatingadmissionpolicybindings").WithVersion("v1beta1"), certificates.Resource("clustertrustbundles").WithVersion("v1beta1"), certificates.Resource("podcertificaterequests").WithVersion("v1alpha1"), storage.Resource("volumeattributesclasses").WithVersion("v1beta1"), diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index e71bdf7b4c8..f6be435bbb4 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -502,14 +502,12 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, isEmulat gvr("admissionregistration.k8s.io", "v1beta1", "mutatingadmissionpolicies"): { Stub: `{"metadata":{"name":"map1b1"},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"reinvocationPolicy": "IfNeeded","mutations":[{"applyConfiguration": {"expression":"Object{metadata: Object.metadata{labels: {'example':'true'}}}"}, "patchType":"ApplyConfiguration"}]}}`, ExpectedEtcdPath: "/registry/mutatingadmissionpolicies/map1b1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "MutatingAdmissionPolicy"), IntroducedVersion: "1.34", RemovedVersion: "1.40", }, gvr("admissionregistration.k8s.io", "v1beta1", "mutatingadmissionpolicybindings"): { Stub: `{"metadata":{"name":"mpb1b1"},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com", "parameterNotFoundAction": "Allow"}}}`, ExpectedEtcdPath: "/registry/mutatingadmissionpolicybindings/mpb1b1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "MutatingAdmissionPolicyBinding"), IntroducedVersion: "1.34", RemovedVersion: "1.40", }, @@ -519,12 +517,14 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, isEmulat gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicies"): { Stub: `{"metadata":{"name":"map1"},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"reinvocationPolicy": "IfNeeded","mutations":[{"applyConfiguration": {"expression":"Object{metadata: Object.metadata{labels: {'example':'true'}}}"}, "patchType":"ApplyConfiguration"}]}}`, ExpectedEtcdPath: "/registry/mutatingadmissionpolicies/map1", + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "MutatingAdmissionPolicy"), IntroducedVersion: "1.32", RemovedVersion: "1.38", }, gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicybindings"): { Stub: `{"metadata":{"name":"mpb1"},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com", "parameterNotFoundAction": "Allow"}}}`, ExpectedEtcdPath: "/registry/mutatingadmissionpolicybindings/mpb1", + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "MutatingAdmissionPolicyBinding"), IntroducedVersion: "1.32", RemovedVersion: "1.38", },