Skip to content

Commit 89fbb3f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#127017 from carlory/flowcontrolv1beta3
remove resource flowschemas and prioritylevelconfigurations from legacyBetaEnabledByDefaultResources in v1.32
2 parents 6b2a5b8 + 49b2c96 commit 89fbb3f

File tree

5 files changed

+0
-71
lines changed

5 files changed

+0
-71
lines changed

‎pkg/controlplane/instance.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -452,14 +452,6 @@ var (
452452
flowcontrolv1.SchemeGroupVersion,
453453
}
454454

455-
// legacyBetaEnabledByDefaultResources is the list of beta resources we enable. You may only add to this list
456-
// if your resource is already enabled by default in a beta level we still serve AND there is no stable API for it.
457-
// see https://github.com/kubernetes/enhancements/tree/master/keps/sig-architecture/3136-beta-apis-off-by-default
458-
// for more details.
459-
legacyBetaEnabledByDefaultResources = []schema.GroupVersionResource{
460-
flowcontrolv1beta3.SchemeGroupVersion.WithResource("flowschemas"), // deprecate in 1.29, remove in 1.32
461-
flowcontrolv1beta3.SchemeGroupVersion.WithResource("prioritylevelconfigurations"), // deprecate in 1.29, remove in 1.32
462-
}
463455
// betaAPIGroupVersionsDisabledByDefault is for all future beta groupVersions.
464456
betaAPIGroupVersionsDisabledByDefault = []schema.GroupVersion{
465457
admissionregistrationv1beta1.SchemeGroupVersion,
@@ -496,8 +488,5 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
496488
ret.DisableVersions(betaAPIGroupVersionsDisabledByDefault...)
497489
ret.DisableVersions(alphaAPIGroupVersionsDisabledByDefault...)
498490

499-
// enable the legacy beta resources that were present before stopped serving new beta APIs by default.
500-
ret.EnableResources(legacyBetaEnabledByDefaultResources...)
501-
502491
return ret
503492
}

‎pkg/controlplane/instance_test.go‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ import (
6666
netutils "k8s.io/utils/net"
6767

6868
"k8s.io/kubernetes/pkg/api/legacyscheme"
69-
flowcontrolv1bet3 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta3"
7069
controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver"
7170
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
7271
"k8s.io/kubernetes/pkg/controlplane/storageversionhashdata"
@@ -426,14 +425,6 @@ func TestDefaultVars(t *testing.T) {
426425
}
427426
}
428427

429-
// legacyBetaEnabledByDefaultResources should contain only beta version
430-
for i := range legacyBetaEnabledByDefaultResources {
431-
gv := legacyBetaEnabledByDefaultResources[i]
432-
if !strings.Contains(gv.Version, "beta") {
433-
t.Errorf("legacyBetaEnabledByDefaultResources should contain beta version, but found: %q", gv.String())
434-
}
435-
}
436-
437428
// betaAPIGroupVersionsDisabledByDefault should contain only beta version
438429
for i := range betaAPIGroupVersionsDisabledByDefault {
439430
gv := betaAPIGroupVersionsDisabledByDefault[i]
@@ -466,15 +457,6 @@ func TestNewBetaResourcesEnabledByDefault(t *testing.T) {
466457
storageapiv1beta1.SchemeGroupVersion.WithResource("csinodes"): true,
467458
}
468459

469-
// legacyBetaResourcesWithoutStableEquivalents contains those groupresources that were enabled by default as beta
470-
// before we changed that policy and do not have stable versions. These resources are allowed to have additional
471-
// beta versions enabled by default. Nothing new should be added here. There are no future exceptions because there
472-
// are no more beta resources enabled by default.
473-
legacyBetaResourcesWithoutStableEquivalents := map[schema.GroupResource]bool{
474-
flowcontrolv1bet3.SchemeGroupVersion.WithResource("flowschemas").GroupResource(): true,
475-
flowcontrolv1bet3.SchemeGroupVersion.WithResource("prioritylevelconfigurations").GroupResource(): true,
476-
}
477-
478460
config := DefaultAPIResourceConfigSource()
479461
for gvr, enable := range config.ResourceConfigs {
480462
if !strings.Contains(gvr.Version, "beta") {
@@ -486,9 +468,6 @@ func TestNewBetaResourcesEnabledByDefault(t *testing.T) {
486468
if legacyEnabledBetaResources[gvr] {
487469
continue // this is a legacy beta resource
488470
}
489-
if legacyBetaResourcesWithoutStableEquivalents[gvr.GroupResource()] {
490-
continue // this is another beta of a legacy beta resource with no stable equivalent
491-
}
492471
t.Errorf("no new beta resources can be enabled by default, see https://github.com/kubernetes/enhancements/blob/0ad0fc8269165ca300d05ca51c7ce190a79976a5/keps/sig-architecture/3136-beta-apis-off-by-default/README.md: %v", gvr)
493472
}
494473
}

‎pkg/controlplane/storageversionhashdata/data.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ var GVRToStorageVersionHash = map[string]string{
8484
"admissionregistration.k8s.io/v1/validatingadmissionpolicies": "6OxvlMmQ6is=",
8585
"admissionregistration.k8s.io/v1/validatingadmissionpolicybindings": "v9715VZqakg=",
8686
"events.k8s.io/v1/events": "r2yiGXH7wu8=",
87-
"flowcontrol.apiserver.k8s.io/v1beta3/flowschemas": "GJVAJZSZBIw=",
88-
"flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "Kir5PVfvNeI=",
8987
"flowcontrol.apiserver.k8s.io/v1/flowschemas": "GJVAJZSZBIw=",
9088
"flowcontrol.apiserver.k8s.io/v1/prioritylevelconfigurations": "Kir5PVfvNeI=",
9189
}

‎pkg/registry/flowcontrol/rest/storage_flowcontrol.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ import (
3737
"k8s.io/kubernetes/pkg/api/legacyscheme"
3838
"k8s.io/kubernetes/pkg/apis/flowcontrol"
3939
flowcontrolapisv1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1"
40-
flowcontrolapisv1beta1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1"
41-
flowcontrolapisv1beta2 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2"
4240
flowcontrolapisv1beta3 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta3"
4341
"k8s.io/kubernetes/pkg/registry/flowcontrol/ensurer"
4442
flowschemastore "k8s.io/kubernetes/pkg/registry/flowcontrol/flowschema/storage"
@@ -59,18 +57,6 @@ const PostStartHookName = "priority-and-fairness-config-producer"
5957
func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (genericapiserver.APIGroupInfo, error) {
6058
apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(flowcontrol.GroupName, legacyscheme.Scheme, legacyscheme.ParameterCodec, legacyscheme.Codecs)
6159

62-
if storageMap, err := p.storage(apiResourceConfigSource, restOptionsGetter, flowcontrolapisv1beta1.SchemeGroupVersion); err != nil {
63-
return genericapiserver.APIGroupInfo{}, err
64-
} else if len(storageMap) > 0 {
65-
apiGroupInfo.VersionedResourcesStorageMap[flowcontrolapisv1beta1.SchemeGroupVersion.Version] = storageMap
66-
}
67-
68-
if storageMap, err := p.storage(apiResourceConfigSource, restOptionsGetter, flowcontrolapisv1beta2.SchemeGroupVersion); err != nil {
69-
return genericapiserver.APIGroupInfo{}, err
70-
} else if len(storageMap) > 0 {
71-
apiGroupInfo.VersionedResourcesStorageMap[flowcontrolapisv1beta2.SchemeGroupVersion.Version] = storageMap
72-
}
73-
7460
if storageMap, err := p.storage(apiResourceConfigSource, restOptionsGetter, flowcontrolapisv1beta3.SchemeGroupVersion); err != nil {
7561
return genericapiserver.APIGroupInfo{}, err
7662
} else if len(storageMap) > 0 {

‎test/integration/apiserver/no_new_betas_test.go‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,6 @@ import (
2424
)
2525

2626
func TestNoNewBetaAPIsByDefault(t *testing.T) {
27-
// yes, this *is* a copy/paste from somewhere else. We really do mean it when we say you shouldn't be modifying
28-
// this list and this test was created to make it more painful.
29-
// legacyBetaEnabledByDefaultResources is the list of beta resources we enable. You may not add to this list
30-
legacyBetaEnabledByDefaultResources := map[schema.GroupVersionResource]bool{
31-
gvr("flowcontrol.apiserver.k8s.io", "v1beta2", "flowschemas"): true, // remove in 1.29
32-
gvr("flowcontrol.apiserver.k8s.io", "v1beta2", "prioritylevelconfigurations"): true, // remove in 1.29
33-
}
34-
35-
// legacyBetaResourcesWithoutStableEquivalents contains those groupresources that were enabled by default as beta
36-
// before we changed that policy and do not have stable versions. These resources are allowed to have additional
37-
// beta versions enabled by default. Nothing new should be added here. There are no future exceptions because there
38-
// are no more beta resources enabled by default.
39-
legacyBetaResourcesWithoutStableEquivalents := map[schema.GroupResource]bool{
40-
gvr("flowcontrol.apiserver.k8s.io", "v1beta1", "flowschemas").GroupResource(): true,
41-
gvr("flowcontrol.apiserver.k8s.io", "v1beta1", "prioritylevelconfigurations").GroupResource(): true,
42-
}
43-
4427
// if you found this because you want to create an integration test for your new beta API, the method you're looking for
4528
// is this setupWithResources method and you need to pass the resource you want to enable into it.
4629
_, kubeClient, _, tearDownFn := setupWithResources(t,
@@ -67,12 +50,6 @@ func TestNoNewBetaAPIsByDefault(t *testing.T) {
6750
Version: currResource.Version,
6851
Resource: currResource.Name,
6952
}
70-
if legacyBetaEnabledByDefaultResources[enabledGVR] {
71-
continue
72-
}
73-
if legacyBetaResourcesWithoutStableEquivalents[enabledGVR.GroupResource()] {
74-
continue
75-
}
7653

7754
t.Errorf("%v is a new beta API. New beta APIs may not be enabled by default. "+
7855
"See https://github.com/kubernetes/enhancements/blob/0ad0fc8269165ca300d05ca51c7ce190a79976a5/keps/sig-architecture/3136-beta-apis-off-by-default/README.md "+

0 commit comments

Comments
 (0)