diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index 8936ceea41e..6c662e22827 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -678,10 +678,7 @@ var ( // see https://github.com/kubernetes/enhancements/tree/master/keps/sig-architecture/3136-beta-apis-off-by-default // for more details. legacyBetaEnabledByDefaultResources = []schema.GroupVersionResource{ - autoscalingapiv2beta2.SchemeGroupVersion.WithResource("horizontalpodautoscalers"), // remove in 1.26 storageapiv1beta1.SchemeGroupVersion.WithResource("csistoragecapacities"), // remove in 1.27 - flowcontrolv1beta1.SchemeGroupVersion.WithResource("flowschemas"), // remove in 1.26 - flowcontrolv1beta1.SchemeGroupVersion.WithResource("prioritylevelconfigurations"), // remove in 1.26 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 diff --git a/pkg/controlplane/storageversionhashdata/data.go b/pkg/controlplane/storageversionhashdata/data.go index b32b81cb467..e26b44d57dd 100644 --- a/pkg/controlplane/storageversionhashdata/data.go +++ b/pkg/controlplane/storageversionhashdata/data.go @@ -51,9 +51,8 @@ var GVRToStorageVersionHash = map[string]string{ "v1/secrets": "S6u1pOWzb84=", "v1/serviceaccounts": "pbx9ZvyFpBE=", "v1/services": "0/CO1lhkEBI=", - "autoscaling/v1/horizontalpodautoscalers": "oQlkt7f5j/A=", - "autoscaling/v2/horizontalpodautoscalers": "oQlkt7f5j/A=", - "autoscaling/v2beta2/horizontalpodautoscalers": "oQlkt7f5j/A=", + "autoscaling/v1/horizontalpodautoscalers": "oQlkt7f5j/A=", + "autoscaling/v2/horizontalpodautoscalers": "oQlkt7f5j/A=", "batch/v1/jobs": "mudhfqk/qZY=", "batch/v1/cronjobs": "sd5LIXh4Fjs=", "certificates.k8s.io/v1/certificatesigningrequests": "95fRKMXA+00=", @@ -87,6 +86,4 @@ var GVRToStorageVersionHash = map[string]string{ "flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "wltM4WMeeXs=", "flowcontrol.apiserver.k8s.io/v1beta2/flowschemas": "G+8IkrqFuJw=", "flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations": "wltM4WMeeXs=", - "flowcontrol.apiserver.k8s.io/v1beta1/flowschemas": "G+8IkrqFuJw=", - "flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations": "wltM4WMeeXs=", }