diff --git a/build/Makefile b/build/Makefile index 02f3cdb0a6..d358f5b423 100644 --- a/build/Makefile +++ b/build/Makefile @@ -57,7 +57,7 @@ KIND_PROFILE ?= agones KIND_CONTAINER_NAME=kind-$(KIND_PROFILE)-control-plane # Game Server image to use while doing end-to-end tests -GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.13 +GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.14 # Directory that this Makefile is in. mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile index c17a46d18c..14b9d11120 100644 --- a/build/build-image/Dockerfile +++ b/build/build-image/Dockerfile @@ -44,13 +44,19 @@ RUN go get -u golang.org/x/tools/cmd/goimports # RUN gcloud components update RUN gcloud components update && gcloud components install app-engine-go +# the kubernetes version for the file +ENV KUBERNETES_VER 1.12.10 + # overwrite kubectl as we want a specific version -ENV KUBECTL_VER 1.12.10 -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/linux/amd64/kubectl && \ +RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VER}/bin/linux/amd64/kubectl && \ chmod go+rx ./kubectl && \ mv ./kubectl /usr/local/bin/kubectl RUN echo "source <(kubectl completion bash)" >> /root/.bashrc +# install the release branch of the code generator tools +RUN mkdir -p /go/src/k8s.io && cd /go/src/k8s.io && \ + git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git + # install Helm package manager ENV HELM_VER 2.11.0 ENV HELM_URL https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VER}-linux-amd64.tar.gz @@ -64,10 +70,6 @@ RUN echo "source <(helm completion bash)" >> /root/.bashrc # install golang-ci linter RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.16.0 -# install the release branch of the code generator tools -RUN mkdir -p /go/src && cd /go/src && mkdir -p k8s.io && cd k8s.io && \ - git clone -b kubernetes-1.11.5 --depth=3 https://github.com/kubernetes/code-generator.git - # # \ \ / /__| |__ ___(_) |_ ___ # \ \ /\ / / _ \ '_ \/ __| | __/ _ \ diff --git a/examples/fleet.yaml b/examples/fleet.yaml index 18c8fbbb22..718a5463d4 100644 --- a/examples/fleet.yaml +++ b/examples/fleet.yaml @@ -67,4 +67,4 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 \ No newline at end of file + image: gcr.io/agones-images/udp-server:0.14 \ No newline at end of file diff --git a/examples/simple-udp/Makefile b/examples/simple-udp/Makefile index c5691a5aaf..c15a202d53 100644 --- a/examples/simple-udp/Makefile +++ b/examples/simple-udp/Makefile @@ -27,7 +27,7 @@ REPOSITORY = gcr.io/agones-images mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) -server_tag = $(REPOSITORY)/udp-server:0.13 +server_tag = $(REPOSITORY)/udp-server:0.14 root_path = $(realpath $(project_path)/../..) # _____ _ diff --git a/examples/simple-udp/dev-gameserver.yaml b/examples/simple-udp/dev-gameserver.yaml index f1d86fdc11..d94f8c7e7f 100644 --- a/examples/simple-udp/dev-gameserver.yaml +++ b/examples/simple-udp/dev-gameserver.yaml @@ -31,4 +31,4 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.5 + image: gcr.io/agones-images/udp-server:0.14 diff --git a/examples/simple-udp/fleet-distributed.yaml b/examples/simple-udp/fleet-distributed.yaml index 660b80c383..8e8ac7c6aa 100644 --- a/examples/simple-udp/fleet-distributed.yaml +++ b/examples/simple-udp/fleet-distributed.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 + image: gcr.io/agones-images/udp-server:0.14 resources: requests: memory: "32Mi" diff --git a/examples/simple-udp/fleet.yaml b/examples/simple-udp/fleet.yaml index 8928fa0f2a..c5e18a4e8b 100644 --- a/examples/simple-udp/fleet.yaml +++ b/examples/simple-udp/fleet.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 + image: gcr.io/agones-images/udp-server:0.14 resources: requests: memory: "64Mi" diff --git a/examples/simple-udp/gameserver-passthrough.yaml b/examples/simple-udp/gameserver-passthrough.yaml index 461129893b..f9b2d6b4a3 100644 --- a/examples/simple-udp/gameserver-passthrough.yaml +++ b/examples/simple-udp/gameserver-passthrough.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 + image: gcr.io/agones-images/udp-server:0.14 env: - name: "PASSTHROUGH" value: "TRUE" diff --git a/examples/simple-udp/gameserver.yaml b/examples/simple-udp/gameserver.yaml index 651f5732db..c14750aa8a 100644 --- a/examples/simple-udp/gameserver.yaml +++ b/examples/simple-udp/gameserver.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 + image: gcr.io/agones-images/udp-server:0.14 resources: requests: memory: "32Mi" diff --git a/examples/simple-udp/gameserverset.yaml b/examples/simple-udp/gameserverset.yaml index 169f87b30a..dfb379c99a 100644 --- a/examples/simple-udp/gameserverset.yaml +++ b/examples/simple-udp/gameserverset.yaml @@ -31,4 +31,4 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 \ No newline at end of file + image: gcr.io/agones-images/udp-server:0.14 \ No newline at end of file diff --git a/install/helm/agones/templates/NOTES.txt b/install/helm/agones/templates/NOTES.txt index 6733ee39d2..1cbd37bf0c 100644 --- a/install/helm/agones/templates/NOTES.txt +++ b/install/helm/agones/templates/NOTES.txt @@ -19,7 +19,7 @@ spec: spec: containers: - name: simple-udp - image: gcr.io/agones-images/udp-server:0.13 + image: gcr.io/agones-images/udp-server:0.14 Finally don't forget to explore our documentation and usage guides on how to develop and host dedicated game servers on top of Agones. : diff --git a/pkg/apis/agones/v1/zz_generated.deepcopy.go b/pkg/apis/agones/v1/zz_generated.deepcopy.go index 2881399cd6..1725dea14c 100644 --- a/pkg/apis/agones/v1/zz_generated.deepcopy.go +++ b/pkg/apis/agones/v1/zz_generated.deepcopy.go @@ -323,11 +323,7 @@ func (in *GameServerStatus) DeepCopyInto(out *GameServerStatus) { } if in.ReservedUntil != nil { in, out := &in.ReservedUntil, &out.ReservedUntil - if *in == nil { - *out = nil - } else { - *out = (*in).DeepCopy() - } + *out = (*in).DeepCopy() } return } diff --git a/pkg/apis/allocation/v1/zz_generated.deepcopy.go b/pkg/apis/allocation/v1/zz_generated.deepcopy.go index 90559d6896..30a219fe46 100644 --- a/pkg/apis/allocation/v1/zz_generated.deepcopy.go +++ b/pkg/apis/allocation/v1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ package v1 import ( - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -94,7 +94,7 @@ func (in *GameServerAllocationSpec) DeepCopyInto(out *GameServerAllocationSpec) in.Required.DeepCopyInto(&out.Required) if in.Preferred != nil { in, out := &in.Preferred, &out.Preferred - *out = make([]meta_v1.LabelSelector, len(*in)) + *out = make([]metav1.LabelSelector, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -118,7 +118,7 @@ func (in *GameServerAllocationStatus) DeepCopyInto(out *GameServerAllocationStat *out = *in if in.Ports != nil { in, out := &in.Ports, &out.Ports - *out = make([]agones_v1.GameServerStatusPort, len(*in)) + *out = make([]agonesv1.GameServerStatusPort, len(*in)) copy(*out, *in) } return diff --git a/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go b/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go index 2d6df7cdb8..18ecd8e824 100644 --- a/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go +++ b/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go @@ -80,21 +80,13 @@ func (in *FleetAutoscaleReview) DeepCopyInto(out *FleetAutoscaleReview) { *out = *in if in.Request != nil { in, out := &in.Request, &out.Request - if *in == nil { - *out = nil - } else { - *out = new(FleetAutoscaleRequest) - **out = **in - } + *out = new(FleetAutoscaleRequest) + **out = **in } if in.Response != nil { in, out := &in.Response, &out.Response - if *in == nil { - *out = nil - } else { - *out = new(FleetAutoscaleResponse) - **out = **in - } + *out = new(FleetAutoscaleResponse) + **out = **in } return } @@ -175,21 +167,13 @@ func (in *FleetAutoscalerPolicy) DeepCopyInto(out *FleetAutoscalerPolicy) { *out = *in if in.Buffer != nil { in, out := &in.Buffer, &out.Buffer - if *in == nil { - *out = nil - } else { - *out = new(BufferPolicy) - **out = **in - } + *out = new(BufferPolicy) + **out = **in } if in.Webhook != nil { in, out := &in.Webhook, &out.Webhook - if *in == nil { - *out = nil - } else { - *out = new(WebhookPolicy) - (*in).DeepCopyInto(*out) - } + *out = new(WebhookPolicy) + (*in).DeepCopyInto(*out) } return } @@ -226,11 +210,7 @@ func (in *FleetAutoscalerStatus) DeepCopyInto(out *FleetAutoscalerStatus) { *out = *in if in.LastScaleTime != nil { in, out := &in.LastScaleTime, &out.LastScaleTime - if *in == nil { - *out = nil - } else { - *out = (*in).DeepCopy() - } + *out = (*in).DeepCopy() } return } @@ -250,21 +230,13 @@ func (in *WebhookPolicy) DeepCopyInto(out *WebhookPolicy) { *out = *in if in.URL != nil { in, out := &in.URL, &out.URL - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } + *out = new(string) + **out = **in } if in.Service != nil { in, out := &in.Service, &out.Service - if *in == nil { - *out = nil - } else { - *out = new(v1beta1.ServiceReference) - (*in).DeepCopyInto(*out) - } + *out = new(v1beta1.ServiceReference) + (*in).DeepCopyInto(*out) } if in.CABundle != nil { in, out := &in.CABundle, &out.CABundle diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 546ffcf7dc..9199eeed8f 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -27,15 +27,17 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + agonesv1.AddToScheme, + allocationv1.AddToScheme, + autoscalingv1.AddToScheme, + multiclusterv1alpha1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -48,13 +50,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - agonesv1.AddToScheme(scheme) - allocationv1.AddToScheme(scheme) - autoscalingv1.AddToScheme(scheme) - multiclusterv1alpha1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(AddToScheme(scheme)) } diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 8834f78fe3..ac2a30b288 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -27,15 +27,17 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + agonesv1.AddToScheme, + allocationv1.AddToScheme, + autoscalingv1.AddToScheme, + multiclusterv1alpha1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -48,13 +50,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - agonesv1.AddToScheme(scheme) - allocationv1.AddToScheme(scheme) - autoscalingv1.AddToScheme(scheme) - multiclusterv1alpha1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(AddToScheme(Scheme)) } 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 e163ba0ed8..80b526b80b 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 @@ -19,7 +19,7 @@ package fake import ( - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" v1beta1 "k8s.io/api/extensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" @@ -40,20 +40,20 @@ var fleetsResource = schema.GroupVersionResource{Group: "agones.dev", Version: " var fleetsKind = schema.GroupVersionKind{Group: "agones.dev", Version: "v1", Kind: "Fleet"} // Get takes name of the fleet, and returns the corresponding fleet object, and an error if there is any. -func (c *FakeFleets) Get(name string, options v1.GetOptions) (result *agones_v1.Fleet, err error) { +func (c *FakeFleets) Get(name string, options v1.GetOptions) (result *agonesv1.Fleet, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(fleetsResource, c.ns, name), &agones_v1.Fleet{}) + Invokes(testing.NewGetAction(fleetsResource, c.ns, name), &agonesv1.Fleet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.Fleet), err + return obj.(*agonesv1.Fleet), err } // List takes label and field selectors, and returns the list of Fleets that match those selectors. -func (c *FakeFleets) List(opts v1.ListOptions) (result *agones_v1.FleetList, err error) { +func (c *FakeFleets) List(opts v1.ListOptions) (result *agonesv1.FleetList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(fleetsResource, fleetsKind, c.ns, opts), &agones_v1.FleetList{}) + Invokes(testing.NewListAction(fleetsResource, fleetsKind, c.ns, opts), &agonesv1.FleetList{}) if obj == nil { return nil, err @@ -63,8 +63,8 @@ func (c *FakeFleets) List(opts v1.ListOptions) (result *agones_v1.FleetList, err if label == nil { label = labels.Everything() } - list := &agones_v1.FleetList{ListMeta: obj.(*agones_v1.FleetList).ListMeta} - for _, item := range obj.(*agones_v1.FleetList).Items { + list := &agonesv1.FleetList{ListMeta: obj.(*agonesv1.FleetList).ListMeta} + for _, item := range obj.(*agonesv1.FleetList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -80,43 +80,43 @@ func (c *FakeFleets) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a fleet and creates it. Returns the server's representation of the fleet, and an error, if there is any. -func (c *FakeFleets) Create(fleet *agones_v1.Fleet) (result *agones_v1.Fleet, err error) { +func (c *FakeFleets) Create(fleet *agonesv1.Fleet) (result *agonesv1.Fleet, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(fleetsResource, c.ns, fleet), &agones_v1.Fleet{}) + Invokes(testing.NewCreateAction(fleetsResource, c.ns, fleet), &agonesv1.Fleet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.Fleet), err + return obj.(*agonesv1.Fleet), err } // Update takes the representation of a fleet and updates it. Returns the server's representation of the fleet, and an error, if there is any. -func (c *FakeFleets) Update(fleet *agones_v1.Fleet) (result *agones_v1.Fleet, err error) { +func (c *FakeFleets) Update(fleet *agonesv1.Fleet) (result *agonesv1.Fleet, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(fleetsResource, c.ns, fleet), &agones_v1.Fleet{}) + Invokes(testing.NewUpdateAction(fleetsResource, c.ns, fleet), &agonesv1.Fleet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.Fleet), err + return obj.(*agonesv1.Fleet), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeFleets) UpdateStatus(fleet *agones_v1.Fleet) (*agones_v1.Fleet, error) { +func (c *FakeFleets) UpdateStatus(fleet *agonesv1.Fleet) (*agonesv1.Fleet, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(fleetsResource, "status", c.ns, fleet), &agones_v1.Fleet{}) + Invokes(testing.NewUpdateSubresourceAction(fleetsResource, "status", c.ns, fleet), &agonesv1.Fleet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.Fleet), err + return obj.(*agonesv1.Fleet), err } // Delete takes name of the fleet and deletes it. Returns an error if one occurs. func (c *FakeFleets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(fleetsResource, c.ns, name), &agones_v1.Fleet{}) + Invokes(testing.NewDeleteAction(fleetsResource, c.ns, name), &agonesv1.Fleet{}) return err } @@ -125,19 +125,19 @@ func (c *FakeFleets) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeFleets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(fleetsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &agones_v1.FleetList{}) + _, err := c.Fake.Invokes(action, &agonesv1.FleetList{}) return err } // Patch applies the patch and returns the patched fleet. -func (c *FakeFleets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *agones_v1.Fleet, err error) { +func (c *FakeFleets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *agonesv1.Fleet, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(fleetsResource, c.ns, name, data, subresources...), &agones_v1.Fleet{}) + Invokes(testing.NewPatchSubresourceAction(fleetsResource, c.ns, name, data, subresources...), &agonesv1.Fleet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.Fleet), err + return obj.(*agonesv1.Fleet), err } // GetScale takes name of the fleet, and returns the corresponding scale object, and an error if there is any. diff --git a/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserver.go b/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserver.go index ee9d3c3107..532a303197 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserver.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/fake/fake_gameserver.go @@ -19,7 +19,7 @@ package fake import ( - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var gameserversResource = schema.GroupVersionResource{Group: "agones.dev", Versi var gameserversKind = schema.GroupVersionKind{Group: "agones.dev", Version: "v1", Kind: "GameServer"} // Get takes name of the gameServer, and returns the corresponding gameServer object, and an error if there is any. -func (c *FakeGameServers) Get(name string, options v1.GetOptions) (result *agones_v1.GameServer, err error) { +func (c *FakeGameServers) Get(name string, options v1.GetOptions) (result *agonesv1.GameServer, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(gameserversResource, c.ns, name), &agones_v1.GameServer{}) + Invokes(testing.NewGetAction(gameserversResource, c.ns, name), &agonesv1.GameServer{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServer), err + return obj.(*agonesv1.GameServer), err } // List takes label and field selectors, and returns the list of GameServers that match those selectors. -func (c *FakeGameServers) List(opts v1.ListOptions) (result *agones_v1.GameServerList, err error) { +func (c *FakeGameServers) List(opts v1.ListOptions) (result *agonesv1.GameServerList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(gameserversResource, gameserversKind, c.ns, opts), &agones_v1.GameServerList{}) + Invokes(testing.NewListAction(gameserversResource, gameserversKind, c.ns, opts), &agonesv1.GameServerList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeGameServers) List(opts v1.ListOptions) (result *agones_v1.GameServe if label == nil { label = labels.Everything() } - list := &agones_v1.GameServerList{ListMeta: obj.(*agones_v1.GameServerList).ListMeta} - for _, item := range obj.(*agones_v1.GameServerList).Items { + list := &agonesv1.GameServerList{ListMeta: obj.(*agonesv1.GameServerList).ListMeta} + for _, item := range obj.(*agonesv1.GameServerList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeGameServers) Watch(opts v1.ListOptions) (watch.Interface, error) { } // Create takes the representation of a gameServer and creates it. Returns the server's representation of the gameServer, and an error, if there is any. -func (c *FakeGameServers) Create(gameServer *agones_v1.GameServer) (result *agones_v1.GameServer, err error) { +func (c *FakeGameServers) Create(gameServer *agonesv1.GameServer) (result *agonesv1.GameServer, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(gameserversResource, c.ns, gameServer), &agones_v1.GameServer{}) + Invokes(testing.NewCreateAction(gameserversResource, c.ns, gameServer), &agonesv1.GameServer{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServer), err + return obj.(*agonesv1.GameServer), err } // Update takes the representation of a gameServer and updates it. Returns the server's representation of the gameServer, and an error, if there is any. -func (c *FakeGameServers) Update(gameServer *agones_v1.GameServer) (result *agones_v1.GameServer, err error) { +func (c *FakeGameServers) Update(gameServer *agonesv1.GameServer) (result *agonesv1.GameServer, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(gameserversResource, c.ns, gameServer), &agones_v1.GameServer{}) + Invokes(testing.NewUpdateAction(gameserversResource, c.ns, gameServer), &agonesv1.GameServer{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServer), err + return obj.(*agonesv1.GameServer), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeGameServers) UpdateStatus(gameServer *agones_v1.GameServer) (*agones_v1.GameServer, error) { +func (c *FakeGameServers) UpdateStatus(gameServer *agonesv1.GameServer) (*agonesv1.GameServer, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(gameserversResource, "status", c.ns, gameServer), &agones_v1.GameServer{}) + Invokes(testing.NewUpdateSubresourceAction(gameserversResource, "status", c.ns, gameServer), &agonesv1.GameServer{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServer), err + return obj.(*agonesv1.GameServer), err } // Delete takes name of the gameServer and deletes it. Returns an error if one occurs. func (c *FakeGameServers) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(gameserversResource, c.ns, name), &agones_v1.GameServer{}) + Invokes(testing.NewDeleteAction(gameserversResource, c.ns, name), &agonesv1.GameServer{}) return err } @@ -124,17 +124,17 @@ func (c *FakeGameServers) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeGameServers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(gameserversResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &agones_v1.GameServerList{}) + _, err := c.Fake.Invokes(action, &agonesv1.GameServerList{}) return err } // Patch applies the patch and returns the patched gameServer. -func (c *FakeGameServers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *agones_v1.GameServer, err error) { +func (c *FakeGameServers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *agonesv1.GameServer, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(gameserversResource, c.ns, name, data, subresources...), &agones_v1.GameServer{}) + Invokes(testing.NewPatchSubresourceAction(gameserversResource, c.ns, name, data, subresources...), &agonesv1.GameServer{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServer), err + return obj.(*agonesv1.GameServer), 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 a408e2f4d1..1227da84b1 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 @@ -19,7 +19,7 @@ package fake import ( - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" v1beta1 "k8s.io/api/extensions/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" @@ -40,20 +40,20 @@ var gameserversetsResource = schema.GroupVersionResource{Group: "agones.dev", Ve var gameserversetsKind = schema.GroupVersionKind{Group: "agones.dev", Version: "v1", Kind: "GameServerSet"} // Get takes name of the gameServerSet, and returns the corresponding gameServerSet object, and an error if there is any. -func (c *FakeGameServerSets) Get(name string, options v1.GetOptions) (result *agones_v1.GameServerSet, err error) { +func (c *FakeGameServerSets) Get(name string, options v1.GetOptions) (result *agonesv1.GameServerSet, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(gameserversetsResource, c.ns, name), &agones_v1.GameServerSet{}) + Invokes(testing.NewGetAction(gameserversetsResource, c.ns, name), &agonesv1.GameServerSet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServerSet), err + return obj.(*agonesv1.GameServerSet), err } // List takes label and field selectors, and returns the list of GameServerSets that match those selectors. -func (c *FakeGameServerSets) List(opts v1.ListOptions) (result *agones_v1.GameServerSetList, err error) { +func (c *FakeGameServerSets) List(opts v1.ListOptions) (result *agonesv1.GameServerSetList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(gameserversetsResource, gameserversetsKind, c.ns, opts), &agones_v1.GameServerSetList{}) + Invokes(testing.NewListAction(gameserversetsResource, gameserversetsKind, c.ns, opts), &agonesv1.GameServerSetList{}) if obj == nil { return nil, err @@ -63,8 +63,8 @@ func (c *FakeGameServerSets) List(opts v1.ListOptions) (result *agones_v1.GameSe if label == nil { label = labels.Everything() } - list := &agones_v1.GameServerSetList{ListMeta: obj.(*agones_v1.GameServerSetList).ListMeta} - for _, item := range obj.(*agones_v1.GameServerSetList).Items { + list := &agonesv1.GameServerSetList{ListMeta: obj.(*agonesv1.GameServerSetList).ListMeta} + for _, item := range obj.(*agonesv1.GameServerSetList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -80,43 +80,43 @@ func (c *FakeGameServerSets) Watch(opts v1.ListOptions) (watch.Interface, error) } // Create takes the representation of a gameServerSet and creates it. Returns the server's representation of the gameServerSet, and an error, if there is any. -func (c *FakeGameServerSets) Create(gameServerSet *agones_v1.GameServerSet) (result *agones_v1.GameServerSet, err error) { +func (c *FakeGameServerSets) Create(gameServerSet *agonesv1.GameServerSet) (result *agonesv1.GameServerSet, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(gameserversetsResource, c.ns, gameServerSet), &agones_v1.GameServerSet{}) + Invokes(testing.NewCreateAction(gameserversetsResource, c.ns, gameServerSet), &agonesv1.GameServerSet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServerSet), err + return obj.(*agonesv1.GameServerSet), err } // Update takes the representation of a gameServerSet and updates it. Returns the server's representation of the gameServerSet, and an error, if there is any. -func (c *FakeGameServerSets) Update(gameServerSet *agones_v1.GameServerSet) (result *agones_v1.GameServerSet, err error) { +func (c *FakeGameServerSets) Update(gameServerSet *agonesv1.GameServerSet) (result *agonesv1.GameServerSet, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(gameserversetsResource, c.ns, gameServerSet), &agones_v1.GameServerSet{}) + Invokes(testing.NewUpdateAction(gameserversetsResource, c.ns, gameServerSet), &agonesv1.GameServerSet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServerSet), err + return obj.(*agonesv1.GameServerSet), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeGameServerSets) UpdateStatus(gameServerSet *agones_v1.GameServerSet) (*agones_v1.GameServerSet, error) { +func (c *FakeGameServerSets) UpdateStatus(gameServerSet *agonesv1.GameServerSet) (*agonesv1.GameServerSet, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(gameserversetsResource, "status", c.ns, gameServerSet), &agones_v1.GameServerSet{}) + Invokes(testing.NewUpdateSubresourceAction(gameserversetsResource, "status", c.ns, gameServerSet), &agonesv1.GameServerSet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServerSet), err + return obj.(*agonesv1.GameServerSet), err } // Delete takes name of the gameServerSet and deletes it. Returns an error if one occurs. func (c *FakeGameServerSets) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(gameserversetsResource, c.ns, name), &agones_v1.GameServerSet{}) + Invokes(testing.NewDeleteAction(gameserversetsResource, c.ns, name), &agonesv1.GameServerSet{}) return err } @@ -125,19 +125,19 @@ func (c *FakeGameServerSets) Delete(name string, options *v1.DeleteOptions) erro func (c *FakeGameServerSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(gameserversetsResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &agones_v1.GameServerSetList{}) + _, err := c.Fake.Invokes(action, &agonesv1.GameServerSetList{}) return err } // Patch applies the patch and returns the patched gameServerSet. -func (c *FakeGameServerSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *agones_v1.GameServerSet, err error) { +func (c *FakeGameServerSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *agonesv1.GameServerSet, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(gameserversetsResource, c.ns, name, data, subresources...), &agones_v1.GameServerSet{}) + Invokes(testing.NewPatchSubresourceAction(gameserversetsResource, c.ns, name, data, subresources...), &agonesv1.GameServerSet{}) if obj == nil { return nil, err } - return obj.(*agones_v1.GameServerSet), err + return obj.(*agonesv1.GameServerSet), err } // GetScale takes name of the gameServerSet, and returns the corresponding scale object, and an error if there is any. diff --git a/pkg/client/clientset/versioned/typed/agones/v1/fleet.go b/pkg/client/clientset/versioned/typed/agones/v1/fleet.go index 2134ed2ba9..6c99af6c2b 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/fleet.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/fleet.go @@ -22,7 +22,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" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -39,13 +39,13 @@ type FleetInterface interface { Create(*v1.Fleet) (*v1.Fleet, error) Update(*v1.Fleet) (*v1.Fleet, error) UpdateStatus(*v1.Fleet) (*v1.Fleet, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.Fleet, error) - List(opts meta_v1.ListOptions) (*v1.FleetList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.Fleet, error) + 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 meta_v1.GetOptions) (*v1beta1.Scale, error) + GetScale(fleetName string, options metav1.GetOptions) (*v1beta1.Scale, error) UpdateScale(fleetName string, scale *v1beta1.Scale) (*v1beta1.Scale, error) FleetExpansion @@ -66,7 +66,7 @@ func newFleets(c *AgonesV1Client, namespace string) *fleets { } // Get takes name of the fleet, and returns the corresponding fleet object, and an error if there is any. -func (c *fleets) Get(name string, options meta_v1.GetOptions) (result *v1.Fleet, err error) { +func (c *fleets) Get(name string, options metav1.GetOptions) (result *v1.Fleet, err error) { result = &v1.Fleet{} err = c.client.Get(). Namespace(c.ns). @@ -79,7 +79,7 @@ func (c *fleets) Get(name string, options meta_v1.GetOptions) (result *v1.Fleet, } // List takes label and field selectors, and returns the list of Fleets that match those selectors. -func (c *fleets) List(opts meta_v1.ListOptions) (result *v1.FleetList, err error) { +func (c *fleets) List(opts metav1.ListOptions) (result *v1.FleetList, err error) { result = &v1.FleetList{} err = c.client.Get(). Namespace(c.ns). @@ -91,7 +91,7 @@ func (c *fleets) List(opts meta_v1.ListOptions) (result *v1.FleetList, err error } // Watch returns a watch.Interface that watches the requested fleets. -func (c *fleets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *fleets) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -142,7 +142,7 @@ func (c *fleets) UpdateStatus(fleet *v1.Fleet) (result *v1.Fleet, err error) { } // Delete takes name of the fleet and deletes it. Returns an error if one occurs. -func (c *fleets) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *fleets) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("fleets"). @@ -153,7 +153,7 @@ func (c *fleets) Delete(name string, options *meta_v1.DeleteOptions) error { } // DeleteCollection deletes a collection of objects. -func (c *fleets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *fleets) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("fleets"). @@ -178,7 +178,7 @@ func (c *fleets) Patch(name string, pt types.PatchType, data []byte, subresource } // 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 meta_v1.GetOptions) (result *v1beta1.Scale, err error) { +func (c *fleets) GetScale(fleetName string, options metav1.GetOptions) (result *v1beta1.Scale, err error) { result = &v1beta1.Scale{} err = c.client.Get(). Namespace(c.ns). diff --git a/pkg/client/clientset/versioned/typed/agones/v1/gameserver.go b/pkg/client/clientset/versioned/typed/agones/v1/gameserver.go index 905d4c2dda..db23cde42a 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/gameserver.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/gameserver.go @@ -21,7 +21,7 @@ package v1 import ( v1 "agones.dev/agones/pkg/apis/agones/v1" scheme "agones.dev/agones/pkg/client/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type GameServerInterface interface { Create(*v1.GameServer) (*v1.GameServer, error) Update(*v1.GameServer) (*v1.GameServer, error) UpdateStatus(*v1.GameServer) (*v1.GameServer, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.GameServer, error) - List(opts meta_v1.ListOptions) (*v1.GameServerList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.GameServer, error) + List(opts metav1.ListOptions) (*v1.GameServerList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.GameServer, err error) GameServerExpansion } @@ -62,7 +62,7 @@ func newGameServers(c *AgonesV1Client, namespace string) *gameServers { } // Get takes name of the gameServer, and returns the corresponding gameServer object, and an error if there is any. -func (c *gameServers) Get(name string, options meta_v1.GetOptions) (result *v1.GameServer, err error) { +func (c *gameServers) Get(name string, options metav1.GetOptions) (result *v1.GameServer, err error) { result = &v1.GameServer{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *gameServers) Get(name string, options meta_v1.GetOptions) (result *v1.G } // List takes label and field selectors, and returns the list of GameServers that match those selectors. -func (c *gameServers) List(opts meta_v1.ListOptions) (result *v1.GameServerList, err error) { +func (c *gameServers) List(opts metav1.ListOptions) (result *v1.GameServerList, err error) { result = &v1.GameServerList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *gameServers) List(opts meta_v1.ListOptions) (result *v1.GameServerList, } // Watch returns a watch.Interface that watches the requested gameServers. -func (c *gameServers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *gameServers) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *gameServers) UpdateStatus(gameServer *v1.GameServer) (result *v1.GameSe } // Delete takes name of the gameServer and deletes it. Returns an error if one occurs. -func (c *gameServers) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *gameServers) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("gameservers"). @@ -149,7 +149,7 @@ func (c *gameServers) Delete(name string, options *meta_v1.DeleteOptions) error } // DeleteCollection deletes a collection of objects. -func (c *gameServers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *gameServers) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("gameservers"). diff --git a/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go b/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go index 842c1a9327..42cfb7162c 100644 --- a/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go +++ b/pkg/client/clientset/versioned/typed/agones/v1/gameserverset.go @@ -22,7 +22,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" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -39,13 +39,13 @@ type GameServerSetInterface interface { Create(*v1.GameServerSet) (*v1.GameServerSet, error) Update(*v1.GameServerSet) (*v1.GameServerSet, error) UpdateStatus(*v1.GameServerSet) (*v1.GameServerSet, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.GameServerSet, error) - List(opts meta_v1.ListOptions) (*v1.GameServerSetList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.GameServerSet, error) + 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 meta_v1.GetOptions) (*v1beta1.Scale, error) + GetScale(gameServerSetName string, options metav1.GetOptions) (*v1beta1.Scale, error) UpdateScale(gameServerSetName string, scale *v1beta1.Scale) (*v1beta1.Scale, error) GameServerSetExpansion @@ -66,7 +66,7 @@ func newGameServerSets(c *AgonesV1Client, namespace string) *gameServerSets { } // Get takes name of the gameServerSet, and returns the corresponding gameServerSet object, and an error if there is any. -func (c *gameServerSets) Get(name string, options meta_v1.GetOptions) (result *v1.GameServerSet, err error) { +func (c *gameServerSets) Get(name string, options metav1.GetOptions) (result *v1.GameServerSet, err error) { result = &v1.GameServerSet{} err = c.client.Get(). Namespace(c.ns). @@ -79,7 +79,7 @@ func (c *gameServerSets) Get(name string, options meta_v1.GetOptions) (result *v } // List takes label and field selectors, and returns the list of GameServerSets that match those selectors. -func (c *gameServerSets) List(opts meta_v1.ListOptions) (result *v1.GameServerSetList, err error) { +func (c *gameServerSets) List(opts metav1.ListOptions) (result *v1.GameServerSetList, err error) { result = &v1.GameServerSetList{} err = c.client.Get(). Namespace(c.ns). @@ -91,7 +91,7 @@ func (c *gameServerSets) List(opts meta_v1.ListOptions) (result *v1.GameServerSe } // Watch returns a watch.Interface that watches the requested gameServerSets. -func (c *gameServerSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *gameServerSets) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -142,7 +142,7 @@ func (c *gameServerSets) UpdateStatus(gameServerSet *v1.GameServerSet) (result * } // Delete takes name of the gameServerSet and deletes it. Returns an error if one occurs. -func (c *gameServerSets) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *gameServerSets) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("gameserversets"). @@ -153,7 +153,7 @@ func (c *gameServerSets) Delete(name string, options *meta_v1.DeleteOptions) err } // DeleteCollection deletes a collection of objects. -func (c *gameServerSets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *gameServerSets) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("gameserversets"). @@ -178,7 +178,7 @@ func (c *gameServerSets) Patch(name string, pt types.PatchType, data []byte, sub } // 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 meta_v1.GetOptions) (result *v1beta1.Scale, err error) { +func (c *gameServerSets) GetScale(gameServerSetName string, options metav1.GetOptions) (result *v1beta1.Scale, err error) { result = &v1beta1.Scale{} err = c.client.Get(). Namespace(c.ns). diff --git a/pkg/client/clientset/versioned/typed/autoscaling/v1/fake/fake_fleetautoscaler.go b/pkg/client/clientset/versioned/typed/autoscaling/v1/fake/fake_fleetautoscaler.go index 6161fe3d1b..ab1adde075 100644 --- a/pkg/client/clientset/versioned/typed/autoscaling/v1/fake/fake_fleetautoscaler.go +++ b/pkg/client/clientset/versioned/typed/autoscaling/v1/fake/fake_fleetautoscaler.go @@ -19,7 +19,7 @@ package fake import ( - autoscaling_v1 "agones.dev/agones/pkg/apis/autoscaling/v1" + autoscalingv1 "agones.dev/agones/pkg/apis/autoscaling/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,20 +39,20 @@ var fleetautoscalersResource = schema.GroupVersionResource{Group: "autoscaling.a var fleetautoscalersKind = schema.GroupVersionKind{Group: "autoscaling.agones.dev", Version: "v1", Kind: "FleetAutoscaler"} // Get takes name of the fleetAutoscaler, and returns the corresponding fleetAutoscaler object, and an error if there is any. -func (c *FakeFleetAutoscalers) Get(name string, options v1.GetOptions) (result *autoscaling_v1.FleetAutoscaler, err error) { +func (c *FakeFleetAutoscalers) Get(name string, options v1.GetOptions) (result *autoscalingv1.FleetAutoscaler, err error) { obj, err := c.Fake. - Invokes(testing.NewGetAction(fleetautoscalersResource, c.ns, name), &autoscaling_v1.FleetAutoscaler{}) + Invokes(testing.NewGetAction(fleetautoscalersResource, c.ns, name), &autoscalingv1.FleetAutoscaler{}) if obj == nil { return nil, err } - return obj.(*autoscaling_v1.FleetAutoscaler), err + return obj.(*autoscalingv1.FleetAutoscaler), err } // List takes label and field selectors, and returns the list of FleetAutoscalers that match those selectors. -func (c *FakeFleetAutoscalers) List(opts v1.ListOptions) (result *autoscaling_v1.FleetAutoscalerList, err error) { +func (c *FakeFleetAutoscalers) List(opts v1.ListOptions) (result *autoscalingv1.FleetAutoscalerList, err error) { obj, err := c.Fake. - Invokes(testing.NewListAction(fleetautoscalersResource, fleetautoscalersKind, c.ns, opts), &autoscaling_v1.FleetAutoscalerList{}) + Invokes(testing.NewListAction(fleetautoscalersResource, fleetautoscalersKind, c.ns, opts), &autoscalingv1.FleetAutoscalerList{}) if obj == nil { return nil, err @@ -62,8 +62,8 @@ func (c *FakeFleetAutoscalers) List(opts v1.ListOptions) (result *autoscaling_v1 if label == nil { label = labels.Everything() } - list := &autoscaling_v1.FleetAutoscalerList{ListMeta: obj.(*autoscaling_v1.FleetAutoscalerList).ListMeta} - for _, item := range obj.(*autoscaling_v1.FleetAutoscalerList).Items { + list := &autoscalingv1.FleetAutoscalerList{ListMeta: obj.(*autoscalingv1.FleetAutoscalerList).ListMeta} + for _, item := range obj.(*autoscalingv1.FleetAutoscalerList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -79,43 +79,43 @@ func (c *FakeFleetAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, erro } // Create takes the representation of a fleetAutoscaler and creates it. Returns the server's representation of the fleetAutoscaler, and an error, if there is any. -func (c *FakeFleetAutoscalers) Create(fleetAutoscaler *autoscaling_v1.FleetAutoscaler) (result *autoscaling_v1.FleetAutoscaler, err error) { +func (c *FakeFleetAutoscalers) Create(fleetAutoscaler *autoscalingv1.FleetAutoscaler) (result *autoscalingv1.FleetAutoscaler, err error) { obj, err := c.Fake. - Invokes(testing.NewCreateAction(fleetautoscalersResource, c.ns, fleetAutoscaler), &autoscaling_v1.FleetAutoscaler{}) + Invokes(testing.NewCreateAction(fleetautoscalersResource, c.ns, fleetAutoscaler), &autoscalingv1.FleetAutoscaler{}) if obj == nil { return nil, err } - return obj.(*autoscaling_v1.FleetAutoscaler), err + return obj.(*autoscalingv1.FleetAutoscaler), err } // Update takes the representation of a fleetAutoscaler and updates it. Returns the server's representation of the fleetAutoscaler, and an error, if there is any. -func (c *FakeFleetAutoscalers) Update(fleetAutoscaler *autoscaling_v1.FleetAutoscaler) (result *autoscaling_v1.FleetAutoscaler, err error) { +func (c *FakeFleetAutoscalers) Update(fleetAutoscaler *autoscalingv1.FleetAutoscaler) (result *autoscalingv1.FleetAutoscaler, err error) { obj, err := c.Fake. - Invokes(testing.NewUpdateAction(fleetautoscalersResource, c.ns, fleetAutoscaler), &autoscaling_v1.FleetAutoscaler{}) + Invokes(testing.NewUpdateAction(fleetautoscalersResource, c.ns, fleetAutoscaler), &autoscalingv1.FleetAutoscaler{}) if obj == nil { return nil, err } - return obj.(*autoscaling_v1.FleetAutoscaler), err + return obj.(*autoscalingv1.FleetAutoscaler), err } // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeFleetAutoscalers) UpdateStatus(fleetAutoscaler *autoscaling_v1.FleetAutoscaler) (*autoscaling_v1.FleetAutoscaler, error) { +func (c *FakeFleetAutoscalers) UpdateStatus(fleetAutoscaler *autoscalingv1.FleetAutoscaler) (*autoscalingv1.FleetAutoscaler, error) { obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceAction(fleetautoscalersResource, "status", c.ns, fleetAutoscaler), &autoscaling_v1.FleetAutoscaler{}) + Invokes(testing.NewUpdateSubresourceAction(fleetautoscalersResource, "status", c.ns, fleetAutoscaler), &autoscalingv1.FleetAutoscaler{}) if obj == nil { return nil, err } - return obj.(*autoscaling_v1.FleetAutoscaler), err + return obj.(*autoscalingv1.FleetAutoscaler), err } // Delete takes name of the fleetAutoscaler and deletes it. Returns an error if one occurs. func (c *FakeFleetAutoscalers) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewDeleteAction(fleetautoscalersResource, c.ns, name), &autoscaling_v1.FleetAutoscaler{}) + Invokes(testing.NewDeleteAction(fleetautoscalersResource, c.ns, name), &autoscalingv1.FleetAutoscaler{}) return err } @@ -124,17 +124,17 @@ func (c *FakeFleetAutoscalers) Delete(name string, options *v1.DeleteOptions) er func (c *FakeFleetAutoscalers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(fleetautoscalersResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &autoscaling_v1.FleetAutoscalerList{}) + _, err := c.Fake.Invokes(action, &autoscalingv1.FleetAutoscalerList{}) return err } // Patch applies the patch and returns the patched fleetAutoscaler. -func (c *FakeFleetAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *autoscaling_v1.FleetAutoscaler, err error) { +func (c *FakeFleetAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *autoscalingv1.FleetAutoscaler, err error) { obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceAction(fleetautoscalersResource, c.ns, name, data, subresources...), &autoscaling_v1.FleetAutoscaler{}) + Invokes(testing.NewPatchSubresourceAction(fleetautoscalersResource, c.ns, name, data, subresources...), &autoscalingv1.FleetAutoscaler{}) if obj == nil { return nil, err } - return obj.(*autoscaling_v1.FleetAutoscaler), err + return obj.(*autoscalingv1.FleetAutoscaler), err } diff --git a/pkg/client/clientset/versioned/typed/autoscaling/v1/fleetautoscaler.go b/pkg/client/clientset/versioned/typed/autoscaling/v1/fleetautoscaler.go index 6fe8a0db7c..2cc63d47ba 100644 --- a/pkg/client/clientset/versioned/typed/autoscaling/v1/fleetautoscaler.go +++ b/pkg/client/clientset/versioned/typed/autoscaling/v1/fleetautoscaler.go @@ -21,7 +21,7 @@ package v1 import ( v1 "agones.dev/agones/pkg/apis/autoscaling/v1" scheme "agones.dev/agones/pkg/client/clientset/versioned/scheme" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -38,11 +38,11 @@ type FleetAutoscalerInterface interface { Create(*v1.FleetAutoscaler) (*v1.FleetAutoscaler, error) Update(*v1.FleetAutoscaler) (*v1.FleetAutoscaler, error) UpdateStatus(*v1.FleetAutoscaler) (*v1.FleetAutoscaler, error) - Delete(name string, options *meta_v1.DeleteOptions) error - DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error - Get(name string, options meta_v1.GetOptions) (*v1.FleetAutoscaler, error) - List(opts meta_v1.ListOptions) (*v1.FleetAutoscalerList, error) - Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Delete(name string, options *metav1.DeleteOptions) error + DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error + Get(name string, options metav1.GetOptions) (*v1.FleetAutoscaler, error) + List(opts metav1.ListOptions) (*v1.FleetAutoscalerList, error) + Watch(opts metav1.ListOptions) (watch.Interface, error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.FleetAutoscaler, err error) FleetAutoscalerExpansion } @@ -62,7 +62,7 @@ func newFleetAutoscalers(c *AutoscalingV1Client, namespace string) *fleetAutosca } // Get takes name of the fleetAutoscaler, and returns the corresponding fleetAutoscaler object, and an error if there is any. -func (c *fleetAutoscalers) Get(name string, options meta_v1.GetOptions) (result *v1.FleetAutoscaler, err error) { +func (c *fleetAutoscalers) Get(name string, options metav1.GetOptions) (result *v1.FleetAutoscaler, err error) { result = &v1.FleetAutoscaler{} err = c.client.Get(). Namespace(c.ns). @@ -75,7 +75,7 @@ func (c *fleetAutoscalers) Get(name string, options meta_v1.GetOptions) (result } // List takes label and field selectors, and returns the list of FleetAutoscalers that match those selectors. -func (c *fleetAutoscalers) List(opts meta_v1.ListOptions) (result *v1.FleetAutoscalerList, err error) { +func (c *fleetAutoscalers) List(opts metav1.ListOptions) (result *v1.FleetAutoscalerList, err error) { result = &v1.FleetAutoscalerList{} err = c.client.Get(). Namespace(c.ns). @@ -87,7 +87,7 @@ func (c *fleetAutoscalers) List(opts meta_v1.ListOptions) (result *v1.FleetAutos } // Watch returns a watch.Interface that watches the requested fleetAutoscalers. -func (c *fleetAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { +func (c *fleetAutoscalers) Watch(opts metav1.ListOptions) (watch.Interface, error) { opts.Watch = true return c.client.Get(). Namespace(c.ns). @@ -138,7 +138,7 @@ func (c *fleetAutoscalers) UpdateStatus(fleetAutoscaler *v1.FleetAutoscaler) (re } // Delete takes name of the fleetAutoscaler and deletes it. Returns an error if one occurs. -func (c *fleetAutoscalers) Delete(name string, options *meta_v1.DeleteOptions) error { +func (c *fleetAutoscalers) Delete(name string, options *metav1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("fleetautoscalers"). @@ -149,7 +149,7 @@ func (c *fleetAutoscalers) Delete(name string, options *meta_v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *fleetAutoscalers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { +func (c *fleetAutoscalers) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("fleetautoscalers"). diff --git a/pkg/client/informers/externalversions/agones/v1/fleet.go b/pkg/client/informers/externalversions/agones/v1/fleet.go index b29e2b217c..7f7c76029e 100644 --- a/pkg/client/informers/externalversions/agones/v1/fleet.go +++ b/pkg/client/informers/externalversions/agones/v1/fleet.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" versioned "agones.dev/agones/pkg/client/clientset/versioned" internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces" v1 "agones.dev/agones/pkg/client/listers/agones/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewFleetInformer(client versioned.Interface, namespace string, resyncPeriod func NewFilteredFleetInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AgonesV1().Fleets(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AgonesV1().Fleets(namespace).Watch(options) }, }, - &agones_v1.Fleet{}, + &agonesv1.Fleet{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *fleetInformer) defaultInformer(client versioned.Interface, resyncPeriod } func (f *fleetInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&agones_v1.Fleet{}, f.defaultInformer) + return f.factory.InformerFor(&agonesv1.Fleet{}, f.defaultInformer) } func (f *fleetInformer) Lister() v1.FleetLister { diff --git a/pkg/client/informers/externalversions/agones/v1/gameserver.go b/pkg/client/informers/externalversions/agones/v1/gameserver.go index 4c8f9a7493..73801ad856 100644 --- a/pkg/client/informers/externalversions/agones/v1/gameserver.go +++ b/pkg/client/informers/externalversions/agones/v1/gameserver.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" versioned "agones.dev/agones/pkg/client/clientset/versioned" internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces" v1 "agones.dev/agones/pkg/client/listers/agones/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewGameServerInformer(client versioned.Interface, namespace string, resyncP func NewFilteredGameServerInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AgonesV1().GameServers(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AgonesV1().GameServers(namespace).Watch(options) }, }, - &agones_v1.GameServer{}, + &agonesv1.GameServer{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *gameServerInformer) defaultInformer(client versioned.Interface, resyncP } func (f *gameServerInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&agones_v1.GameServer{}, f.defaultInformer) + return f.factory.InformerFor(&agonesv1.GameServer{}, f.defaultInformer) } func (f *gameServerInformer) Lister() v1.GameServerLister { diff --git a/pkg/client/informers/externalversions/agones/v1/gameserverset.go b/pkg/client/informers/externalversions/agones/v1/gameserverset.go index bc02dd1183..6f8ef99fb7 100644 --- a/pkg/client/informers/externalversions/agones/v1/gameserverset.go +++ b/pkg/client/informers/externalversions/agones/v1/gameserverset.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - agones_v1 "agones.dev/agones/pkg/apis/agones/v1" + agonesv1 "agones.dev/agones/pkg/apis/agones/v1" versioned "agones.dev/agones/pkg/client/clientset/versioned" internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces" v1 "agones.dev/agones/pkg/client/listers/agones/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewGameServerSetInformer(client versioned.Interface, namespace string, resy func NewFilteredGameServerSetInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AgonesV1().GameServerSets(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AgonesV1().GameServerSets(namespace).Watch(options) }, }, - &agones_v1.GameServerSet{}, + &agonesv1.GameServerSet{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *gameServerSetInformer) defaultInformer(client versioned.Interface, resy } func (f *gameServerSetInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&agones_v1.GameServerSet{}, f.defaultInformer) + return f.factory.InformerFor(&agonesv1.GameServerSet{}, f.defaultInformer) } func (f *gameServerSetInformer) Lister() v1.GameServerSetLister { diff --git a/pkg/client/informers/externalversions/autoscaling/v1/fleetautoscaler.go b/pkg/client/informers/externalversions/autoscaling/v1/fleetautoscaler.go index c6db78ef3f..e13c0c1287 100644 --- a/pkg/client/informers/externalversions/autoscaling/v1/fleetautoscaler.go +++ b/pkg/client/informers/externalversions/autoscaling/v1/fleetautoscaler.go @@ -21,11 +21,11 @@ package v1 import ( time "time" - autoscaling_v1 "agones.dev/agones/pkg/apis/autoscaling/v1" + autoscalingv1 "agones.dev/agones/pkg/apis/autoscaling/v1" versioned "agones.dev/agones/pkg/client/clientset/versioned" internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces" v1 "agones.dev/agones/pkg/client/listers/autoscaling/v1" - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" @@ -57,20 +57,20 @@ func NewFleetAutoscalerInformer(client versioned.Interface, namespace string, re func NewFilteredFleetAutoscalerInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { return cache.NewSharedIndexInformer( &cache.ListWatch{ - ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AutoscalingV1().FleetAutoscalers(namespace).List(options) }, - WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } return client.AutoscalingV1().FleetAutoscalers(namespace).Watch(options) }, }, - &autoscaling_v1.FleetAutoscaler{}, + &autoscalingv1.FleetAutoscaler{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *fleetAutoscalerInformer) defaultInformer(client versioned.Interface, re } func (f *fleetAutoscalerInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&autoscaling_v1.FleetAutoscaler{}, f.defaultInformer) + return f.factory.InformerFor(&autoscalingv1.FleetAutoscaler{}, f.defaultInformer) } func (f *fleetAutoscalerInformer) Lister() v1.FleetAutoscalerLister { diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 883a29ed29..cdad907ceb 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -22,7 +22,7 @@ import ( "fmt" v1 "agones.dev/agones/pkg/apis/agones/v1" - autoscaling_v1 "agones.dev/agones/pkg/apis/autoscaling/v1" + autoscalingv1 "agones.dev/agones/pkg/apis/autoscaling/v1" v1alpha1 "agones.dev/agones/pkg/apis/multicluster/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" @@ -63,7 +63,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource return &genericInformer{resource: resource.GroupResource(), informer: f.Agones().V1().GameServerSets().Informer()}, nil // Group=autoscaling.agones.dev, Version=v1 - case autoscaling_v1.SchemeGroupVersion.WithResource("fleetautoscalers"): + case autoscalingv1.SchemeGroupVersion.WithResource("fleetautoscalers"): return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V1().FleetAutoscalers().Informer()}, nil // Group=multicluster, Version=v1alpha1 diff --git a/pkg/client/informers/externalversions/multicluster/v1alpha1/gameserverallocationpolicy.go b/pkg/client/informers/externalversions/multicluster/v1alpha1/gameserverallocationpolicy.go index 53b6b33dd0..55eb31ebed 100644 --- a/pkg/client/informers/externalversions/multicluster/v1alpha1/gameserverallocationpolicy.go +++ b/pkg/client/informers/externalversions/multicluster/v1alpha1/gameserverallocationpolicy.go @@ -21,7 +21,7 @@ package v1alpha1 import ( time "time" - multicluster_v1alpha1 "agones.dev/agones/pkg/apis/multicluster/v1alpha1" + multiclusterv1alpha1 "agones.dev/agones/pkg/apis/multicluster/v1alpha1" versioned "agones.dev/agones/pkg/client/clientset/versioned" internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "agones.dev/agones/pkg/client/listers/multicluster/v1alpha1" @@ -70,7 +70,7 @@ func NewFilteredGameServerAllocationPolicyInformer(client versioned.Interface, n return client.MulticlusterV1alpha1().GameServerAllocationPolicies(namespace).Watch(options) }, }, - &multicluster_v1alpha1.GameServerAllocationPolicy{}, + &multiclusterv1alpha1.GameServerAllocationPolicy{}, resyncPeriod, indexers, ) @@ -81,7 +81,7 @@ func (f *gameServerAllocationPolicyInformer) defaultInformer(client versioned.In } func (f *gameServerAllocationPolicyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&multicluster_v1alpha1.GameServerAllocationPolicy{}, f.defaultInformer) + return f.factory.InformerFor(&multiclusterv1alpha1.GameServerAllocationPolicy{}, f.defaultInformer) } func (f *gameServerAllocationPolicyInformer) Lister() v1alpha1.GameServerAllocationPolicyLister { diff --git a/site/config.toml b/site/config.toml index 8f8f895f6a..bca31a3909 100644 --- a/site/config.toml +++ b/site/config.toml @@ -91,7 +91,7 @@ release_branch = "release-0.11.0" release_version = "0.11.0" # example tag -example_image_tag = "gcr.io/agones-images/udp-server:0.13" +example_image_tag = "gcr.io/agones-images/udp-server:0.14" # User interface configuration [params.ui] diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go index 92ffb6c18d..1afa5f9bb4 100644 --- a/test/e2e/main_test.go +++ b/test/e2e/main_test.go @@ -34,8 +34,8 @@ func TestMain(m *testing.M) { usr, _ := user.Current() kubeconfig := flag.String("kubeconfig", filepath.Join(usr.HomeDir, "/.kube/config"), "kube config path, e.g. $HOME/.kube/config") - gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.13", - "gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.13") + gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.14", + "gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.14") pullSecret := flag.String("pullsecret", "", "optional secret to be used for pulling the gameserver and/or Agones SDK sidecar images") stressTestLevel := flag.Int("stress", 0, "enable stress test at given level 0-100")