Skip to content

Commit 1942ea5

Browse files
committed
MutatingAdmissionPolicy v1alpha1 started being served in OCP 4.20
MutatingAdmissionPolicy e2es depend on both v1alpha1 and v1beta1 of admissionregistration.k8s.io being served in k8 1.34.
1 parent 6333489 commit 1942ea5

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

pkg/operator/configobservation/apienablement/observe_runtime_config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVersionByOpenshiftVersion{
1919
"MutatingAdmissionPolicy": {
20-
{KubeVersionRange: semver.MustParseRange("< 1.34.0"), GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}},
20+
{KubeVersionRange: semver.MustParseRange(">= 1.33.0"), GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}},
2121
{KubeVersionRange: semver.MustParseRange(">= 1.34.0"), GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1beta1"}},
2222
},
2323
"DynamicResourceAllocation": {
@@ -62,7 +62,6 @@ var (
6262
// either will only be set if both can be successfully set. Otherwise, the existing config is
6363
// returned pruned but otherwise unmodified.
6464
func NewFeatureGateObserverWithRuntimeConfig(featureWhitelist sets.Set[configv1.FeatureGateName], featureBlacklist sets.Set[configv1.FeatureGateName], featureGateAccessor featuregates.FeatureGateAccess, groupVersionsByFeatureGate map[configv1.FeatureGateName][]schema.GroupVersion) configobserver.ObserveConfigFunc {
65-
6665
featureGateObserver := featuregates.NewObserveFeatureFlagsFunc(
6766
featureWhitelist,
6867
featureBlacklist,

0 commit comments

Comments
 (0)