From 0bdba4f07b9cd52888f514b19b9cbdd1506dbd62 Mon Sep 17 00:00:00 2001 From: Ben Luddy Date: Tue, 6 May 2025 14:16:47 -0400 Subject: [PATCH] Stop serving admissionregistration.k8s.io/v1beta1. ValidatingAdmissionPolicy currently depends on admissionregistration.k8s.io/v1 and the feature gate is always on. The v1beta1 version wasn't meant to be served outside of tech preview clusters. --- .../configobservation/apienablement/observe_runtime_config.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/operator/configobservation/apienablement/observe_runtime_config.go b/pkg/operator/configobservation/apienablement/observe_runtime_config.go index 34974026b1..02aa5af0a7 100644 --- 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"}},