Merge pull request #1836 from benluddy/stop-serving-admissionregistration-v1beta1

openshift-merge-bot[bot] · web-flow · commit 5cc2e2676952 · 2025-06-17T20:48:14.000Z
OCPBUGS-55465: Stop serving admissionregistration.k8s.io/v1beta1.
diff --git a/pkg/operator/configobservation/apienablement/observe_runtime_config.go b/pkg/operator/configobservation/apienablement/observe_runtime_config.go
@@ -16,8 +16,7 @@ import (
 )
 
 var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
-	"ValidatingAdmissionPolicy": {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}}},
-	"MutatingAdmissionPolicy":   {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}}},
+	"MutatingAdmissionPolicy": {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}}},
 	"DynamicResourceAllocation": {
 		{KubeVersionRange: semver.MustParseRange("< 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha2"}},
 		{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha3"}},

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{`
`19`		`- "ValidatingAdmissionPolicy": {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}}},`
`20`		`- "MutatingAdmissionPolicy": {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}}},`
	`19`	`+ "MutatingAdmissionPolicy": {{GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}}},`
`21`	`20`	`"DynamicResourceAllocation": {`
`22`	`21`	`{KubeVersionRange: semver.MustParseRange("< 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha2"}},`
`23`	`22`	`{KubeVersionRange: semver.MustParseRange(">= 1.31.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha3"}},`