From 57a5db8da3d6dfad4b78eddd2f1976f0223f9cfd Mon Sep 17 00:00:00 2001 From: carlory Date: Fri, 24 Nov 2023 16:59:21 +0800 Subject: [PATCH] remove feature-gate APISelfSubjectReview --- pkg/features/kube_features.go | 10 ---------- .../apiserver/admissionwebhook/admission_test.go | 5 ----- .../integration/apiserver/cel/admission_policy_test.go | 2 -- test/integration/auth/selfsubjectreview_test.go | 7 ------- 4 files changed, 24 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 21990f2919a..77e48341df3 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -58,14 +58,6 @@ const ( // Enables usage of any object for volume data source in PVCs AnyVolumeDataSource featuregate.Feature = "AnyVolumeDataSource" - // owner: @nabokihms - // alpha: v1.26 - // beta: v1.27 - // GA: v1.28 - // - // Enables API to get self subject attributes after authentication. - APISelfSubjectReview featuregate.Feature = "APISelfSubjectReview" - // owner: @tallclair // beta: v1.4 AppArmor featuregate.Feature = "AppArmor" @@ -994,8 +986,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS AnyVolumeDataSource: {Default: true, PreRelease: featuregate.Beta}, // on by default in 1.24 - APISelfSubjectReview: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.28; remove in 1.30 - AppArmor: {Default: true, PreRelease: featuregate.Beta}, CloudDualStackNodeIPs: {Default: true, PreRelease: featuregate.Beta}, diff --git a/test/integration/apiserver/admissionwebhook/admission_test.go b/test/integration/apiserver/admissionwebhook/admission_test.go index de2f013665b..c8ddbab8607 100644 --- a/test/integration/apiserver/admissionwebhook/admission_test.go +++ b/test/integration/apiserver/admissionwebhook/admission_test.go @@ -52,15 +52,12 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/util/retry" - featuregatetesting "k8s.io/component-base/featuregate/testing" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" apisv1beta1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" ) @@ -456,8 +453,6 @@ func TestWebhookAdmissionWithoutWatchCache(t *testing.T) { // testWebhookAdmission tests communication between API server and webhook process. func testWebhookAdmission(t *testing.T, watchCache bool) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APISelfSubjectReview, true)() - // holder communicates expectations to webhooks, and results from webhooks holder := &holder{ t: t, diff --git a/test/integration/apiserver/cel/admission_policy_test.go b/test/integration/apiserver/cel/admission_policy_test.go index 4d90108398d..b29fe6ae1d6 100644 --- a/test/integration/apiserver/cel/admission_policy_test.go +++ b/test/integration/apiserver/cel/admission_policy_test.go @@ -37,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/apis/admissionregistration" admissionregistrationv1alpha1apis "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" admissionregistrationv1beta1apis "k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" @@ -411,7 +410,6 @@ func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, conver // test/integration/apiserver/admissionwebhook/admission_test.go testWebhookAdmission func TestPolicyAdmission(t *testing.T) { defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ValidatingAdmissionPolicy, true)() - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APISelfSubjectReview, true)() holder := &policyExpectationHolder{ holder: holder{ diff --git a/test/integration/auth/selfsubjectreview_test.go b/test/integration/auth/selfsubjectreview_test.go index ce4c16448c8..8b2b7f7932b 100644 --- a/test/integration/auth/selfsubjectreview_test.go +++ b/test/integration/auth/selfsubjectreview_test.go @@ -31,11 +31,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" - utilfeature "k8s.io/apiserver/pkg/util/feature" - featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/utils/ktesting" ) @@ -93,8 +90,6 @@ func TestGetsSelfAttributes(t *testing.T) { ctx, cancel := context.WithCancel(ctx) defer cancel() - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APISelfSubjectReview, true)() - var respMu sync.RWMutex response := &user.DefaultInfo{ Name: "stub", @@ -213,8 +208,6 @@ func TestGetsSelfAttributesError(t *testing.T) { toggle := &atomic.Value{} toggle.Store(true) - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APISelfSubjectReview, true)() - _, ctx := ktesting.NewTestContext(t) ctx, cancel := context.WithCancel(ctx) defer cancel()