diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index b33a6a2150f..fe2eb96cd13 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -507,7 +507,7 @@ func BuildPriorityAndFairness(s *options.ServerRunOptions, extclient clientgocli } return utilflowcontrol.New( versionedInformer, - extclient.FlowcontrolV1beta1(), + extclient.FlowcontrolV1beta2(), s.GenericServerRunOptions.MaxRequestsInFlight+s.GenericServerRunOptions.MaxMutatingRequestsInFlight, s.GenericServerRunOptions.RequestTimeout/4, ), nil diff --git a/pkg/apis/flowcontrol/internalbootstrap/default-internal.go b/pkg/apis/flowcontrol/internalbootstrap/default-internal.go index 6bca4812172..4452ec3a10e 100644 --- a/pkg/apis/flowcontrol/internalbootstrap/default-internal.go +++ b/pkg/apis/flowcontrol/internalbootstrap/default-internal.go @@ -17,7 +17,7 @@ limitations under the License. package internalbootstrap import ( - flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap" "k8s.io/kubernetes/pkg/apis/flowcontrol" @@ -46,7 +46,7 @@ func NewAPFScheme() *runtime.Scheme { return scheme } -func internalizeFSes(exts []*flowcontrolv1beta1.FlowSchema) map[string]*flowcontrol.FlowSchema { +func internalizeFSes(exts []*flowcontrolv1beta2.FlowSchema) map[string]*flowcontrol.FlowSchema { ans := make(map[string]*flowcontrol.FlowSchema, len(exts)) scheme := NewAPFScheme() for _, ext := range exts { @@ -59,7 +59,7 @@ func internalizeFSes(exts []*flowcontrolv1beta1.FlowSchema) map[string]*flowcont return ans } -func internalizePLs(exts []*flowcontrolv1beta1.PriorityLevelConfiguration) map[string]*flowcontrol.PriorityLevelConfiguration { +func internalizePLs(exts []*flowcontrolv1beta2.PriorityLevelConfiguration) map[string]*flowcontrol.PriorityLevelConfiguration { ans := make(map[string]*flowcontrol.PriorityLevelConfiguration, len(exts)) scheme := NewAPFScheme() for _, ext := range exts { diff --git a/pkg/apis/flowcontrol/internalbootstrap/defaults_test.go b/pkg/apis/flowcontrol/internalbootstrap/defaults_test.go index c28a8253eb3..a7fa9323c05 100644 --- a/pkg/apis/flowcontrol/internalbootstrap/defaults_test.go +++ b/pkg/apis/flowcontrol/internalbootstrap/defaults_test.go @@ -19,7 +19,7 @@ package internalbootstrap import ( "testing" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap" ) diff --git a/pkg/registry/flowcontrol/ensurer/flowschema.go b/pkg/registry/flowcontrol/ensurer/flowschema.go index 366bcd5acd8..3e9515e248f 100644 --- a/pkg/registry/flowcontrol/ensurer/flowschema.go +++ b/pkg/registry/flowcontrol/ensurer/flowschema.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" - flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" - flowcontrolapisv1beta1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" + flowcontrolapisv1beta2 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2" ) var ( @@ -36,7 +36,7 @@ var ( // FlowSchemaEnsurer ensures the specified bootstrap configuration objects type FlowSchemaEnsurer interface { - Ensure([]*flowcontrolv1beta1.FlowSchema) error + Ensure([]*flowcontrolv1beta2.FlowSchema) error } // FlowSchemaRemover removes the specified bootstrap configuration objects @@ -82,7 +82,7 @@ func NewFlowSchemaRemover(client flowcontrolclient.FlowSchemaInterface) FlowSche // names that are candidates for deletion from the cluster. // bootstrap: a set of hard coded FlowSchema configuration objects // kube-apiserver maintains in-memory. -func GetFlowSchemaRemoveCandidate(client flowcontrolclient.FlowSchemaInterface, bootstrap []*flowcontrolv1beta1.FlowSchema) ([]string, error) { +func GetFlowSchemaRemoveCandidate(client flowcontrolclient.FlowSchemaInterface, bootstrap []*flowcontrolv1beta2.FlowSchema) ([]string, error) { // TODO(101667): Use a lister here to avoid periodic LIST calls fsList, err := client.List(context.TODO(), metav1.ListOptions{}) if err != nil { @@ -107,7 +107,7 @@ type fsEnsurer struct { wrapper configurationWrapper } -func (e *fsEnsurer) Ensure(flowSchemas []*flowcontrolv1beta1.FlowSchema) error { +func (e *fsEnsurer) Ensure(flowSchemas []*flowcontrolv1beta2.FlowSchema) error { for _, flowSchema := range flowSchemas { if err := ensureConfiguration(e.wrapper, e.strategy, flowSchema); err != nil { return err @@ -138,7 +138,7 @@ func (fs *flowSchemaWrapper) TypeName() string { } func (fs *flowSchemaWrapper) Create(object runtime.Object) (runtime.Object, error) { - fsObject, ok := object.(*flowcontrolv1beta1.FlowSchema) + fsObject, ok := object.(*flowcontrolv1beta2.FlowSchema) if !ok { return nil, errObjectNotFlowSchema } @@ -147,7 +147,7 @@ func (fs *flowSchemaWrapper) Create(object runtime.Object) (runtime.Object, erro } func (fs *flowSchemaWrapper) Update(object runtime.Object) (runtime.Object, error) { - fsObject, ok := object.(*flowcontrolv1beta1.FlowSchema) + fsObject, ok := object.(*flowcontrolv1beta2.FlowSchema) if !ok { return nil, errObjectNotFlowSchema } @@ -164,11 +164,11 @@ func (fs *flowSchemaWrapper) Delete(name string) error { } func (fs *flowSchemaWrapper) CopySpec(bootstrap, current runtime.Object) error { - bootstrapFS, ok := bootstrap.(*flowcontrolv1beta1.FlowSchema) + bootstrapFS, ok := bootstrap.(*flowcontrolv1beta2.FlowSchema) if !ok { return errObjectNotFlowSchema } - currentFS, ok := current.(*flowcontrolv1beta1.FlowSchema) + currentFS, ok := current.(*flowcontrolv1beta2.FlowSchema) if !ok { return errObjectNotFlowSchema } @@ -179,11 +179,11 @@ func (fs *flowSchemaWrapper) CopySpec(bootstrap, current runtime.Object) error { } func (fs *flowSchemaWrapper) HasSpecChanged(bootstrap, current runtime.Object) (bool, error) { - bootstrapFS, ok := bootstrap.(*flowcontrolv1beta1.FlowSchema) + bootstrapFS, ok := bootstrap.(*flowcontrolv1beta2.FlowSchema) if !ok { return false, errObjectNotFlowSchema } - currentFS, ok := current.(*flowcontrolv1beta1.FlowSchema) + currentFS, ok := current.(*flowcontrolv1beta2.FlowSchema) if !ok { return false, errObjectNotFlowSchema } @@ -191,8 +191,8 @@ func (fs *flowSchemaWrapper) HasSpecChanged(bootstrap, current runtime.Object) ( return flowSchemaSpecChanged(bootstrapFS, currentFS), nil } -func flowSchemaSpecChanged(expected, actual *flowcontrolv1beta1.FlowSchema) bool { +func flowSchemaSpecChanged(expected, actual *flowcontrolv1beta2.FlowSchema) bool { copiedExpectedFlowSchema := expected.DeepCopy() - flowcontrolapisv1beta1.SetObjectDefaults_FlowSchema(copiedExpectedFlowSchema) + flowcontrolapisv1beta2.SetObjectDefaults_FlowSchema(copiedExpectedFlowSchema) return !equality.Semantic.DeepEqual(copiedExpectedFlowSchema.Spec, actual.Spec) } diff --git a/pkg/registry/flowcontrol/ensurer/flowschema_test.go b/pkg/registry/flowcontrol/ensurer/flowschema_test.go index 81f28f5cf6c..48eca1cef54 100644 --- a/pkg/registry/flowcontrol/ensurer/flowschema_test.go +++ b/pkg/registry/flowcontrol/ensurer/flowschema_test.go @@ -21,13 +21,13 @@ import ( "reflect" "testing" - flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap" "k8s.io/client-go/kubernetes/fake" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" - flowcontrolapisv1beta1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" + flowcontrolapisv1beta2 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" @@ -37,9 +37,9 @@ func TestEnsureFlowSchema(t *testing.T) { tests := []struct { name string strategy func(flowcontrolclient.FlowSchemaInterface) FlowSchemaEnsurer - current *flowcontrolv1beta1.FlowSchema - bootstrap *flowcontrolv1beta1.FlowSchema - expected *flowcontrolv1beta1.FlowSchema + current *flowcontrolv1beta2.FlowSchema + bootstrap *flowcontrolv1beta2.FlowSchema + expected *flowcontrolv1beta2.FlowSchema }{ // for suggested configurations { @@ -102,14 +102,14 @@ func TestEnsureFlowSchema(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - client := fake.NewSimpleClientset().FlowcontrolV1beta1().FlowSchemas() + client := fake.NewSimpleClientset().FlowcontrolV1beta2().FlowSchemas() if test.current != nil { client.Create(context.TODO(), test.current, metav1.CreateOptions{}) } ensurer := test.strategy(client) - err := ensurer.Ensure([]*flowcontrolv1beta1.FlowSchema{test.bootstrap}) + err := ensurer.Ensure([]*flowcontrolv1beta2.FlowSchema{test.bootstrap}) if err != nil { t.Fatalf("Expected no error, but got: %v", err) } @@ -134,9 +134,9 @@ func TestEnsureFlowSchema(t *testing.T) { func TestSuggestedFSEnsureStrategy_ShouldUpdate(t *testing.T) { tests := []struct { name string - current *flowcontrolv1beta1.FlowSchema - bootstrap *flowcontrolv1beta1.FlowSchema - newObjectExpected *flowcontrolv1beta1.FlowSchema + current *flowcontrolv1beta2.FlowSchema + bootstrap *flowcontrolv1beta2.FlowSchema + newObjectExpected *flowcontrolv1beta2.FlowSchema }{ { name: "auto update is enabled, first generation, spec does not match - spec update expected", @@ -241,23 +241,23 @@ func TestSuggestedFSEnsureStrategy_ShouldUpdate(t *testing.T) { } func TestFlowSchemaSpecChanged(t *testing.T) { - fs1 := &flowcontrolv1beta1.FlowSchema{ - Spec: flowcontrolv1beta1.FlowSchemaSpec{}, + fs1 := &flowcontrolv1beta2.FlowSchema{ + Spec: flowcontrolv1beta2.FlowSchemaSpec{}, } - fs2 := &flowcontrolv1beta1.FlowSchema{ - Spec: flowcontrolv1beta1.FlowSchemaSpec{ + fs2 := &flowcontrolv1beta2.FlowSchema{ + Spec: flowcontrolv1beta2.FlowSchemaSpec{ MatchingPrecedence: 1, }, } - fs1Defaulted := &flowcontrolv1beta1.FlowSchema{ - Spec: flowcontrolv1beta1.FlowSchemaSpec{ - MatchingPrecedence: flowcontrolapisv1beta1.FlowSchemaDefaultMatchingPrecedence, + fs1Defaulted := &flowcontrolv1beta2.FlowSchema{ + Spec: flowcontrolv1beta2.FlowSchemaSpec{ + MatchingPrecedence: flowcontrolapisv1beta2.FlowSchemaDefaultMatchingPrecedence, }, } testCases := []struct { name string - expected *flowcontrolv1beta1.FlowSchema - actual *flowcontrolv1beta1.FlowSchema + expected *flowcontrolv1beta2.FlowSchema + actual *flowcontrolv1beta2.FlowSchema specChanged bool }{ { @@ -290,7 +290,7 @@ func TestFlowSchemaSpecChanged(t *testing.T) { func TestRemoveFlowSchema(t *testing.T) { tests := []struct { name string - current *flowcontrolv1beta1.FlowSchema + current *flowcontrolv1beta2.FlowSchema bootstrapName string removeExpected bool }{ @@ -321,7 +321,7 @@ func TestRemoveFlowSchema(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - client := fake.NewSimpleClientset().FlowcontrolV1beta1().FlowSchemas() + client := fake.NewSimpleClientset().FlowcontrolV1beta2().FlowSchemas() if test.current != nil { client.Create(context.TODO(), test.current, metav1.CreateOptions{}) } @@ -353,18 +353,18 @@ func TestRemoveFlowSchema(t *testing.T) { func TestGetFlowSchemaRemoveCandidate(t *testing.T) { tests := []struct { name string - current []*flowcontrolv1beta1.FlowSchema - bootstrap []*flowcontrolv1beta1.FlowSchema + current []*flowcontrolv1beta2.FlowSchema + bootstrap []*flowcontrolv1beta2.FlowSchema expected []string }{ { name: "no object has been removed from the bootstrap configuration", - bootstrap: []*flowcontrolv1beta1.FlowSchema{ + bootstrap: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs2", "pl2", 200).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs3", "pl3", 300).WithAutoUpdateAnnotation("true").Object(), }, - current: []*flowcontrolv1beta1.FlowSchema{ + current: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs2", "pl2", 200).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs3", "pl3", 300).WithAutoUpdateAnnotation("true").Object(), @@ -373,8 +373,8 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) { }, { name: "bootstrap is empty, all current objects with the annotation should be candidates", - bootstrap: []*flowcontrolv1beta1.FlowSchema{}, - current: []*flowcontrolv1beta1.FlowSchema{ + bootstrap: []*flowcontrolv1beta2.FlowSchema{}, + current: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs2", "pl2", 200).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs3", "pl3", 300).Object(), @@ -383,10 +383,10 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) { }, { name: "object(s) have been removed from the bootstrap configuration", - bootstrap: []*flowcontrolv1beta1.FlowSchema{ + bootstrap: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), }, - current: []*flowcontrolv1beta1.FlowSchema{ + current: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs2", "pl2", 200).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs3", "pl3", 300).WithAutoUpdateAnnotation("true").Object(), @@ -395,10 +395,10 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) { }, { name: "object(s) without the annotation key are ignored", - bootstrap: []*flowcontrolv1beta1.FlowSchema{ + bootstrap: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), }, - current: []*flowcontrolv1beta1.FlowSchema{ + current: []*flowcontrolv1beta2.FlowSchema{ newFlowSchema("fs1", "pl1", 100).WithAutoUpdateAnnotation("true").Object(), newFlowSchema("fs2", "pl2", 200).Object(), newFlowSchema("fs3", "pl3", 300).Object(), @@ -409,7 +409,7 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - client := fake.NewSimpleClientset().FlowcontrolV1beta1().FlowSchemas() + client := fake.NewSimpleClientset().FlowcontrolV1beta2().FlowSchemas() for i := range test.current { client.Create(context.TODO(), test.current[i], metav1.CreateOptions{}) } @@ -427,17 +427,17 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) { } type fsBuilder struct { - object *flowcontrolv1beta1.FlowSchema + object *flowcontrolv1beta2.FlowSchema } func newFlowSchema(name, plName string, matchingPrecedence int32) *fsBuilder { return &fsBuilder{ - object: &flowcontrolv1beta1.FlowSchema{ + object: &flowcontrolv1beta2.FlowSchema{ ObjectMeta: metav1.ObjectMeta{ Name: name, }, - Spec: flowcontrolv1beta1.FlowSchemaSpec{ - PriorityLevelConfiguration: flowcontrolv1beta1.PriorityLevelConfigurationReference{ + Spec: flowcontrolv1beta2.FlowSchemaSpec{ + PriorityLevelConfiguration: flowcontrolv1beta2.PriorityLevelConfigurationReference{ Name: plName, }, MatchingPrecedence: matchingPrecedence, @@ -446,7 +446,7 @@ func newFlowSchema(name, plName string, matchingPrecedence int32) *fsBuilder { } } -func (b *fsBuilder) Object() *flowcontrolv1beta1.FlowSchema { +func (b *fsBuilder) Object() *flowcontrolv1beta2.FlowSchema { return b.object } @@ -465,5 +465,5 @@ func setAnnotation(accessor metav1.Object, value string) { accessor.SetAnnotations(map[string]string{}) } - accessor.GetAnnotations()[flowcontrolv1beta1.AutoUpdateAnnotationKey] = value + accessor.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey] = value } diff --git a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration.go b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration.go index 9af7bab8f90..479f09988c8 100644 --- a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration.go +++ b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" - flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" - flowcontrolapisv1beta1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" + flowcontrolapisv1beta2 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2" ) var ( @@ -36,7 +36,7 @@ var ( // PriorityLevelEnsurer ensures the specified bootstrap configuration objects type PriorityLevelEnsurer interface { - Ensure([]*flowcontrolv1beta1.PriorityLevelConfiguration) error + Ensure([]*flowcontrolv1beta2.PriorityLevelConfiguration) error } // PriorityLevelRemover removes the specified bootstrap configuration objects @@ -82,7 +82,7 @@ func NewPriorityLevelRemover(client flowcontrolclient.PriorityLevelConfiguration // names that are candidates for removal from the cluster. // bootstrap: a set of hard coded PriorityLevelConfiguration configuration // objects kube-apiserver maintains in-memory. -func GetPriorityLevelRemoveCandidate(client flowcontrolclient.PriorityLevelConfigurationInterface, bootstrap []*flowcontrolv1beta1.PriorityLevelConfiguration) ([]string, error) { +func GetPriorityLevelRemoveCandidate(client flowcontrolclient.PriorityLevelConfigurationInterface, bootstrap []*flowcontrolv1beta2.PriorityLevelConfiguration) ([]string, error) { // TODO(101667): Use a lister here to avoid periodic LIST calls plList, err := client.List(context.TODO(), metav1.ListOptions{}) if err != nil { @@ -107,7 +107,7 @@ type plEnsurer struct { wrapper configurationWrapper } -func (e *plEnsurer) Ensure(priorityLevels []*flowcontrolv1beta1.PriorityLevelConfiguration) error { +func (e *plEnsurer) Ensure(priorityLevels []*flowcontrolv1beta2.PriorityLevelConfiguration) error { for _, priorityLevel := range priorityLevels { if err := ensureConfiguration(e.wrapper, e.strategy, priorityLevel); err != nil { return err @@ -138,7 +138,7 @@ func (fs *priorityLevelConfigurationWrapper) TypeName() string { } func (fs *priorityLevelConfigurationWrapper) Create(object runtime.Object) (runtime.Object, error) { - plObject, ok := object.(*flowcontrolv1beta1.PriorityLevelConfiguration) + plObject, ok := object.(*flowcontrolv1beta2.PriorityLevelConfiguration) if !ok { return nil, errObjectNotPriorityLevel } @@ -147,7 +147,7 @@ func (fs *priorityLevelConfigurationWrapper) Create(object runtime.Object) (runt } func (fs *priorityLevelConfigurationWrapper) Update(object runtime.Object) (runtime.Object, error) { - fsObject, ok := object.(*flowcontrolv1beta1.PriorityLevelConfiguration) + fsObject, ok := object.(*flowcontrolv1beta2.PriorityLevelConfiguration) if !ok { return nil, errObjectNotPriorityLevel } @@ -164,11 +164,11 @@ func (fs *priorityLevelConfigurationWrapper) Delete(name string) error { } func (fs *priorityLevelConfigurationWrapper) CopySpec(bootstrap, current runtime.Object) error { - bootstrapFS, ok := bootstrap.(*flowcontrolv1beta1.PriorityLevelConfiguration) + bootstrapFS, ok := bootstrap.(*flowcontrolv1beta2.PriorityLevelConfiguration) if !ok { return errObjectNotPriorityLevel } - currentFS, ok := current.(*flowcontrolv1beta1.PriorityLevelConfiguration) + currentFS, ok := current.(*flowcontrolv1beta2.PriorityLevelConfiguration) if !ok { return errObjectNotPriorityLevel } @@ -179,11 +179,11 @@ func (fs *priorityLevelConfigurationWrapper) CopySpec(bootstrap, current runtime } func (fs *priorityLevelConfigurationWrapper) HasSpecChanged(bootstrap, current runtime.Object) (bool, error) { - bootstrapFS, ok := bootstrap.(*flowcontrolv1beta1.PriorityLevelConfiguration) + bootstrapFS, ok := bootstrap.(*flowcontrolv1beta2.PriorityLevelConfiguration) if !ok { return false, errObjectNotPriorityLevel } - currentFS, ok := current.(*flowcontrolv1beta1.PriorityLevelConfiguration) + currentFS, ok := current.(*flowcontrolv1beta2.PriorityLevelConfiguration) if !ok { return false, errObjectNotPriorityLevel } @@ -191,8 +191,8 @@ func (fs *priorityLevelConfigurationWrapper) HasSpecChanged(bootstrap, current r return priorityLevelSpecChanged(bootstrapFS, currentFS), nil } -func priorityLevelSpecChanged(expected, actual *flowcontrolv1beta1.PriorityLevelConfiguration) bool { +func priorityLevelSpecChanged(expected, actual *flowcontrolv1beta2.PriorityLevelConfiguration) bool { copiedExpectedPriorityLevel := expected.DeepCopy() - flowcontrolapisv1beta1.SetObjectDefaults_PriorityLevelConfiguration(copiedExpectedPriorityLevel) + flowcontrolapisv1beta2.SetObjectDefaults_PriorityLevelConfiguration(copiedExpectedPriorityLevel) return !equality.Semantic.DeepEqual(copiedExpectedPriorityLevel.Spec, actual.Spec) } diff --git a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go index 5e9646af4f8..90269134a74 100644 --- a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go +++ b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go @@ -21,13 +21,13 @@ import ( "reflect" "testing" - flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap" "k8s.io/client-go/kubernetes/fake" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" - flowcontrolapisv1beta1 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" + flowcontrolapisv1beta2 "k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" @@ -37,9 +37,9 @@ func TestEnsurePriorityLevel(t *testing.T) { tests := []struct { name string strategy func(flowcontrolclient.PriorityLevelConfigurationInterface) PriorityLevelEnsurer - current *flowcontrolv1beta1.PriorityLevelConfiguration - bootstrap *flowcontrolv1beta1.PriorityLevelConfiguration - expected *flowcontrolv1beta1.PriorityLevelConfiguration + current *flowcontrolv1beta2.PriorityLevelConfiguration + bootstrap *flowcontrolv1beta2.PriorityLevelConfiguration + expected *flowcontrolv1beta2.PriorityLevelConfiguration }{ // for suggested configurations { @@ -102,14 +102,14 @@ func TestEnsurePriorityLevel(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - client := fake.NewSimpleClientset().FlowcontrolV1beta1().PriorityLevelConfigurations() + client := fake.NewSimpleClientset().FlowcontrolV1beta2().PriorityLevelConfigurations() if test.current != nil { client.Create(context.TODO(), test.current, metav1.CreateOptions{}) } ensurer := test.strategy(client) - err := ensurer.Ensure([]*flowcontrolv1beta1.PriorityLevelConfiguration{test.bootstrap}) + err := ensurer.Ensure([]*flowcontrolv1beta2.PriorityLevelConfiguration{test.bootstrap}) if err != nil { t.Fatalf("Expected no error, but got: %v", err) } @@ -134,9 +134,9 @@ func TestEnsurePriorityLevel(t *testing.T) { func TestSuggestedPLEnsureStrategy_ShouldUpdate(t *testing.T) { tests := []struct { name string - current *flowcontrolv1beta1.PriorityLevelConfiguration - bootstrap *flowcontrolv1beta1.PriorityLevelConfiguration - newObjectExpected *flowcontrolv1beta1.PriorityLevelConfiguration + current *flowcontrolv1beta2.PriorityLevelConfiguration + bootstrap *flowcontrolv1beta2.PriorityLevelConfiguration + newObjectExpected *flowcontrolv1beta2.PriorityLevelConfiguration }{ { name: "auto update is enabled, first generation, spec does not match - spec update expected", @@ -241,39 +241,39 @@ func TestSuggestedPLEnsureStrategy_ShouldUpdate(t *testing.T) { } func TestPriorityLevelSpecChanged(t *testing.T) { - pl1 := &flowcontrolv1beta1.PriorityLevelConfiguration{ - Spec: flowcontrolv1beta1.PriorityLevelConfigurationSpec{ - Type: flowcontrolv1beta1.PriorityLevelEnablementLimited, - Limited: &flowcontrolv1beta1.LimitedPriorityLevelConfiguration{ - LimitResponse: flowcontrolv1beta1.LimitResponse{ - Type: flowcontrolv1beta1.LimitResponseTypeReject, + pl1 := &flowcontrolv1beta2.PriorityLevelConfiguration{ + Spec: flowcontrolv1beta2.PriorityLevelConfigurationSpec{ + Type: flowcontrolv1beta2.PriorityLevelEnablementLimited, + Limited: &flowcontrolv1beta2.LimitedPriorityLevelConfiguration{ + LimitResponse: flowcontrolv1beta2.LimitResponse{ + Type: flowcontrolv1beta2.LimitResponseTypeReject, }, }, }, } - pl2 := &flowcontrolv1beta1.PriorityLevelConfiguration{ - Spec: flowcontrolv1beta1.PriorityLevelConfigurationSpec{ - Type: flowcontrolv1beta1.PriorityLevelEnablementLimited, - Limited: &flowcontrolv1beta1.LimitedPriorityLevelConfiguration{ + pl2 := &flowcontrolv1beta2.PriorityLevelConfiguration{ + Spec: flowcontrolv1beta2.PriorityLevelConfigurationSpec{ + Type: flowcontrolv1beta2.PriorityLevelEnablementLimited, + Limited: &flowcontrolv1beta2.LimitedPriorityLevelConfiguration{ AssuredConcurrencyShares: 1, }, }, } - pl1Defaulted := &flowcontrolv1beta1.PriorityLevelConfiguration{ - Spec: flowcontrolv1beta1.PriorityLevelConfigurationSpec{ - Type: flowcontrolv1beta1.PriorityLevelEnablementLimited, - Limited: &flowcontrolv1beta1.LimitedPriorityLevelConfiguration{ - AssuredConcurrencyShares: flowcontrolapisv1beta1.PriorityLevelConfigurationDefaultAssuredConcurrencyShares, - LimitResponse: flowcontrolv1beta1.LimitResponse{ - Type: flowcontrolv1beta1.LimitResponseTypeReject, + pl1Defaulted := &flowcontrolv1beta2.PriorityLevelConfiguration{ + Spec: flowcontrolv1beta2.PriorityLevelConfigurationSpec{ + Type: flowcontrolv1beta2.PriorityLevelEnablementLimited, + Limited: &flowcontrolv1beta2.LimitedPriorityLevelConfiguration{ + AssuredConcurrencyShares: flowcontrolapisv1beta2.PriorityLevelConfigurationDefaultAssuredConcurrencyShares, + LimitResponse: flowcontrolv1beta2.LimitResponse{ + Type: flowcontrolv1beta2.LimitResponseTypeReject, }, }, }, } testCases := []struct { name string - expected *flowcontrolv1beta1.PriorityLevelConfiguration - actual *flowcontrolv1beta1.PriorityLevelConfiguration + expected *flowcontrolv1beta2.PriorityLevelConfiguration + actual *flowcontrolv1beta2.PriorityLevelConfiguration specChanged bool }{ { @@ -306,7 +306,7 @@ func TestPriorityLevelSpecChanged(t *testing.T) { func TestRemovePriorityLevelConfiguration(t *testing.T) { tests := []struct { name string - current *flowcontrolv1beta1.PriorityLevelConfiguration + current *flowcontrolv1beta2.PriorityLevelConfiguration bootstrapName string removeExpected bool }{ @@ -337,7 +337,7 @@ func TestRemovePriorityLevelConfiguration(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - client := fake.NewSimpleClientset().FlowcontrolV1beta1().PriorityLevelConfigurations() + client := fake.NewSimpleClientset().FlowcontrolV1beta2().PriorityLevelConfigurations() if test.current != nil { client.Create(context.TODO(), test.current, metav1.CreateOptions{}) } @@ -369,18 +369,18 @@ func TestRemovePriorityLevelConfiguration(t *testing.T) { func TestGetPriorityLevelRemoveCandidate(t *testing.T) { tests := []struct { name string - current []*flowcontrolv1beta1.PriorityLevelConfiguration - bootstrap []*flowcontrolv1beta1.PriorityLevelConfiguration + current []*flowcontrolv1beta2.PriorityLevelConfiguration + bootstrap []*flowcontrolv1beta2.PriorityLevelConfiguration expected []string }{ { name: "no object has been removed from the bootstrap configuration", - bootstrap: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + bootstrap: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl2").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl3").WithAutoUpdateAnnotation("true").Object(), }, - current: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + current: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl2").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl3").WithAutoUpdateAnnotation("true").Object(), @@ -389,8 +389,8 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) { }, { name: "bootstrap is empty, all current objects with the annotation should be candidates", - bootstrap: []*flowcontrolv1beta1.PriorityLevelConfiguration{}, - current: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + bootstrap: []*flowcontrolv1beta2.PriorityLevelConfiguration{}, + current: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl2").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl3").Object(), @@ -399,10 +399,10 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) { }, { name: "object(s) have been removed from the bootstrap configuration", - bootstrap: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + bootstrap: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), }, - current: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + current: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl2").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl3").WithAutoUpdateAnnotation("true").Object(), @@ -411,10 +411,10 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) { }, { name: "object(s) without the annotation key are ignored", - bootstrap: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + bootstrap: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), }, - current: []*flowcontrolv1beta1.PriorityLevelConfiguration{ + current: []*flowcontrolv1beta2.PriorityLevelConfiguration{ newPLConfiguration("pl1").WithAutoUpdateAnnotation("true").Object(), newPLConfiguration("pl2").Object(), newPLConfiguration("pl3").Object(), @@ -425,7 +425,7 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - client := fake.NewSimpleClientset().FlowcontrolV1beta1().PriorityLevelConfigurations() + client := fake.NewSimpleClientset().FlowcontrolV1beta2().PriorityLevelConfigurations() for i := range test.current { client.Create(context.TODO(), test.current[i], metav1.CreateOptions{}) } @@ -443,12 +443,12 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) { } type plBuilder struct { - object *flowcontrolv1beta1.PriorityLevelConfiguration + object *flowcontrolv1beta2.PriorityLevelConfiguration } func newPLConfiguration(name string) *plBuilder { return &plBuilder{ - object: &flowcontrolv1beta1.PriorityLevelConfiguration{ + object: &flowcontrolv1beta2.PriorityLevelConfiguration{ ObjectMeta: metav1.ObjectMeta{ Name: name, }, @@ -456,7 +456,7 @@ func newPLConfiguration(name string) *plBuilder { } } -func (b *plBuilder) Object() *flowcontrolv1beta1.PriorityLevelConfiguration { +func (b *plBuilder) Object() *flowcontrolv1beta2.PriorityLevelConfiguration { return b.object } @@ -471,11 +471,11 @@ func (b *plBuilder) WithAutoUpdateAnnotation(value string) *plBuilder { } func (b *plBuilder) WithLimited(assuredConcurrencyShares int32) *plBuilder { - b.object.Spec.Type = flowcontrolv1beta1.PriorityLevelEnablementLimited - b.object.Spec.Limited = &flowcontrolv1beta1.LimitedPriorityLevelConfiguration{ + b.object.Spec.Type = flowcontrolv1beta2.PriorityLevelEnablementLimited + b.object.Spec.Limited = &flowcontrolv1beta2.LimitedPriorityLevelConfiguration{ AssuredConcurrencyShares: assuredConcurrencyShares, - LimitResponse: flowcontrolv1beta1.LimitResponse{ - Type: flowcontrolv1beta1.LimitResponseTypeReject, + LimitResponse: flowcontrolv1beta2.LimitResponse{ + Type: flowcontrolv1beta2.LimitResponseTypeReject, }, } return b @@ -488,8 +488,8 @@ func (b *plBuilder) WithQueuing(queues, handSize, queueLengthLimit int32) *plBui return b } - limited.LimitResponse.Type = flowcontrolv1beta1.LimitResponseTypeQueue - limited.LimitResponse.Queuing = &flowcontrolv1beta1.QueuingConfiguration{ + limited.LimitResponse.Type = flowcontrolv1beta2.LimitResponseTypeQueue + limited.LimitResponse.Queuing = &flowcontrolv1beta2.QueuingConfiguration{ Queues: queues, HandSize: handSize, QueueLengthLimit: queueLengthLimit, diff --git a/pkg/registry/flowcontrol/rest/storage_flowcontrol.go b/pkg/registry/flowcontrol/rest/storage_flowcontrol.go index d76e483ada8..595400baac1 100644 --- a/pkg/registry/flowcontrol/rest/storage_flowcontrol.go +++ b/pkg/registry/flowcontrol/rest/storage_flowcontrol.go @@ -27,7 +27,7 @@ import ( "k8s.io/apiserver/pkg/registry/rest" genericapiserver "k8s.io/apiserver/pkg/server" serverstorage "k8s.io/apiserver/pkg/server/storage" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/flowcontrol" @@ -153,7 +153,7 @@ func ensureAPFBootstrapConfiguration(hookContext genericapiserver.PostStartHookC return nil } -func ensure(clientset flowcontrolclient.FlowcontrolV1beta1Interface) error { +func ensure(clientset flowcontrolclient.FlowcontrolV1beta2Interface) error { if err := ensureSuggestedConfiguration(clientset); err != nil { // We should not attempt creation of mandatory objects if ensuring the suggested // configuration resulted in an error. @@ -172,7 +172,7 @@ func ensure(clientset flowcontrolclient.FlowcontrolV1beta1Interface) error { return nil } -func ensureSuggestedConfiguration(clientset flowcontrolclient.FlowcontrolV1beta1Interface) error { +func ensureSuggestedConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface) error { fsEnsurer := ensurer.NewSuggestedFlowSchemaEnsurer(clientset.FlowSchemas()) if err := fsEnsurer.Ensure(flowcontrolbootstrap.SuggestedFlowSchemas); err != nil { return err @@ -182,7 +182,7 @@ func ensureSuggestedConfiguration(clientset flowcontrolclient.FlowcontrolV1beta1 return plEnsurer.Ensure(flowcontrolbootstrap.SuggestedPriorityLevelConfigurations) } -func ensureMandatoryConfiguration(clientset flowcontrolclient.FlowcontrolV1beta1Interface) error { +func ensureMandatoryConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface) error { fsEnsurer := ensurer.NewMandatoryFlowSchemaEnsurer(clientset.FlowSchemas()) if err := fsEnsurer.Ensure(flowcontrolbootstrap.MandatoryFlowSchemas); err != nil { return err @@ -192,7 +192,7 @@ func ensureMandatoryConfiguration(clientset flowcontrolclient.FlowcontrolV1beta1 return plEnsurer.Ensure(flowcontrolbootstrap.MandatoryPriorityLevelConfigurations) } -func removeConfiguration(clientset flowcontrolclient.FlowcontrolV1beta1Interface) error { +func removeConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface) error { if err := removeFlowSchema(clientset.FlowSchemas()); err != nil { return err } diff --git a/staging/src/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/default.go b/staging/src/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/default.go index dbb932aa34a..8ae15a0ec7d 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/default.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/default.go @@ -19,7 +19,7 @@ package bootstrap import ( coordinationv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/apiserver/pkg/authentication/user" diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go index 1f341935d3e..f33d115d9ba 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go @@ -23,7 +23,7 @@ import ( "runtime" "sync/atomic" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" apitypes "k8s.io/apimachinery/pkg/types" epmetrics "k8s.io/apiserver/pkg/endpoints/metrics" apirequest "k8s.io/apiserver/pkg/endpoints/request" diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go index c57123ede0b..d11d4140bd4 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - 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" "k8s.io/apimachinery/pkg/types" @@ -1080,7 +1080,7 @@ func startAPFController(t *testing.T, stopCh <-chan struct{}, apfConfiguration [ clientset := newClientset(t, apfConfiguration...) // this test does not rely on resync, so resync period is set to zero factory := informers.NewSharedInformerFactory(clientset, 0) - controller := utilflowcontrol.New(factory, clientset.FlowcontrolV1beta1(), serverConcurrency, requestWaitLimit) + controller := utilflowcontrol.New(factory, clientset.FlowcontrolV1beta2(), serverConcurrency, requestWaitLimit) factory.Start(stopCh) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go b/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go index b8d60517ad7..0d9c6ca9f40 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go @@ -143,7 +143,7 @@ func (o *RecommendedOptions) ApplyTo(config *server.RecommendedConfig) error { } config.FlowControl = utilflowcontrol.New( config.SharedInformerFactory, - kubernetes.NewForConfigOrDie(config.ClientConfig).FlowcontrolV1beta1(), + kubernetes.NewForConfigOrDie(config.ClientConfig).FlowcontrolV1beta2(), config.MaxRequestsInFlight+config.MaxMutatingRequestsInFlight, config.RequestTimeout/4, ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go index bde6e79178a..a0da3e63185 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller.go @@ -52,9 +52,9 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" - flowcontrollister "k8s.io/client-go/listers/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" + flowcontrollister "k8s.io/client-go/listers/flowcontrol/v1beta2" ) const timeFmt = "2006-01-02T15:04:05.999" @@ -115,7 +115,7 @@ type configController struct { fsLister flowcontrollister.FlowSchemaLister fsInformerSynced cache.InformerSynced - flowcontrolClient flowcontrolclient.FlowcontrolV1beta1Interface + flowcontrolClient flowcontrolclient.FlowcontrolV1beta2Interface // serverConcurrencyLimit is the limit on the server's total // number of non-exempt requests being served at once. This comes @@ -203,7 +203,7 @@ func newTestableController(config TestableConfig) *configController { cfgCtlr.configQueue = workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(200*time.Millisecond, 8*time.Hour), "priority_and_fairness_config_queue") // ensure the data structure reflects the mandatory config cfgCtlr.lockAndDigestConfigObjects(nil, nil) - fci := config.InformerFactory.Flowcontrol().V1beta1() + fci := config.InformerFactory.Flowcontrol().V1beta2() pli := fci.PriorityLevelConfigurations() fsi := fci.FlowSchemas() cfgCtlr.plLister = pli.Lister() diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go index 32bcaf3e277..ae26253d905 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_filter.go @@ -30,8 +30,8 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/clock" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" - flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" + flowcontrolclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" ) // ConfigConsumerAsFieldManager is how the config consuminng @@ -78,7 +78,7 @@ type Interface interface { // New creates a new instance to implement API priority and fairness func New( informerFactory kubeinformers.SharedInformerFactory, - flowcontrolClient flowcontrolclient.FlowcontrolV1beta1Interface, + flowcontrolClient flowcontrolclient.FlowcontrolV1beta2Interface, serverConcurrencyLimit int, requestWaitLimit time.Duration, ) Interface { @@ -123,7 +123,7 @@ type TestableConfig struct { InformerFactory kubeinformers.SharedInformerFactory // FlowcontrolClient to use for manipulating config objects - FlowcontrolClient flowcontrolclient.FlowcontrolV1beta1Interface + FlowcontrolClient flowcontrolclient.FlowcontrolV1beta2Interface // ServerConcurrencyLimit for the controller to enforce ServerConcurrencyLimit int diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/controller_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/controller_test.go index d36eca7c4d9..715b0093c72 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/controller_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/controller_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - 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/clock" "k8s.io/apimachinery/pkg/util/sets" @@ -39,7 +39,7 @@ import ( fcrequest "k8s.io/apiserver/pkg/util/flowcontrol/request" "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" - fcclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" + fcclient "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" "k8s.io/klog/v2" ) @@ -70,7 +70,7 @@ func (cfgCtlr *configController) hasPriorityLevelState(plName string) bool { type ctlrTestState struct { t *testing.T cfgCtlr *configController - fcIfc fcclient.FlowcontrolV1beta1Interface + fcIfc fcclient.FlowcontrolV1beta2Interface existingPLs map[string]*flowcontrol.PriorityLevelConfiguration existingFSs map[string]*flowcontrol.FlowSchema heldRequestsMap map[string][]heldRequest @@ -244,7 +244,7 @@ func TestConfigConsumer(t *testing.T) { t.Run(fmt.Sprintf("trial%d:", i), func(t *testing.T) { clientset := clientsetfake.NewSimpleClientset() informerFactory := informers.NewSharedInformerFactory(clientset, 0) - flowcontrolClient := clientset.FlowcontrolV1beta1() + flowcontrolClient := clientset.FlowcontrolV1beta2() cts := &ctlrTestState{t: t, fcIfc: flowcontrolClient, existingFSs: map[string]*flowcontrol.FlowSchema{}, @@ -375,7 +375,7 @@ func TestAPFControllerWithGracefulShutdown(t *testing.T) { clientset := clientsetfake.NewSimpleClientset(fs, pl) informerFactory := informers.NewSharedInformerFactory(clientset, time.Second) - flowcontrolClient := clientset.FlowcontrolV1beta1() + flowcontrolClient := clientset.FlowcontrolV1beta2() cts := &ctlrTestState{t: t, fcIfc: flowcontrolClient, existingFSs: map[string]*flowcontrol.FlowSchema{}, diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/format/formatting.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/format/formatting.go index d2c917e0ba5..2199c1412a2 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/format/formatting.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/format/formatting.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/endpoints/request" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/gen_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/gen_test.go index 1a4f0547cdb..710044f06ba 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/gen_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/gen_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - 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/sets" fcboot "k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap" diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/match_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/match_test.go index 0ad992ce9c3..aa0b5bce284 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/match_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/match_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - 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/sets" "k8s.io/apiserver/pkg/authentication/user" diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/patch_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/patch_test.go index b2b2bd5fac7..b468b6d3b0d 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/patch_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/patch_test.go @@ -23,7 +23,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/rule.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/rule.go index 765e28790f7..83380e3742f 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/rule.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/rule.go @@ -19,7 +19,7 @@ package flowcontrol import ( "strings" - flowcontrol "k8s.io/api/flowcontrol/v1beta1" + flowcontrol "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/endpoints/request" diff --git a/vendor/modules.txt b/vendor/modules.txt index 9d3325f9a5f..6ca35185096 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1291,6 +1291,7 @@ k8s.io/api/events/v1beta1 k8s.io/api/extensions/v1beta1 k8s.io/api/flowcontrol/v1alpha1 k8s.io/api/flowcontrol/v1beta1 +k8s.io/api/flowcontrol/v1beta2 k8s.io/api/imagepolicy/v1alpha1 k8s.io/api/networking/v1 k8s.io/api/networking/v1beta1 @@ -1606,6 +1607,7 @@ k8s.io/client-go/applyconfigurations/events/v1beta1 k8s.io/client-go/applyconfigurations/extensions/v1beta1 k8s.io/client-go/applyconfigurations/flowcontrol/v1alpha1 k8s.io/client-go/applyconfigurations/flowcontrol/v1beta1 +k8s.io/client-go/applyconfigurations/flowcontrol/v1beta2 k8s.io/client-go/applyconfigurations/imagepolicy/v1alpha1 k8s.io/client-go/applyconfigurations/internal k8s.io/client-go/applyconfigurations/meta/v1 @@ -1670,6 +1672,7 @@ k8s.io/client-go/informers/extensions/v1beta1 k8s.io/client-go/informers/flowcontrol k8s.io/client-go/informers/flowcontrol/v1alpha1 k8s.io/client-go/informers/flowcontrol/v1beta1 +k8s.io/client-go/informers/flowcontrol/v1beta2 k8s.io/client-go/informers/internalinterfaces k8s.io/client-go/informers/networking k8s.io/client-go/informers/networking/v1 @@ -1750,6 +1753,8 @@ k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1 k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1/fake k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1 k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/fake +k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2 +k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/fake k8s.io/client-go/kubernetes/typed/networking/v1 k8s.io/client-go/kubernetes/typed/networking/v1/fake k8s.io/client-go/kubernetes/typed/networking/v1beta1 @@ -1805,6 +1810,7 @@ k8s.io/client-go/listers/events/v1beta1 k8s.io/client-go/listers/extensions/v1beta1 k8s.io/client-go/listers/flowcontrol/v1alpha1 k8s.io/client-go/listers/flowcontrol/v1beta1 +k8s.io/client-go/listers/flowcontrol/v1beta2 k8s.io/client-go/listers/networking/v1 k8s.io/client-go/listers/networking/v1beta1 k8s.io/client-go/listers/node/v1