Skip to content

OCPBUGS-85181: Remove MutatingAdmissionPolicy from defaultGroupVersionsByFeatureGate #2141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jubittajohn wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −15
Open

OCPBUGS-85181: Remove MutatingAdmissionPolicy from defaultGroupVersionsByFeatureGate #2141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions pkg/operator/configobservation/apienablement/observe_runtime_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,7 @@ import (
"github.com/openshift/library-go/pkg/operator/events"
)

var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
"MutatingAdmissionPolicy": {
// Both v1alpha1 and v1beta1 versions must be served pre-GA because e2e tests exercise both APIs.
// A GA OpenShift release could inadvertently serve these versions if MutatingAdmissionPolicy
// gets added to the default featureSet in openshift/api as part of transitioning from
// (feature off, v1beta1 off) to (feature on, v1 on).
// To prevent that, version ranges below include min and max bounds.
// TODO: Update version ranges when rebasing to k8s v1.36+
// - If v1 resources are available in 1.36: remove all MutatingAdmissionPolicy references
// - If no v1 resources: bump ranges to "<1.37.0" and reassess in next rebase
// See api/discovery/apis__admissionregistration.k8s.io__v1.json in the kubernetes repo to easily determine.
{KubeVersionRange: semver.MustParseRange(">=1.33.0 <1.36.0"), GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}},
{KubeVersionRange: semver.MustParseRange(">=1.34.0 <1.36.0"), GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}},
},
}
var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{}

type groupVersionByOpenshiftVersion struct {
schema.GroupVersion
Expand Down