From 7c33b78418cea7d1567d97fdc7077dbdd08f6e6f Mon Sep 17 00:00:00 2001 From: bzsuni Date: Wed, 9 Aug 2023 18:53:07 +0800 Subject: [PATCH] remove resource flowschemas and prioritylevelconfigurations for legacyBetaEnabledByDefaultResources in v1.29 Signed-off-by: bzsuni --- pkg/controlplane/instance.go | 2 -- pkg/controlplane/instance_test.go | 6 +++--- pkg/controlplane/storageversionhashdata/data.go | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index c6567c8dae8..723d61dd152 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -755,8 +755,6 @@ var ( // see https://github.com/kubernetes/enhancements/tree/master/keps/sig-architecture/3136-beta-apis-off-by-default // for more details. legacyBetaEnabledByDefaultResources = []schema.GroupVersionResource{ - flowcontrolv1beta2.SchemeGroupVersion.WithResource("flowschemas"), // remove in 1.29 - flowcontrolv1beta2.SchemeGroupVersion.WithResource("prioritylevelconfigurations"), // remove in 1.29 flowcontrolv1beta3.SchemeGroupVersion.WithResource("flowschemas"), // deprecate in 1.29, remove in 1.32 flowcontrolv1beta3.SchemeGroupVersion.WithResource("prioritylevelconfigurations"), // deprecate in 1.29, remove in 1.32 } diff --git a/pkg/controlplane/instance_test.go b/pkg/controlplane/instance_test.go index 5a0fc3b6e62..c921cf73c80 100644 --- a/pkg/controlplane/instance_test.go +++ b/pkg/controlplane/instance_test.go @@ -58,7 +58,7 @@ import ( kubeversion "k8s.io/component-base/version" aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme" "k8s.io/kubernetes/pkg/api/legacyscheme" - flowcontrolv1beta2 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2" + flowcontrolv1bet3 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta3" "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/pkg/controlplane/storageversionhashdata" generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" @@ -453,8 +453,8 @@ func TestNewBetaResourcesEnabledByDefault(t *testing.T) { // beta versions enabled by default. Nothing new should be added here. There are no future exceptions because there // are no more beta resources enabled by default. legacyBetaResourcesWithoutStableEquivalents := map[schema.GroupResource]bool{ - flowcontrolv1beta2.SchemeGroupVersion.WithResource("flowschemas").GroupResource(): true, - flowcontrolv1beta2.SchemeGroupVersion.WithResource("prioritylevelconfigurations").GroupResource(): true, + flowcontrolv1bet3.SchemeGroupVersion.WithResource("flowschemas").GroupResource(): true, + flowcontrolv1bet3.SchemeGroupVersion.WithResource("prioritylevelconfigurations").GroupResource(): true, } config := DefaultAPIResourceConfigSource() diff --git a/pkg/controlplane/storageversionhashdata/data.go b/pkg/controlplane/storageversionhashdata/data.go index 127a11a70f6..8c5e9df39f2 100644 --- a/pkg/controlplane/storageversionhashdata/data.go +++ b/pkg/controlplane/storageversionhashdata/data.go @@ -84,6 +84,4 @@ var GVRToStorageVersionHash = map[string]string{ "events.k8s.io/v1/events": "r2yiGXH7wu8=", "flowcontrol.apiserver.k8s.io/v1beta3/flowschemas": "9NnFrw7ZEmA=", "flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "+CwSrEWTDhc=", - "flowcontrol.apiserver.k8s.io/v1beta2/flowschemas": "9NnFrw7ZEmA=", - "flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations": "+CwSrEWTDhc=", }