From 57724766bcf76b3f3b4ba28958cd2363c65b88e2 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 22 Jan 2020 17:07:05 -0500 Subject: [PATCH] Remove deprecated GA feature gates --- hack/.golint_failures | 1 - pkg/features/BUILD | 1 - pkg/features/kube_features.go | 9 --- .../pkg/features/kube_features.go | 60 ++----------------- 4 files changed, 6 insertions(+), 65 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 7ca3f17f9a0..4e67ada4930 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -270,7 +270,6 @@ staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status -staging/src/k8s.io/apiextensions-apiserver/pkg/features staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer diff --git a/pkg/features/BUILD b/pkg/features/BUILD index 37a6372a870..1f1b927d767 100644 --- a/pkg/features/BUILD +++ b/pkg/features/BUILD @@ -10,7 +10,6 @@ go_library( srcs = ["kube_features.go"], importpath = "k8s.io/kubernetes/pkg/features", deps = [ - "//staging/src/k8s.io/apiextensions-apiserver/pkg/features:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/apiserver/pkg/features:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 0747234c63a..623c2f39f13 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -17,7 +17,6 @@ limitations under the License. package features import ( - apiextensionsfeatures "k8s.io/apiextensions-apiserver/pkg/features" "k8s.io/apimachinery/pkg/util/runtime" genericfeatures "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -627,14 +626,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.ServerSideApply: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha}, - // inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed - // unintentionally on either side: - apiextensionsfeatures.CustomResourceValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - apiextensionsfeatures.CustomResourceSubresources: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - apiextensionsfeatures.CustomResourceWebhookConversion: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - apiextensionsfeatures.CustomResourcePublishOpenAPI: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - apiextensionsfeatures.CustomResourceDefaulting: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // TODO: remove in 1.18 - // features that enable backwards compatibility but are scheduled to be removed // ... HPAScaleToZero: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go index dd5a3a48a03..a5932281367 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go @@ -22,53 +22,11 @@ import ( ) const ( - // Every feature gate should add method here following this template: - // - // // owner: @username - // // alpha: v1.4 - // MyFeature() bool - - // owner: @sttts, @nikhita - // alpha: v1.8 - // beta: v1.9 - // GA: v1.16 - // - // CustomResourceValidation is a list of validation methods for CustomResources - CustomResourceValidation featuregate.Feature = "CustomResourceValidation" - - // owner: @roycaihw, @sttts - // alpha: v1.14 - // beta: v1.15 - // GA: v1.16 - // - // CustomResourcePublishOpenAPI enables publishing of CRD OpenAPI specs. - CustomResourcePublishOpenAPI featuregate.Feature = "CustomResourcePublishOpenAPI" - - // owner: @sttts, @nikhita - // alpha: v1.10 - // beta: v1.11 - // GA: v1.16 - // - // CustomResourceSubresources defines the subresources for CustomResources - CustomResourceSubresources featuregate.Feature = "CustomResourceSubresources" - - // owner: @mbohlool, @roycaihw - // alpha: v1.13 - // beta: v1.15 - // GA: v1.16 - // - // CustomResourceWebhookConversion defines the webhook conversion for Custom Resources. - CustomResourceWebhookConversion featuregate.Feature = "CustomResourceWebhookConversion" - - // owner: @sttts - // alpha: v1.15 - // beta: v1.16 - // GA: v1.17 - // - // CustomResourceDefaulting enables OpenAPI defaulting in CustomResources. - // - // TODO: remove in 1.18 - CustomResourceDefaulting featuregate.Feature = "CustomResourceDefaulting" +// Every feature gate should add method here following this template: +// +// // owner: @username +// // alpha: v1.4 +// MyFeature() bool ) func init() { @@ -78,10 +36,4 @@ func init() { // defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys. // To add a new feature, define a key for it above and add it here. The features will be // available throughout Kubernetes binaries. -var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - CustomResourceValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - CustomResourceSubresources: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - CustomResourceWebhookConversion: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - CustomResourcePublishOpenAPI: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - CustomResourceDefaulting: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, -} +var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{}