diff --git a/pkg/apis/agones/v1/fleet.go b/pkg/apis/agones/v1/fleet.go index 9fa5c26544..54cbc90948 100644 --- a/pkg/apis/agones/v1/fleet.go +++ b/pkg/apis/agones/v1/fleet.go @@ -30,8 +30,8 @@ const ( ) // +genclient -// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/extensions/v1beta1.Scale -// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/extensions/v1beta1.Scale,result=k8s.io/api/extensions/v1beta1.Scale +// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale +// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Fleet is the data structure for a Fleet resource diff --git a/pkg/apis/agones/v1/gameserverset.go b/pkg/apis/agones/v1/gameserverset.go index 322f0f4a30..f13f75be0e 100644 --- a/pkg/apis/agones/v1/gameserverset.go +++ b/pkg/apis/agones/v1/gameserverset.go @@ -28,8 +28,8 @@ const ( ) // +genclient -// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/extensions/v1beta1.Scale -// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/extensions/v1beta1.Scale,result=k8s.io/api/extensions/v1beta1.Scale +// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale +// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // GameServerSet is the data structure for a set of GameServers. diff --git a/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_fleet.go b/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_fleet.go index 03bbb10c90..37ec3e0401 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_fleet.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_fleet.go @@ -20,7 +20,7 @@ package fake import ( agonesv1 "agones.dev/agones/pkg/apis/agones/v1" - v1beta1 "k8s.io/api/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -141,23 +141,23 @@ func (c *FakeFleets) Patch(name string, pt types.PatchType, data []byte, subreso } // GetScale takes name of the fleet, and returns the corresponding scale object, and an error if there is any. -func (c *FakeFleets) GetScale(fleetName string, options v1.GetOptions) (result *v1beta1.Scale, err error) { +func (c *FakeFleets) GetScale(fleetName string, options v1.GetOptions) (result *autoscalingv1.Scale, err error) { obj, err := c.Fake. - Invokes(testing.NewGetSubresourceAction(fleetsResource, c.ns, "scale", fleetName), &v1beta1.Scale{}) + Invokes(testing.NewGetSubresourceAction(fleetsResource, c.ns, "scale", fleetName), &autoscalingv1.Scale{}) if obj == nil { return nil, err } - return obj.(*v1beta1.Scale), err + return obj.(*autoscalingv1.Scale), err } // UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any. -func (c *FakeFleets) UpdateScale(fleetName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) { +func (c *FakeFleets) UpdateScale(fleetName string, scale *autoscalingv1.Scale) (result *autoscalingv1.Scale, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(fleetsResource, "scale", c.ns, scale), &v1beta1.Scale{}) + Invokes(testing.NewUpdateSubresourceAction(fleetsResource, "scale", c.ns, scale), &autoscalingv1.Scale{}) if obj == nil { return nil, err } - return obj.(*v1beta1.Scale), err + return obj.(*autoscalingv1.Scale), err } diff --git a/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserverset.go b/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserverset.go index 49cc77becb..d8d0066f12 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserverset.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserverset.go @@ -20,7 +20,7 @@ package fake import ( agonesv1 "agones.dev/agones/pkg/apis/agones/v1" - v1beta1 "k8s.io/api/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -141,23 +141,23 @@ func (c *FakeGameServerSets) Patch(name string, pt types.PatchType, data []byte, } // GetScale takes name of the gameServerSet, and returns the corresponding scale object, and an error if there is any. -func (c *FakeGameServerSets) GetScale(gameServerSetName string, options v1.GetOptions) (result *v1beta1.Scale, err error) { +func (c *FakeGameServerSets) GetScale(gameServerSetName string, options v1.GetOptions) (result *autoscalingv1.Scale, err error) { obj, err := c.Fake. - Invokes(testing.NewGetSubresourceAction(gameserversetsResource, c.ns, "scale", gameServerSetName), &v1beta1.Scale{}) + Invokes(testing.NewGetSubresourceAction(gameserversetsResource, c.ns, "scale", gameServerSetName), &autoscalingv1.Scale{}) if obj == nil { return nil, err } - return obj.(*v1beta1.Scale), err + return obj.(*autoscalingv1.Scale), err } // UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any. -func (c *FakeGameServerSets) UpdateScale(gameServerSetName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) { +func (c *FakeGameServerSets) UpdateScale(gameServerSetName string, scale *autoscalingv1.Scale) (result *autoscalingv1.Scale, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(gameserversetsResource, "scale", c.ns, scale), &v1beta1.Scale{}) + Invokes(testing.NewUpdateSubresourceAction(gameserversetsResource, "scale", c.ns, scale), &autoscalingv1.Scale{}) if obj == nil { return nil, err } - return obj.(*v1beta1.Scale), err + return obj.(*autoscalingv1.Scale), err } diff --git a/pkg/client/clientset/versioned/typed/agones/v1/fleet.go b/pkg/client/clientset/versioned/typed/agones/v1/fleet.go index 59c7830edf..f699c5a1b9 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/fleet.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/fleet.go @@ -23,7 +23,7 @@ import ( v1 "agones.dev/agones/pkg/apis/agones/v1" scheme "agones.dev/agones/pkg/client/clientset/versioned/scheme" - v1beta1 "k8s.io/api/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" @@ -47,8 +47,8 @@ type FleetInterface interface { List(opts metav1.ListOptions) (*v1.FleetList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Fleet, err error) - GetScale(fleetName string, options metav1.GetOptions) (*v1beta1.Scale, error) - UpdateScale(fleetName string, scale *v1beta1.Scale) (*v1beta1.Scale, error) + GetScale(fleetName string, options metav1.GetOptions) (*autoscalingv1.Scale, error) + UpdateScale(fleetName string, scale *autoscalingv1.Scale) (*autoscalingv1.Scale, error) FleetExpansion } @@ -194,9 +194,9 @@ func (c *fleets) Patch(name string, pt types.PatchType, data []byte, subresource return } -// GetScale takes name of the fleet, and returns the corresponding v1beta1.Scale object, and an error if there is any. -func (c *fleets) GetScale(fleetName string, options metav1.GetOptions) (result *v1beta1.Scale, err error) { - result = &v1beta1.Scale{} +// GetScale takes name of the fleet, and returns the corresponding autoscalingv1.Scale object, and an error if there is any. +func (c *fleets) GetScale(fleetName string, options metav1.GetOptions) (result *autoscalingv1.Scale, err error) { + result = &autoscalingv1.Scale{} err = c.client.Get(). Namespace(c.ns). Resource("fleets"). @@ -209,8 +209,8 @@ func (c *fleets) GetScale(fleetName string, options metav1.GetOptions) (result * } // UpdateScale takes the top resource name and the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any. -func (c *fleets) UpdateScale(fleetName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) { - result = &v1beta1.Scale{} +func (c *fleets) UpdateScale(fleetName string, scale *autoscalingv1.Scale) (result *autoscalingv1.Scale, err error) { + result = &autoscalingv1.Scale{} err = c.client.Put(). Namespace(c.ns). Resource("fleets"). diff --git a/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go b/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go index 93817542cb..3e18ad9bfe 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go @@ -23,7 +23,7 @@ import ( v1 "agones.dev/agones/pkg/apis/agones/v1" scheme "agones.dev/agones/pkg/client/clientset/versioned/scheme" - v1beta1 "k8s.io/api/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" @@ -47,8 +47,8 @@ type GameServerSetInterface interface { List(opts metav1.ListOptions) (*v1.GameServerSetList, error) Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.GameServerSet, err error) - GetScale(gameServerSetName string, options metav1.GetOptions) (*v1beta1.Scale, error) - UpdateScale(gameServerSetName string, scale *v1beta1.Scale) (*v1beta1.Scale, error) + GetScale(gameServerSetName string, options metav1.GetOptions) (*autoscalingv1.Scale, error) + UpdateScale(gameServerSetName string, scale *autoscalingv1.Scale) (*autoscalingv1.Scale, error) GameServerSetExpansion } @@ -194,9 +194,9 @@ func (c *gameServerSets) Patch(name string, pt types.PatchType, data []byte, sub return } -// GetScale takes name of the gameServerSet, and returns the corresponding v1beta1.Scale object, and an error if there is any. -func (c *gameServerSets) GetScale(gameServerSetName string, options metav1.GetOptions) (result *v1beta1.Scale, err error) { - result = &v1beta1.Scale{} +// GetScale takes name of the gameServerSet, and returns the corresponding autoscalingv1.Scale object, and an error if there is any. +func (c *gameServerSets) GetScale(gameServerSetName string, options metav1.GetOptions) (result *autoscalingv1.Scale, err error) { + result = &autoscalingv1.Scale{} err = c.client.Get(). Namespace(c.ns). Resource("gameserversets"). @@ -209,8 +209,8 @@ func (c *gameServerSets) GetScale(gameServerSetName string, options metav1.GetOp } // UpdateScale takes the top resource name and the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any. -func (c *gameServerSets) UpdateScale(gameServerSetName string, scale *v1beta1.Scale) (result *v1beta1.Scale, err error) { - result = &v1beta1.Scale{} +func (c *gameServerSets) UpdateScale(gameServerSetName string, scale *autoscalingv1.Scale) (result *autoscalingv1.Scale, err error) { + result = &autoscalingv1.Scale{} err = c.client.Put(). Namespace(c.ns). Resource("gameserversets"). diff --git a/pkg/fleets/controller_test.go b/pkg/fleets/controller_test.go index 1c1f90b51e..3af308947f 100644 --- a/pkg/fleets/controller_test.go +++ b/pkg/fleets/controller_test.go @@ -37,8 +37,8 @@ import ( "github.com/stretchr/testify/require" admv1beta1 "k8s.io/api/admission/v1beta1" appsv1 "k8s.io/api/apps/v1" + autoscalingv1 "k8s.io/api/autoscaling/v1" corev1 "k8s.io/api/core/v1" - v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -1433,10 +1433,10 @@ func (ffg *fakeFleetsGetterWithErr) Watch(opts metav1.ListOptions) (watch.Interf func (ffg *fakeFleetsGetterWithErr) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Fleet, err error) { panic("not implemented") } -func (ffg *fakeFleetsGetterWithErr) GetScale(fleetName string, options metav1.GetOptions) (*v1beta1.Scale, error) { +func (ffg *fakeFleetsGetterWithErr) GetScale(fleetName string, options metav1.GetOptions) (*autoscalingv1.Scale, error) { panic("not implemented") } -func (ffg *fakeFleetsGetterWithErr) UpdateScale(fleetName string, scale *v1beta1.Scale) (*v1beta1.Scale, error) { +func (ffg *fakeFleetsGetterWithErr) UpdateScale(fleetName string, scale *autoscalingv1.Scale) (*autoscalingv1.Scale, error) { panic("not implemented") } diff --git a/test/e2e/fleet_test.go b/test/e2e/fleet_test.go index 860b2c1492..71a6f95622 100644 --- a/test/e2e/fleet_test.go +++ b/test/e2e/fleet_test.go @@ -30,8 +30,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" + autoscalingv1 "k8s.io/api/autoscaling/v1" corev1 "k8s.io/api/core/v1" - v1betaext "k8s.io/api/extensions/v1beta1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -1419,10 +1419,10 @@ func fleetWithGameServerSpec(gsSpec *agonesv1.GameServerSpec, namespace string) } // newScale returns a scale with specified Replicas spec -func newScale(fleetName string, newReplicas int32, resourceVersion string) *v1betaext.Scale { - return &v1betaext.Scale{ +func newScale(fleetName string, newReplicas int32, resourceVersion string) *autoscalingv1.Scale { + return &autoscalingv1.Scale{ ObjectMeta: metav1.ObjectMeta{Name: fleetName, Namespace: framework.Namespace, ResourceVersion: resourceVersion}, - Spec: v1betaext.ScaleSpec{ + Spec: autoscalingv1.ScaleSpec{ Replicas: newReplicas, }, }