From d99497ef6d5581b787e7aebfca943697ed8fe164 Mon Sep 17 00:00:00 2001 From: Abu Kashem Date: Mon, 16 Aug 2021 17:12:42 -0400 Subject: [PATCH] apf: update e2e test to use v1beta2 --- .../k8s.io/apiserver/pkg/util/apihelpers/helpers.go | 2 +- test/e2e/apimachinery/flowcontrol.go | 12 ++++++------ .../apiserver/flowcontrol/concurrency_test.go | 8 ++++---- test/integration/apiserver/flowcontrol/fight_test.go | 6 +++--- test/integration/framework/controlplane_utils.go | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/apihelpers/helpers.go b/staging/src/k8s.io/apiserver/pkg/util/apihelpers/helpers.go index 905523c734f..8d200292340 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/apihelpers/helpers.go +++ b/staging/src/k8s.io/apiserver/pkg/util/apihelpers/helpers.go @@ -19,7 +19,7 @@ package apihelpers import ( "sort" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" ) // SetFlowSchemaCondition sets conditions. diff --git a/test/e2e/apimachinery/flowcontrol.go b/test/e2e/apimachinery/flowcontrol.go index 256fcc7402a..8c4120e2089 100644 --- a/test/e2e/apimachinery/flowcontrol.go +++ b/test/e2e/apimachinery/flowcontrol.go @@ -31,7 +31,7 @@ import ( "github.com/prometheus/common/expfmt" "github.com/prometheus/common/model" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/util/apihelpers" @@ -255,7 +255,7 @@ var _ = SIGDescribe("API priority and fairness", func() { // createPriorityLevel creates a priority level with the provided assured // concurrency share. func createPriorityLevel(f *framework.Framework, priorityLevelName string, assuredConcurrencyShares int32) (*flowcontrol.PriorityLevelConfiguration, func()) { - createdPriorityLevel, err := f.ClientSet.FlowcontrolV1beta1().PriorityLevelConfigurations().Create( + createdPriorityLevel, err := f.ClientSet.FlowcontrolV1beta2().PriorityLevelConfigurations().Create( context.TODO(), &flowcontrol.PriorityLevelConfiguration{ ObjectMeta: metav1.ObjectMeta{ @@ -274,7 +274,7 @@ func createPriorityLevel(f *framework.Framework, priorityLevelName string, assur metav1.CreateOptions{}) framework.ExpectNoError(err) return createdPriorityLevel, func() { - framework.ExpectNoError(f.ClientSet.FlowcontrolV1beta1().PriorityLevelConfigurations().Delete(context.TODO(), priorityLevelName, metav1.DeleteOptions{})) + framework.ExpectNoError(f.ClientSet.FlowcontrolV1beta2().PriorityLevelConfigurations().Delete(context.TODO(), priorityLevelName, metav1.DeleteOptions{})) } } @@ -322,7 +322,7 @@ func createFlowSchema(f *framework.Framework, flowSchemaName string, matchingPre }) } - createdFlowSchema, err := f.ClientSet.FlowcontrolV1beta1().FlowSchemas().Create( + createdFlowSchema, err := f.ClientSet.FlowcontrolV1beta2().FlowSchemas().Create( context.TODO(), &flowcontrol.FlowSchema{ ObjectMeta: metav1.ObjectMeta{ @@ -352,7 +352,7 @@ func createFlowSchema(f *framework.Framework, flowSchemaName string, matchingPre metav1.CreateOptions{}) framework.ExpectNoError(err) return createdFlowSchema, func() { - framework.ExpectNoError(f.ClientSet.FlowcontrolV1beta1().FlowSchemas().Delete(context.TODO(), flowSchemaName, metav1.DeleteOptions{})) + framework.ExpectNoError(f.ClientSet.FlowcontrolV1beta2().FlowSchemas().Delete(context.TODO(), flowSchemaName, metav1.DeleteOptions{})) } } @@ -362,7 +362,7 @@ func createFlowSchema(f *framework.Framework, flowSchemaName string, matchingPre // schema status, and (2) metrics. The function times out after 30 seconds. func waitForSteadyState(f *framework.Framework, flowSchemaName string, priorityLevelName string) { framework.ExpectNoError(wait.Poll(time.Second, 30*time.Second, func() (bool, error) { - fs, err := f.ClientSet.FlowcontrolV1beta1().FlowSchemas().Get(context.TODO(), flowSchemaName, metav1.GetOptions{}) + fs, err := f.ClientSet.FlowcontrolV1beta2().FlowSchemas().Get(context.TODO(), flowSchemaName, metav1.GetOptions{}) if err != nil { return false, err } diff --git a/test/integration/apiserver/flowcontrol/concurrency_test.go b/test/integration/apiserver/flowcontrol/concurrency_test.go index 7de81571476..7c5a11be9d4 100644 --- a/test/integration/apiserver/flowcontrol/concurrency_test.go +++ b/test/integration/apiserver/flowcontrol/concurrency_test.go @@ -28,7 +28,7 @@ import ( "github.com/prometheus/common/expfmt" "github.com/prometheus/common/model" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" @@ -235,7 +235,7 @@ func getRequestCountOfPriorityLevel(c clientset.Interface) (map[string]int, map[ } func createPriorityLevelAndBindingFlowSchemaForUser(c clientset.Interface, username string, concurrencyShares, queuelength int) (*flowcontrol.PriorityLevelConfiguration, *flowcontrol.FlowSchema, error) { - pl, err := c.FlowcontrolV1beta1().PriorityLevelConfigurations().Create(context.Background(), &flowcontrol.PriorityLevelConfiguration{ + pl, err := c.FlowcontrolV1beta2().PriorityLevelConfigurations().Create(context.Background(), &flowcontrol.PriorityLevelConfiguration{ ObjectMeta: metav1.ObjectMeta{ Name: username, }, @@ -257,7 +257,7 @@ func createPriorityLevelAndBindingFlowSchemaForUser(c clientset.Interface, usern if err != nil { return nil, nil, err } - fs, err := c.FlowcontrolV1beta1().FlowSchemas().Create(context.TODO(), &flowcontrol.FlowSchema{ + fs, err := c.FlowcontrolV1beta2().FlowSchemas().Create(context.TODO(), &flowcontrol.FlowSchema{ ObjectMeta: metav1.ObjectMeta{ Name: username, }, @@ -297,7 +297,7 @@ func createPriorityLevelAndBindingFlowSchemaForUser(c clientset.Interface, usern } return pl, fs, wait.Poll(time.Second, timeout, func() (bool, error) { - fs, err := c.FlowcontrolV1beta1().FlowSchemas().Get(context.TODO(), username, metav1.GetOptions{}) + fs, err := c.FlowcontrolV1beta2().FlowSchemas().Get(context.TODO(), username, metav1.GetOptions{}) if err != nil { return false, err } diff --git a/test/integration/apiserver/flowcontrol/fight_test.go b/test/integration/apiserver/flowcontrol/fight_test.go index 51a5f6a5131..af1b95ed8ff 100644 --- a/test/integration/apiserver/flowcontrol/fight_test.go +++ b/test/integration/apiserver/flowcontrol/fight_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apimachinery/pkg/util/clock" genericfeatures "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -95,7 +95,7 @@ func (ft *fightTest) createMainInformer() { myConfig = rest.AddUserAgent(myConfig, "audience") myClientset := clientset.NewForConfigOrDie(myConfig) informerFactory := informers.NewSharedInformerFactory(myClientset, 0) - inf := informerFactory.Flowcontrol().V1beta1().FlowSchemas().Informer() + inf := informerFactory.Flowcontrol().V1beta2().FlowSchemas().Informer() inf.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { fs := obj.(*flowcontrol.FlowSchema) @@ -123,7 +123,7 @@ func (ft *fightTest) createController(invert bool, i int) { myConfig := rest.CopyConfig(ft.loopbackConfig) myConfig = rest.AddUserAgent(myConfig, fieldMgr) myClientset := clientset.NewForConfigOrDie(myConfig) - fcIfc := myClientset.FlowcontrolV1beta1() + fcIfc := myClientset.FlowcontrolV1beta2() informerFactory := informers.NewSharedInformerFactory(myClientset, 0) foundToDangling := func(found bool) bool { return !found } if invert { diff --git a/test/integration/framework/controlplane_utils.go b/test/integration/framework/controlplane_utils.go index 53f09f309d4..aefc29efae7 100644 --- a/test/integration/framework/controlplane_utils.go +++ b/test/integration/framework/controlplane_utils.go @@ -199,7 +199,7 @@ func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIPriorityAndFairness) { controlPlaneConfig.GenericConfig.FlowControl = utilflowcontrol.New( controlPlaneConfig.ExtraConfig.VersionedInformers, - clientset.FlowcontrolV1beta1(), + clientset.FlowcontrolV1beta2(), controlPlaneConfig.GenericConfig.MaxRequestsInFlight+controlPlaneConfig.GenericConfig.MaxMutatingRequestsInFlight, controlPlaneConfig.GenericConfig.RequestTimeout/4, )