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

Update the simple game server image to 0.3. #2048

Merged
merged 1 commit into from
Apr 5, 2021
+31 −31
Merged

Update the simple game server image to 0.3. #2048

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
2 changes: 1 addition & 1 deletion build/Makefile
View file
Open in desktop
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.2
GS_TEST_IMAGE ?= gcr.io/agones-images/simple-game-server:0.3

ALPHA_FEATURE_GATES ?= "PlayerTracking=true&NodeExternalDNS=true"

Expand Down
2 changes: 1 addition & 1 deletion examples/crd-client/create-gs.yaml
View file
Open in desktop
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.2"
value: "gcr.io/agones-images/simple-game-server:0.3"
restartPolicy: Never
2 changes: 1 addition & 1 deletion examples/fleet.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
2 changes: 1 addition & 1 deletion examples/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ spec:
spec:
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.2
image: gcr.io/agones-images/simple-game-server:0.3
imagePullPolicy: Always
4 changes: 2 additions & 2 deletions examples/simple-game-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ WITH_WINDOWS=1

mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REGISTRY)/simple-game-server:0.2
server_tag = $(REGISTRY)/simple-game-server:0.3
ifeq ($(WITH_WINDOWS), 1)
server_tag_linux_amd64 = $(server_tag)-linux_amd64
else
Expand Down Expand Up @@ -107,4 +107,4 @@ gcr-check:

#output the tag for this image
echo-image-tag:
@echo $(server_tag)
@echo $(server_tag)
2 changes: 1 addition & 1 deletion examples/simple-game-server/dev-gameserver.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
2 changes: 1 addition & 1 deletion examples/simple-game-server/fleet-distributed.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/fleet-tcp.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
env:
# Disables the UDP listener (Enabled by default)
- name: "UDP"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/fleet.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/gameserver-passthrough.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
env:
- name: "PASSTHROUGH"
value: "TRUE"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/gameserver-windows.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-game-server/gameserver.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
resources:
requests:
memory: "64Mi"
Expand Down
4 changes: 2 additions & 2 deletions install/helm/agones/templates/tests/test-runner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ spec:
imagePullPolicy: Always
env:
- name: GAMESERVER_IMAGE
value: "gcr.io/agones-images/simple-game-server:0.2"
value: "gcr.io/agones-images/simple-game-server:0.3"
- name: IS_HELM_TEST
value: "true"
- name: GAMESERVERS_NAMESPACE
value: "{{ index .Values.gameservers.namespaces 0 }}"
restartPolicy: Never
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion pkg/util/webhooks/webhooks_test.go
View file
Open in desktop
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.2",
"image": "gcr.io/agones-images/simple-game-server:0.3",
"name": false
}]
}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,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.2")
viper.SetDefault(gsimageFlag, "gcr.io/agones-images/simple-game-server:0.3")
viper.SetDefault(pullSecretFlag, "")
viper.SetDefault(stressTestLevelFlag, 0)
viper.SetDefault(perfOutputDirFlag, "")
Expand All @@ -164,7 +164,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.2")
pflag.String(gsimageFlag, viper.GetString(gsimageFlag), "gameserver image to use for those tests, gcr.io/agones-images/simple-game-server:0.3")
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ spec:
preferredDuringSchedulingIgnoredDuringExecution: ERROR
containers:
- name: simple-game-server
image: gcr.io/agones-images/simple-game-server:0.2
image: gcr.io/agones-images/simple-game-server:0.3
`
err := ioutil.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0644)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion test/load/allocation/fleet.yaml
View file
Open in desktop
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.2
image: gcr.io/agones-images/simple-game-server:0.3
resources:
requests:
memory: "64Mi"
Expand Down
12 changes: 6 additions & 6 deletions test/load/allocation/grpc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ 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
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
minutes (see below).
This helps to easily re-run the test without having to delete the game servers and allows to run tests continously.
This helps to easily re-run the test without having to delete the game servers and allows to run tests continously.

```yaml
apiVersion: "agones.dev/v1"
kind: Fleet
...
spec:
# the number of GameServers to keep Ready
# the number of GameServers to keep Ready
replicas: 4000
...
# The GameServer's Pod template
template:
spec:
containers:
- args:
# We setup the simple-game-server server to shutdown 10 mins after allocation
# We setup the simple-game-server server to shutdown 10 mins after allocation
- -automaticShutdownDelayMin=10
image: gcr.io/agones-images/simple-game-server:0.2
image: gcr.io/agones-images/simple-game-server:0.3
name: simple-game-server
...
```
Expand Down
2 changes: 1 addition & 1 deletion test/load/allocation/grpc/fleet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- 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.2
image: gcr.io/agones-images/simple-game-server:0.3
name: simple-game-server
resources:
limits:
Expand Down
6 changes: 3 additions & 3 deletions test/load/locust-files/fleet_autoscaling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def scaleUpFleet(self):
"name": "simple-game-server",
"image": (
"gcr.io/agones-images"
"/simple-game-server:0.2")
"/simple-game-server:0.3")
}
]
}
Expand Down Expand Up @@ -120,7 +120,7 @@ def scaleUpFleet(self):
"name": "simple-game-server",
"image": (
"gcr.io/agones-images"
"/simple-game-server:0.2")
"/simple-game-server:0.3")
}
]
}
Expand Down Expand Up @@ -174,7 +174,7 @@ def scaleUpFleet(self):
"name": "simple-game-server",
"image": (
"gcr.io/agones-images"
"/simple-game-server:0.2")
"/simple-game-server:0.3")
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion test/load/locust-files/gameserver_allocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def create_fleet(self, client, fleet_name, fleet_size):
"name": "simple-game-server",
"image": (
"gcr.io/agones-images"
"/simple-game-server:0.2"),
"/simple-game-server:0.3"),
"resources": {
"limits": {
"cpu": "20m",
Expand Down