Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Counter and List Priorities: Set Default to Ascending for Fleet and G… #3736

Closed
wants to merge 1 commit into from
Closed

Counter and List Priorities: Set Default to Ascending for Fleet and G… #3736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions install/helm/agones/templates/crds/fleet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ spec:
enum:
- Ascending
- Descending
default: Ascending
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to run make gen-install please 😄

template:
{{- $data := dict "metadata" true "podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields }}
{{- include "gameserver.schema" $data | indent 17 }}
Expand Down
14 changes: 11 additions & 3 deletions pkg/apis/allocation/v1/gameserverallocation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ import (
"errors"
"fmt"

"agones.dev/agones/pkg/apis"
agonesv1 "agones.dev/agones/pkg/apis/agones/v1"
"agones.dev/agones/pkg/util/runtime"
"github.com/mitchellh/hashstructure/v2"
corev1 "k8s.io/api/core/v1"
apivalidation "k8s.io/apimachinery/pkg/api/validation"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/validation/field"

"agones.dev/agones/pkg/apis"
agonesv1 "agones.dev/agones/pkg/apis/agones/v1"
"agones.dev/agones/pkg/util/runtime"
)

const (
Expand Down Expand Up @@ -564,6 +565,13 @@ type GameServerMetadata struct {

// ApplyDefaults applies the default values to this GameServerAllocation
func (gsa *GameServerAllocation) ApplyDefaults() {
if len(gsa.Spec.Priorities) == 0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add tests to:

agones/pkg/apis/allocation/v1/gameserverallocation_test.go

Line 31 in a1a1cd9

func TestGameServerAllocationApplyDefaults(t *testing.T) {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This implementation isn't correct unfortunately - #3734 has it correct - need to loop around each one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't seen the other PR. Since the correct approach is in the above mentioned PR, I will close this PR.

defaultPriority := agonesv1.Priority{
Order: "Ascending",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than a string, use:

agones/pkg/apis/agones/v1/common.go

Line 46 in e696b03

GameServerPriorityAscending string = "Ascending"

}
gsa.Spec.Priorities = []agonesv1.Priority{defaultPriority}
}

if gsa.Spec.Scheduling == "" {
gsa.Spec.Scheduling = apis.Packed
}
Expand Down
Loading