GameServerAllocation is the data structure for allocating against a set of
-GameServers, defined required and preferred selectors
selectors selectors
-required
-
-
-GameServerSelector
-
-
- |
-
- Required The required allocation. Defaults to all GameServers. - |
-||||||||||
-preferred
+selectors
[]GameServerSelector
@@ -1565,7 +1552,7 @@ GameServerAllocation |
- Preferred ordered list of preferred allocations out of the An ordered list of allocations set. If the first selector is not matched, the selection attempts the second selector, and so on. |
@@ -1645,20 +1632,7 @@ ||||||||||
-required
-
-
-GameServerSelector
-
-
- |
-
- Required The required allocation. Defaults to all GameServers. - |
-||||||||||
-preferred
+selectors
[]GameServerSelector
@@ -1666,7 +1640,7 @@ GameServerAllocationS |
- Preferred ordered list of preferred allocations out of the An ordered list of allocations set. If the first selector is not matched, the selection attempts the second selector, and so on. |
@@ -5341,7 +5315,7 @@
|
- Required is the GameServer selector from which to choose GameServers from. + Deprecated: use field Selectors instead. If Selectors is set, this field is ignored. +Required is the GameServer selector from which to choose GameServers from. Defaults to all GameServers. |
@@ -5433,7 +5408,8 @@
- Preferred is an ordered list of preferred GameServer selectors + Deprecated: use field Selectors instead. If Selectors is set, this field is ignored.
+Preferred is an ordered list of preferred GameServer selectors
that are optional to be fulfilled, but will be searched before the GameServerAllocation
+ |
+selectors
+
+
+[]GameServerSelector
+
+
+
+ |
+Ordered list of GameServer label selectors. +If the first selector is not matched, the selection attempts the second selector, and so on. +This is useful for things like smoke testing of new game servers. +Note: This field can only be set if neither Required or Preferred is set. +
|
scheduling
agones.dev/agones/pkg/apis.SchedulingStrategy
@@ -5523,7 +5515,8 @@ GameServerAllocationS
- |
Required is the GameServer selector from which to choose GameServers from. + Deprecated: use field Selectors instead. If Selectors is set, this field is ignored. +Required is the GameServer selector from which to choose GameServers from. Defaults to all GameServers. |
- Preferred is an ordered list of preferred GameServer selectors + Deprecated: use field Selectors instead. If Selectors is set, this field is ignored.
+Preferred is an ordered list of preferred GameServer selectors
that are optional to be fulfilled, but will be searched before the GameServerAllocationS
+ |
+selectors
+
+
+[]GameServerSelector
+
+
+
+ |
+Ordered list of GameServer label selectors. +If the first selector is not matched, the selection attempts the second selector, and so on. +This is useful for things like smoke testing of new game servers. +Note: This field can only be set if neither Required or Preferred is set. +
| scheduling
agones.dev/agones/pkg/apis.SchedulingStrategy
diff --git a/site/content/en/docs/Reference/gameserverallocation.md b/site/content/en/docs/Reference/gameserverallocation.md
index 3daa837460..fe71bdb927 100644
--- a/site/content/en/docs/Reference/gameserverallocation.md
+++ b/site/content/en/docs/Reference/gameserverallocation.md
@@ -81,7 +81,8 @@ The `spec` field is the actual `GameServerAllocation` specification, and it is c
{{% feature publishVersion="1.17.0" %}}
-```yaml
+{{< tabpane >}}
+ {{< tab header="selectors" lang="yaml" >}}
apiVersion: "allocation.agones.dev/v1"
kind: GameServerAllocation
spec:
@@ -89,6 +90,61 @@ spec:
# Defaults to all GameServers.
# matchLabels, matchExpressions, gameServerState and player filters can be used for filtering.
# See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ for more details on label selectors.
+ # An ordered list of GameServer label selectors.
+ # If the first selector is not matched, the selection attempts the second selector, and so on.
+ # This is useful for things like smoke testing of new game servers.
+ selectors:
+ - matchLabels:
+ agones.dev/fleet: green-fleet
+ # [Stage:Alpha]
+ # [FeatureFlag:PlayerAllocationFilter]
+ players:
+ minAvailable: 0
+ maxAvailable: 99
+ - matchLabels:
+ agones.dev/fleet: blue-fleet
+ - matchLabels:
+ game: my-game
+ matchExpressions:
+ - {key: tier, operator: In, values: [cache]}
+ # [Stage:Alpha]
+ # [FeatureFlag:StateAllocationFilter]
+ # Specifies which State is the filter to be used when attempting to retrieve a GameServer
+ # via Allocation. Defaults to "Ready". The only other option is "Allocated", which can be used in conjunction with
+ # label/annotation/player selectors to retrieve an already Allocated GameServer.
+ gameServerState: Ready
+ # [Stage:Alpha]
+ # [FeatureFlag:PlayerAllocationFilter]
+ # Provides a filter on minimum and maximum values for player capacity when retrieving a GameServer
+ # through Allocation. Defaults to no limits.
+ players:
+ minAvailable: 0
+ maxAvailable: 99
+ # defines how GameServers are organised across the cluster.
+ # Options include:
+ # "Packed" (default) is aimed at dynamic Kubernetes clusters, such as cloud providers, wherein we want to bin pack
+ # resources
+ # "Distributed" is aimed at static Kubernetes clusters, wherein we want to distribute resources across the entire
+ # cluster
+ scheduling: Packed
+ # Optional custom metadata that is added to the game server at allocation
+ # You can use this to tell the server necessary session data
+ metadata:
+ labels:
+ mode: deathmatch
+ annotations:
+ map: garden22
+ {{< /tab >}}
+ {{< tab header="required & preferred (deprecated)" lang="yaml" >}}
+apiVersion: "allocation.agones.dev/v1"
+kind: GameServerAllocation
+spec:
+ # Deprecated, use field selectors instead.
+ # GameServer selector from which to choose GameServers from.
+ # Defaults to all GameServers.
+ # matchLabels, matchExpressions, gameServerState and player filters can be used for filtering.
+ # See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ for more details on label selectors.
+ # Deprecated, use field selectors instead.
required:
matchLabels:
game: my-game
@@ -107,6 +163,7 @@ spec:
players:
minAvailable: 0
maxAvailable: 99
+ # Deprecated, use field selectors instead.
# An ordered list of preferred GameServer label selectors
# that are optional to be fulfilled, but will be searched before the `required` selector.
# If the first selector is not matched, the selection attempts the second selector, and so on.
@@ -137,18 +194,23 @@ spec:
mode: deathmatch
annotations:
map: garden22
-```
+ {{< /tab >}}
+{{< /tabpane >}}
The `spec` field is the actual `GameServerAllocation` specification, and it is composed as follows:
-- `required` is a [GameServerSelector][gameserverselector]
+- Deprecated, use `selectors` instead. If `selectors` is set, this field will be ignored.
+ `required` is a [GameServerSelector][gameserverselector]
(matchLabels. matchExpressions, gameServerState and player filters) from which to choose GameServers from.
-- `preferred` is an ordered list of preferred
- [GameServerSelector][gameserverselector]
+- Deprecated, use `selectors` instead. If `selectors` is set, this field will be ignored.
+ `preferred` is an ordered list of preferred [GameServerSelector][gameserverselector]
that are _optional_ to be fulfilled, but will be searched before the `required` selector.
If the first selector is not matched, the selection attempts the second selector, and so on.
If any of the `preferred` selectors are matched, the `required` selector is not considered.
This is useful for things like smoke testing of new game servers.
+- `selectors` is an ordered list of [GameServerSelector][gameserverselector].
+ If the first selector is not matched, the selection attempts the second selector, and so on.
+ This is useful for things like smoke testing of new game servers.
- `scheduling` defines how GameServers are organised across the cluster, in this case specifically when allocating
`GameServers` for usage.
"Packed" (default) is aimed at dynamic Kubernetes clusters, such as cloud providers, wherein we want to bin pack
diff --git a/test/e2e/allocator_test.go b/test/e2e/allocator_test.go
index 983f3b137c..7c7378fe14 100644
--- a/test/e2e/allocator_test.go
+++ b/test/e2e/allocator_test.go
@@ -61,7 +61,7 @@ const (
allocatorClientSecretNamespace = "default"
)
-func TestAllocator(t *testing.T) {
+func TestAllocatorWithDeprecatedRequired(t *testing.T) {
ctx := context.Background()
ip, port := getAllocatorEndpoint(ctx, t)
@@ -117,6 +117,7 @@ func TestAllocator(t *testing.T) {
// let's do a re-allocation
if runtime.FeatureEnabled(runtime.FeatureStateAllocationFilter) && runtime.FeatureEnabled(runtime.FeaturePlayerAllocationFilter) {
logrus.Info("testing state allocation filter")
+ // nolint:staticcheck
request.PreferredGameServerSelectors[0].GameServerState = pb.GameServerSelector_ALLOCATED
allocatedResponse, err := grpcClient.Allocate(context.Background(), request)
require.NoError(t, err)
@@ -125,6 +126,7 @@ func TestAllocator(t *testing.T) {
// do a capacity based allocation
logrus.Info("testing capacity allocation filter")
+ // nolint:staticcheck
request.PreferredGameServerSelectors[0].Players = &pb.PlayerSelector{
MinAvailable: 5,
MaxAvailable: 10,
@@ -135,8 +137,11 @@ func TestAllocator(t *testing.T) {
validateAllocatorResponse(t, allocatedResponse)
// do a capacity based allocation that should fail
+ // nolint:staticcheck
request.PreferredGameServerSelectors = nil
+ // nolint:staticcheck
request.RequiredGameServerSelector.GameServerState = pb.GameServerSelector_ALLOCATED
+ // nolint:staticcheck
request.RequiredGameServerSelector.Players = &pb.PlayerSelector{MinAvailable: 99, MaxAvailable: 200}
allocatedResponse, err = grpcClient.Allocate(context.Background(), request)
@@ -152,7 +157,96 @@ func TestAllocator(t *testing.T) {
assert.NoError(t, err)
}
-func TestRestAllocator(t *testing.T) {
+func TestAllocatorWithSelectors(t *testing.T) {
+ ctx := context.Background()
+
+ ip, port := getAllocatorEndpoint(ctx, t)
+ requestURL := fmt.Sprintf(allocatorReqURLFmt, ip, port)
+ tlsCA := refreshAllocatorTLSCerts(ctx, t, ip)
+
+ var flt *agonesv1.Fleet
+ var err error
+ if runtime.FeatureEnabled(runtime.FeaturePlayerAllocationFilter) {
+ flt, err = createFleetWithOpts(ctx, framework.Namespace, func(f *agonesv1.Fleet) {
+ f.Spec.Template.Spec.Players = &agonesv1.PlayersSpec{
+ InitialCapacity: 10,
+ }
+ })
+ } else {
+ flt, err = createFleet(ctx, framework.Namespace)
+ }
+ assert.NoError(t, err)
+
+ framework.AssertFleetCondition(t, flt, e2e.FleetReadyCount(flt.Spec.Replicas))
+ request := &pb.AllocationRequest{
+ Namespace: framework.Namespace,
+ GameServerSelectors: []*pb.GameServerSelector{{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Scheduling: pb.AllocationRequest_Packed,
+ Metadata: &pb.MetaPatch{Labels: map[string]string{"gslabel": "allocatedbytest"}},
+ }
+
+ var response *pb.AllocationResponse
+ // wait for the allocation system to come online
+ err = wait.PollImmediate(2*time.Second, 5*time.Minute, func() (bool, error) {
+ // create the grpc client each time, as we may end up looking at an old cert
+ dialOpts, err := createRemoteClusterDialOption(ctx, allocatorClientSecretNamespace, allocatorClientSecretName, tlsCA)
+ if err != nil {
+ return false, err
+ }
+
+ conn, err := grpc.Dial(requestURL, dialOpts)
+ if err != nil {
+ logrus.WithError(err).Info("failing grpc.Dial")
+ return false, nil
+ }
+ defer conn.Close() // nolint: errcheck
+
+ grpcClient := pb.NewAllocationServiceClient(conn)
+ response, err = grpcClient.Allocate(context.Background(), request)
+ if err != nil {
+ logrus.WithError(err).Info("failing Allocate request")
+ return false, nil
+ }
+ validateAllocatorResponse(t, response)
+
+ // let's do a re-allocation
+ if runtime.FeatureEnabled(runtime.FeatureStateAllocationFilter) && runtime.FeatureEnabled(runtime.FeaturePlayerAllocationFilter) {
+ logrus.Info("testing state allocation filter")
+ request.GameServerSelectors[0].GameServerState = pb.GameServerSelector_ALLOCATED
+ allocatedResponse, err := grpcClient.Allocate(context.Background(), request)
+ require.NoError(t, err)
+ require.Equal(t, response.GameServerName, allocatedResponse.GameServerName)
+ validateAllocatorResponse(t, allocatedResponse)
+
+ // do a capacity based allocation
+ logrus.Info("testing capacity allocation filter")
+ request.GameServerSelectors[0].Players = &pb.PlayerSelector{
+ MinAvailable: 5,
+ MaxAvailable: 10,
+ }
+ allocatedResponse, err = grpcClient.Allocate(context.Background(), request)
+ require.NoError(t, err)
+ require.Equal(t, response.GameServerName, allocatedResponse.GameServerName)
+ validateAllocatorResponse(t, allocatedResponse)
+
+ // do a capacity based allocation that should fail
+ request.GameServerSelectors[0].GameServerState = pb.GameServerSelector_ALLOCATED
+ request.GameServerSelectors[0].Players = &pb.PlayerSelector{MinAvailable: 99, MaxAvailable: 200}
+
+ allocatedResponse, err = grpcClient.Allocate(context.Background(), request)
+ assert.Nil(t, allocatedResponse)
+ status, ok := status.FromError(err)
+ require.True(t, ok)
+ assert.Equal(t, codes.ResourceExhausted, status.Code())
+ }
+
+ return true, nil
+ })
+
+ assert.NoError(t, err)
+}
+
+func TestRestAllocatorWithDeprecatedRequired(t *testing.T) {
ctx := context.Background()
ip, port := getAllocatorEndpoint(ctx, t)
@@ -216,6 +310,69 @@ func TestRestAllocator(t *testing.T) {
assert.NoError(t, err)
}
+func TestRestAllocatorWithSelectors(t *testing.T) {
+ ctx := context.Background()
+
+ ip, port := getAllocatorEndpoint(ctx, t)
+ requestURL := fmt.Sprintf(allocatorReqURLFmt, ip, port)
+ tlsCA := refreshAllocatorTLSCerts(ctx, t, ip)
+
+ flt, err := createFleet(ctx, framework.Namespace)
+ if !assert.Nil(t, err) {
+ return
+ }
+ framework.AssertFleetCondition(t, flt, e2e.FleetReadyCount(flt.Spec.Replicas))
+ request := &pb.AllocationRequest{
+ Namespace: framework.Namespace,
+ GameServerSelectors: []*pb.GameServerSelector{{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Scheduling: pb.AllocationRequest_Packed,
+ Metadata: &pb.MetaPatch{Labels: map[string]string{"gslabel": "allocatedbytest"}},
+ }
+ tlsCfg, err := getTLSConfig(ctx, allocatorClientSecretNamespace, allocatorClientSecretName, tlsCA)
+ if !assert.Nil(t, err) {
+ return
+ }
+ client := &http.Client{
+ Transport: &http.Transport{
+ TLSClientConfig: tlsCfg,
+ },
+ }
+ jsonRes, err := json.Marshal(request)
+ if !assert.Nil(t, err) {
+ return
+ }
+ req, err := http.NewRequest("POST", "https://"+requestURL+"/gameserverallocation", bytes.NewBuffer(jsonRes))
+ if !assert.Nil(t, err) {
+ logrus.WithError(err).Info("failed to create rest request")
+ return
+ }
+
+ // wait for the allocation system to come online
+ err = wait.PollImmediate(2*time.Second, 5*time.Minute, func() (bool, error) {
+ resp, err := client.Do(req)
+ if err != nil {
+ logrus.WithError(err).Info("failed Allocate rest request")
+ return false, nil
+ }
+ body, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ logrus.WithError(err).Info("failed to read Allocate response body")
+ return false, nil
+ }
+ defer resp.Body.Close() // nolint: errcheck
+ var response pb.AllocationResponse
+ err = json.Unmarshal(body, &response)
+ if err != nil {
+ logrus.WithError(err).Info("failed to unmarshal Allocate response")
+ return false, nil
+ }
+ validateAllocatorResponse(t, &response)
+ return true, nil
+ })
+
+ assert.NoError(t, err)
+}
+
// Tests multi-cluster allocation by reusing the same cluster but across namespace.
// Multi-cluster is represented as two namespaces A and B in the same cluster.
// Namespace A received the allocation request, but because namespace B has the highest priority, A will forward the request to B.
@@ -269,8 +426,8 @@ func TestAllocatorCrossNamespace(t *testing.T) {
request := &pb.AllocationRequest{
Namespace: namespaceA,
// Enable multi-cluster setting
- MultiClusterSetting: &pb.MultiClusterSetting{Enabled: true},
- RequiredGameServerSelector: &pb.GameServerSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}},
+ MultiClusterSetting: &pb.MultiClusterSetting{Enabled: true},
+ GameServerSelectors: []*pb.GameServerSelector{{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
}
// wait for the allocation system to come online
@@ -347,6 +504,7 @@ func getAllocatorEndpoint(ctx context.Context, t *testing.T) (string, int32) {
}
// createRemoteClusterDialOption creates a grpc client dial option with proper certs to make a remote call.
+//nolint:unparam
func createRemoteClusterDialOption(ctx context.Context, namespace, clientSecretName string, tlsCA []byte) (grpc.DialOption, error) {
tlsConfig, err := getTLSConfig(ctx, namespace, clientSecretName, tlsCA)
if err != nil {
diff --git a/test/e2e/fleet_test.go b/test/e2e/fleet_test.go
index b8095d8011..bb70a5c489 100644
--- a/test/e2e/fleet_test.go
+++ b/test/e2e/fleet_test.go
@@ -435,7 +435,7 @@ func TestScaleFleetUpAndDownWithGameServerAllocation(t *testing.T) {
// get an allocation
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}},
}}
gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(framework.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
@@ -556,7 +556,7 @@ func TestUpdateGameServerConfigurationInFleet(t *testing.T) {
// get an allocation
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}},
}}
gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(framework.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
@@ -774,7 +774,7 @@ func TestGameServerAllocationDuringGameServerDeletion(t *testing.T) {
time.Sleep(100 * time.Millisecond)
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}},
}}
gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(framework.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
if err != nil || gsa.Status.State == allocationv1.GameServerAllocationUnAllocated {
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index d9d02428de..dfff8ed844 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -576,8 +576,8 @@ func GetAllocation(f *agonesv1.Fleet) *allocationv1.GameServerAllocation {
// get an allocation
return &allocationv1.GameServerAllocation{
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{
- LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: f.ObjectMeta.Name}},
+ Selectors: []allocationv1.GameServerSelector{
+ {LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: f.ObjectMeta.Name}}},
},
}}
}
diff --git a/test/e2e/gameserverallocation_test.go b/test/e2e/gameserverallocation_test.go
index 2a061dbed7..d4ac3d11ee 100644
--- a/test/e2e/gameserverallocation_test.go
+++ b/test/e2e/gameserverallocation_test.go
@@ -57,15 +57,22 @@ func TestCreateFleetAndGameServerAllocate(t *testing.T) {
framework.AssertFleetCondition(t, flt, e2e.FleetReadyCount(flt.Spec.Replicas))
- gsa := &allocationv1.GameServerAllocation{
- Spec: allocationv1.GameServerAllocationSpec{
+ gsaList := []*allocationv1.GameServerAllocation{
+ {Spec: allocationv1.GameServerAllocationSpec{
Scheduling: strategy,
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
- }}
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}}},
+ },
+ {Spec: allocationv1.GameServerAllocationSpec{
+ Scheduling: strategy,
+ Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}},
+ },
+ }
- gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(fleet.ObjectMeta.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
- if assert.NoError(t, err) {
- assert.Equal(t, string(allocationv1.GameServerAllocationAllocated), string(gsa.Status.State))
+ for _, gsa := range gsaList {
+ gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(fleet.ObjectMeta.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
+ if assert.NoError(t, err) {
+ assert.Equal(t, string(allocationv1.GameServerAllocationAllocated), string(gsa.Status.State))
+ }
}
})
}
@@ -90,7 +97,7 @@ func TestCreateFleetAndGameServerStateFilterAllocation(t *testing.T) {
fleetSelector := metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}
gsa := &allocationv1.GameServerAllocation{
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: fleetSelector},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: fleetSelector}},
}}
// standard allocation
@@ -103,10 +110,10 @@ func TestCreateFleetAndGameServerStateFilterAllocation(t *testing.T) {
assert.Equal(t, agonesv1.GameServerStateAllocated, gs1.Status.State)
assert.NotNil(t, gs1.ObjectMeta.Annotations["agones.dev/last-allocated"])
- // now let's get it back again as required
+ // now let's get it back again
gsa = gsa.DeepCopy()
allocated := agonesv1.GameServerStateAllocated
- gsa.Spec.Required.GameServerState = &allocated
+ gsa.Spec.Selectors[0].GameServerState = &allocated
gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(fleet.ObjectMeta.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
require.NoError(t, err)
@@ -120,23 +127,6 @@ func TestCreateFleetAndGameServerStateFilterAllocation(t *testing.T) {
require.Equal(t, gs1.ObjectMeta.Name, gs2.ObjectMeta.Name)
require.NotEqual(t, gs1.ObjectMeta.ResourceVersion, gs2.ObjectMeta.ResourceVersion)
require.NotEqual(t, gs1.ObjectMeta.Annotations["agones.dev/last-allocated"], gs2.ObjectMeta.Annotations["agones.dev/last-allocated"])
-
- // and again as preferred
- gsa = &allocationv1.GameServerAllocation{
- Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: fleetSelector},
- Preferred: []allocationv1.GameServerSelector{
- {
- LabelSelector: fleetSelector,
- GameServerState: &allocated,
- },
- },
- }}
-
- gsa, err = framework.AgonesClient.AllocationV1().GameServerAllocations(fleet.ObjectMeta.Namespace).Create(ctx, gsa, metav1.CreateOptions{})
- require.NoError(t, err)
- assert.Equal(t, string(allocationv1.GameServerAllocationAllocated), string(gsa.Status.State))
- assert.Equal(t, gs1.ObjectMeta.Name, gsa.Status.GameServerName)
}
func TestCreateFleetAndGameServerPlayerCapacityAllocation(t *testing.T) {
@@ -160,8 +150,7 @@ func TestCreateFleetAndGameServerPlayerCapacityAllocation(t *testing.T) {
allocated := agonesv1.GameServerStateAllocated
gsa := &allocationv1.GameServerAllocation{
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: fleetSelector, Players: &allocationv1.PlayerSelector{MinAvailable: 5, MaxAvailable: 10}},
- Preferred: []allocationv1.GameServerSelector{
+ Selectors: []allocationv1.GameServerSelector{
{
LabelSelector: fleetSelector,
GameServerState: &allocated,
@@ -170,6 +159,7 @@ func TestCreateFleetAndGameServerPlayerCapacityAllocation(t *testing.T) {
MaxAvailable: 99,
},
},
+ {LabelSelector: fleetSelector, Players: &allocationv1.PlayerSelector{MinAvailable: 5, MaxAvailable: 10}},
},
}}
@@ -299,7 +289,7 @@ func TestMultiClusterAllocationOnLocalCluster(t *testing.T) {
gsa := &allocationv1.GameServerAllocation{
Spec: allocationv1.GameServerAllocationSpec{
Scheduling: strategy,
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}},
MultiClusterSetting: allocationv1.MultiClusterSetting{
Enabled: true,
PolicySelector: metav1.LabelSelector{
@@ -359,7 +349,7 @@ func TestCreateFullFleetAndCantGameServerAllocate(t *testing.T) {
gsa := &allocationv1.GameServerAllocation{
Spec: allocationv1.GameServerAllocationSpec{
Scheduling: strategy,
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}}},
}}
for i := 0; i < replicasCount; i++ {
@@ -397,7 +387,7 @@ func TestGameServerAllocationMetaDataPatch(t *testing.T) {
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{"test": t.Name()}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{"test": t.Name()}}}},
MetaPatch: allocationv1.MetaPatch{
Labels: map[string]string{"red": "blue"},
Annotations: map[string]string{"dog": "good"},
@@ -459,9 +449,9 @@ func TestGameServerAllocationPreferredSelection(t *testing.T) {
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: label}},
- Preferred: []allocationv1.GameServerSelector{
+ Selectors: []allocationv1.GameServerSelector{
{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: preferred.ObjectMeta.Name}}},
+ {LabelSelector: metav1.LabelSelector{MatchLabels: label}},
},
}}
@@ -524,7 +514,7 @@ func TestGameServerAllocationDeletionOnUnAllocate(t *testing.T) {
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{"never": "goingtohappen"}}},
+ Selectors: []allocationv1.GameServerSelector{{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{"never": "goingtohappen"}}}},
}}
gsa, err := allocations.Create(ctx, gsa.DeepCopy(), metav1.CreateOptions{})
@@ -558,9 +548,9 @@ func TestGameServerAllocationDuringMultipleAllocationClients(t *testing.T) {
gsa := &allocationv1.GameServerAllocation{ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: label}},
- Preferred: []allocationv1.GameServerSelector{
+ Selectors: []allocationv1.GameServerSelector{
{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: "preferred"}}},
+ {LabelSelector: metav1.LabelSelector{MatchLabels: label}},
},
}}
diff --git a/test/load/allocation/allocationload.go b/test/load/allocation/allocationload.go
index 1615eef8ac..7f030a0bb5 100644
--- a/test/load/allocation/allocationload.go
+++ b/test/load/allocation/allocationload.go
@@ -68,8 +68,7 @@ func allocate(framework *e2eframework.Framework, numOfClients int, fleetName str
gsa := &allocationv1.GameServerAllocation{
ObjectMeta: metav1.ObjectMeta{GenerateName: "allocation-"},
Spec: allocationv1.GameServerAllocationSpec{
- Required: allocationv1.GameServerSelector{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: fleetName}}},
- Preferred: []allocationv1.GameServerSelector{
+ Selectors: []allocationv1.GameServerSelector{
{LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: fleetName}}},
},
},
|