From 49032c394c11cd81c420725fc44b8a979293f2be Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Mon, 13 Mar 2023 15:06:04 +0800 Subject: [PATCH] The storage.k8s.io/v1beta1 API version of CSIStorageCapacity will no longer be served in v1.27. --- pkg/controlplane/instance.go | 1 - pkg/controlplane/instance_test.go | 2 -- pkg/controlplane/storageversionhashdata/data.go | 1 - 3 files changed, 4 deletions(-) diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index a209bf74ea4..b2e6751ecc1 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -706,7 +706,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{ - storageapiv1beta1.SchemeGroupVersion.WithResource("csistoragecapacities"), // remove in 1.27 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/instance_test.go b/pkg/controlplane/instance_test.go index a6b2853577f..3f8c3438f47 100644 --- a/pkg/controlplane/instance_test.go +++ b/pkg/controlplane/instance_test.go @@ -430,7 +430,6 @@ func TestNewBetaResourcesEnabledByDefault(t *testing.T) { policyapiv1beta1.SchemeGroupVersion.WithResource("poddisruptionbudgets"): true, policyapiv1beta1.SchemeGroupVersion.WithResource("podsecuritypolicies"): true, storageapiv1beta1.SchemeGroupVersion.WithResource("csinodes"): true, - storageapiv1beta1.SchemeGroupVersion.WithResource("csistoragecapacities"): true, } // legacyBetaResourcesWithoutStableEquivalents contains those groupresources that were enabled by default as beta @@ -438,7 +437,6 @@ 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{ - storageapiv1beta1.SchemeGroupVersion.WithResource("csistoragecapacities").GroupResource(): true, flowcontrolv1beta2.SchemeGroupVersion.WithResource("flowschemas").GroupResource(): true, flowcontrolv1beta2.SchemeGroupVersion.WithResource("prioritylevelconfigurations").GroupResource(): true, } diff --git a/pkg/controlplane/storageversionhashdata/data.go b/pkg/controlplane/storageversionhashdata/data.go index a0c2c08a84f..c25371c07ba 100644 --- a/pkg/controlplane/storageversionhashdata/data.go +++ b/pkg/controlplane/storageversionhashdata/data.go @@ -73,7 +73,6 @@ var GVRToStorageVersionHash = map[string]string{ "storage.k8s.io/v1/storageclasses": "K+m6uJwbjGY=", "storage.k8s.io/v1/csistoragecapacities": "xeVl+2Ly1kE=", "storage.k8s.io/v1/volumeattachments": "tJx/ezt6UDU=", - "storage.k8s.io/v1beta1/csistoragecapacities": "xeVl+2Ly1kE=", "apps/v1/controllerrevisions": "85nkx63pcBU=", "apps/v1/daemonsets": "dd7pWHUlMKQ=", "apps/v1/deployments": "8aSe+NMegvE=",