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.

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

Update the simple game server version to 0.6. #2413

Merged
merged 1 commit into from
Dec 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ KIND_PROFILE ?= agones
KIND_CONTAINER_NAME=$(KIND_PROFILE)-control-plane

# Game Server image to use while doing end-to-end tests
GS_TEST_IMAGE ?= gcr.io/agones-images/simple-game-server:0.5
GS_TEST_IMAGE ?= gcr.io/agones-images/simple-game-server:0.6

ALPHA_FEATURE_GATES ?= "PlayerTracking=true&StateAllocationFilter=true&PlayerAllocationFilter=true&CustomFasSyncInterval=true"

Expand Down
2 changes: 1 addition & 1 deletion examples/crd-client/create-gs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ spec:
imagePullPolicy: Always
env:
- name: GAMESERVER_IMAGE
value: "gcr.io/agones-images/simple-game-server:0.5"
value: "gcr.io/agones-images/simple-game-server:0.6"
restartPolicy: Never
2 changes: 1 addition & 1 deletion examples/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
2 changes: 1 addition & 1 deletion examples/gameserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
imagePullPolicy: Always
# nodeSelector is a label that can be used to tell Kubernetes which host
# OS to use. For Windows game servers uncomment the nodeSelector
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/dev-gameserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
2 changes: 1 addition & 1 deletion examples/simple-game-server/fleet-distributed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/fleet-tcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
env:
# Disables the UDP listener (Enabled by default)
- name: "UDP"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/gameserver-passthrough.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
env:
- name: "PASSTHROUGH"
value: "TRUE"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/gameserver-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/gameserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion install/helm/agones/templates/tests/test-runner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
imagePullPolicy: Always
env:
- name: GAMESERVER_IMAGE
value: "gcr.io/agones-images/simple-game-server:0.5"
value: "gcr.io/agones-images/simple-game-server:0.6"
- name: IS_HELM_TEST
value: "true"
- name: GAMESERVERS_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/webhooks/webhooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) {
"template": {
"spec": {
"containers": [{
"image": "gcr.io/agones-images/simple-game-server:0.5",
"image": "gcr.io/agones-images/simple-game-server:0.6",
"name": false
}]
}
Expand Down
2 changes: 1 addition & 1 deletion site/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ dev_aks_minor_supported_k8s = "2"
dev_minikube_minor_supported_k8s = "5"

# example tag
example_image_tag = "gcr.io/agones-images/simple-game-server:0.5"
example_image_tag = "gcr.io/agones-images/simple-game-server:0.6"

# Enable syntax highlighting and copy buttons on code blocks with Prism
prism_syntax_highlighting = true
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func NewFromFlags() (*Framework, error) {
}

viper.SetDefault(kubeconfigFlag, filepath.Join(usr.HomeDir, ".kube", "config"))
viper.SetDefault(gsimageFlag, "gcr.io/agones-images/simple-game-server:0.5")
viper.SetDefault(gsimageFlag, "gcr.io/agones-images/simple-game-server:0.6")
viper.SetDefault(pullSecretFlag, "")
viper.SetDefault(stressTestLevelFlag, 0)
viper.SetDefault(perfOutputDirFlag, "")
Expand All @@ -166,7 +166,7 @@ func NewFromFlags() (*Framework, error) {
viper.SetDefault(namespaceFlag, "")

pflag.String(kubeconfigFlag, viper.GetString(kubeconfigFlag), "kube config path, e.g. $HOME/.kube/config")
pflag.String(gsimageFlag, viper.GetString(gsimageFlag), "gameserver image to use for those tests, gcr.io/agones-images/simple-game-server:0.5")
pflag.String(gsimageFlag, viper.GetString(gsimageFlag), "gameserver image to use for those tests, gcr.io/agones-images/simple-game-server:0.6")
pflag.String(pullSecretFlag, viper.GetString(pullSecretFlag), "optional secret to be used for pulling the gameserver and/or Agones SDK sidecar images")
pflag.Int(stressTestLevelFlag, viper.GetInt(stressTestLevelFlag), "enable stress test at given level 0-100")
pflag.String(perfOutputDirFlag, viper.GetString(perfOutputDirFlag), "write performance statistics to the specified directory")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/gameserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ spec:
preferredDuringSchedulingIgnoredDuringExecution: ERROR
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
`
err := ioutil.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0644)
require.NoError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions test/load/allocation/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This is a load test to determine Allocation QPS over time against a set of GameServers that are constantly being shutdown after a period.

This test creates a configured amount of GameServers at the initial step, switches them to Allocated state and finally
shuts them down (`automaticShutdownDelayMin` flag in a simple-game-server).
This test creates a configured amount of GameServers at the initial step, switches them to Allocated state and finally
shuts them down (`automaticShutdownDelaySec` flag in a simple-game-server).

1) Run kubectl apply -f ./fleet.yaml
2) Run `runAllocation.sh` script to perform this test. You can provide a number of runs as a parameter (3 is a default value). There is a 500 seconds pause after each run.
Expand Down
4 changes: 2 additions & 2 deletions test/load/allocation/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.5
image: gcr.io/agones-images/simple-game-server:0.6
resources:
requests:
memory: "64Mi"
Expand All @@ -36,4 +36,4 @@ spec:
memory: "64Mi"
cpu: "20m"
args:
- "-automaticShutdownDelayMin=1"
- "-automaticShutdownDelaySec=60"
8 changes: 4 additions & 4 deletions test/load/allocation/grpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Here are the few important things:
## Fleet Setting

We used the sample [fleet configuration](./fleet.yaml) with some minor modifications. We updated the `replicas` to 4000.
Also we set the `automaticShutdownDelayMin` parameter to 10 so simple-game-server game servers shutdown after 10
Also we set the `automaticShutdownDelaySec` parameter to 10 so simple-game-server game servers shutdown after 10
minutes (see below).
This helps to easily re-run the test without having to delete the game servers and allows to run tests continously.

Expand All @@ -32,8 +32,8 @@ kind: Fleet
containers:
- args:
# We setup the simple-game-server server to shutdown 10 mins after allocation
- -automaticShutdownDelayMin=10
image: gcr.io/agones-images/simple-game-server:0.3
- -automaticShutdownDelaySec=600
image: gcr.io/agones-images/simple-game-server:0.6
name: simple-game-server
...
```
Expand All @@ -45,7 +45,7 @@ For more information visit [Allocator Service](https://agones.dev/site/docs/adva

## Running the test

You can use the provided runAllocation.sh script by providing two parameters:
You can use the provided runAllocation.sh script by providing two parameters:
- number of clients (to do parallel allocations)
- number of allocations for client

Expand Down
4 changes: 2 additions & 2 deletions test/load/allocation/grpc/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ spec:
containers:
- args:
# We setup the simple-game-server server to shutdown 10 mins after allocation
- -automaticShutdownDelayMin=10
image: gcr.io/agones-images/simple-game-server:0.5
- -automaticShutdownDelaySec=600
image: gcr.io/agones-images/simple-game-server:0.6
name: simple-game-server
resources:
limits:
Expand Down