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

Update the images for all examples to use the 1.1 SDKs #1153

Merged
merged 5 commits into from
Oct 28, 2019
Merged

Update the images for all examples to use the 1.1 SDKs #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b45707
Update the images for all examples to use the 1.1 SDKs.
roberthbailey Oct 26, 2019
b91bcf3
Update alpine for the example go images to fix a security vulnerability.
roberthbailey Oct 26, 2019
6cca410
Update the sample yaml files to the new image versions.
roberthbailey Oct 28, 2019
3ef5287
Update the website docs to the new simple udp image.
roberthbailey Oct 28, 2019
660f1ed
Update tests to use the new simple udp container.
roberthbailey Oct 28, 2019
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 @@ -57,7 +57,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/udp-server:0.15
GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.17

# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-simple/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/cpp-simple-server:0.10
server_tag = $(REPOSITORY)/cpp-simple-server:0.11
root_path = $(realpath $(project_path)/../..)

# _____ _
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-simple/fleet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ spec:
spec:
containers:
- name: cpp-simple
image: gcr.io/agones-images/cpp-simple-server:0.9
image: gcr.io/agones-images/cpp-simple-server:0.11
# imagePullPolicy: Always # add for development
2 changes: 1 addition & 1 deletion examples/cpp-simple/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ spec:
spec:
containers:
- name: cpp-simple
image: gcr.io/agones-images/cpp-simple-server:0.9
image: gcr.io/agones-images/cpp-simple-server:0.11
imagePullPolicy: Always # add for development
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 @@ -74,4 +74,4 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
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 @@ -85,5 +85,5 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion examples/nodejs-simple/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/nodejs-simple-server:0.1
server_tag = $(REPOSITORY)/nodejs-simple-server:0.2
root_path = $(realpath $(project_path)/../..)

# _____ _
Expand Down
2 changes: 1 addition & 1 deletion examples/nodejs-simple/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ spec:
spec:
containers:
- name: nodejs-simple
image: gcr.io/agones-images/nodejs-simple-server:0.1
image: gcr.io/agones-images/nodejs-simple-server:0.2
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion examples/rust-simple/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ REPOSITORY ?= gcr.io/agones-images

mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/rust-simple-server:0.5
server_tag = $(REPOSITORY)/rust-simple-server:0.6

# _____ _
# |_ _|_ _ _ __ __ _ ___| |_ ___
Expand Down
2 changes: 1 addition & 1 deletion examples/rust-simple/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ spec:
spec:
containers:
- name: rust-simple
image: gcr.io/agones-images/rust-simple-server:0.4
image: gcr.io/agones-images/rust-simple-server:0.6
imagePullPolicy: Always
4 changes: 2 additions & 2 deletions examples/simple-tcp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ COPY . /go/src/agones.dev/agones
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .

# final image
FROM alpine:3.9
FROM alpine:3.10

RUN adduser -D server
COPY --from=builder /go/src/simple-tcp/server /home/server/server
RUN chown -R server /home/server && \
chmod o+x /home/server/server

USER server
ENTRYPOINT ["/home/server/server"]
ENTRYPOINT ["/home/server/server"]
2 changes: 1 addition & 1 deletion examples/simple-tcp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ REPOSITORY = gcr.io/agones-images

mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/tcp-server:0.1
server_tag = $(REPOSITORY)/tcp-server:0.3
root_path = $(realpath $(project_path)/../..)

# _____ _
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-tcp/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
spec:
containers:
- name: simple-tcp
image: gcr.io/agones-images/tcp-server:0.1
image: gcr.io/agones-images/tcp-server:0.3
resources:
requests:
memory: "32Mi"
Expand Down
4 changes: 2 additions & 2 deletions examples/simple-udp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ COPY . /go/src/agones.dev/agones
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .

# final image
FROM alpine:3.9
FROM alpine:3.10

RUN adduser -D server
COPY --from=builder /go/src/simple-udp/server /home/server/server
RUN chown -R server /home/server && \
chmod o+x /home/server/server

USER server
ENTRYPOINT ["/home/server/server"]
ENTRYPOINT ["/home/server/server"]
2 changes: 1 addition & 1 deletion examples/simple-udp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.15
server_tag = $(REPOSITORY)/udp-server:0.17
root_path = $(realpath $(project_path)/../..)

# _____ _
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/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-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
2 changes: 1 addition & 1 deletion examples/simple-udp/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-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
resources:
requests:
memory: "32Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/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-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/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-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
env:
- name: "PASSTHROUGH"
value: "TRUE"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/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-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
resources:
requests:
memory: "32Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/gameserverset.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-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
2 changes: 1 addition & 1 deletion examples/unity-simple/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images

mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/unity-simple-server:0.2
server_tag = $(REPOSITORY)/unity-simple-server:0.3

# _____ _
# |_ _|_ _ _ __ __ _ ___| |_ ___
Expand Down
2 changes: 1 addition & 1 deletion examples/unity-simple/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
spec:
containers:
- name: unity-simple-server
image: gcr.io/agones-images/unity-simple-server:0.2
image: gcr.io/agones-images/unity-simple-server:0.3
resources:
requests:
memory: "128Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/xonotic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
root_path := $(realpath $(project_path)/../..)
image_tag = $(REPOSITORY)/xonotic-example:0.6
image_tag = $(REPOSITORY)/xonotic-example:0.7

# _____ _
# |_ _|_ _ _ __ __ _ ___| |_ ___
Expand Down
2 changes: 1 addition & 1 deletion examples/xonotic/fleet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ spec:
spec:
containers:
- name: xonotic
image: gcr.io/agones-images/xonotic-example:0.6
image: gcr.io/agones-images/xonotic-example:0.7
2 changes: 1 addition & 1 deletion examples/xonotic/gameserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ spec:
spec:
containers:
- name: xonotic
image: gcr.io/agones-images/xonotic-example:0.6
image: gcr.io/agones-images/xonotic-example:0.7
# imagePullPolicy: Always # add for development
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 @@ -164,7 +164,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) {
"template": {
"spec": {
"containers": [{
"image": "gcr.io/agones-images/udp-server:0.15",
"image": "gcr.io/agones-images/udp-server:0.17",
"name": false
}]
}
Expand Down
2 changes: 1 addition & 1 deletion site/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ release_branch = "release-1.0.0"
release_version = "1.0.0"

# example tag
example_image_tag = "gcr.io/agones-images/udp-server:0.15"
example_image_tag = "gcr.io/agones-images/udp-server:0.17"

# User interface configuration
[params.ui]
Expand Down
25 changes: 25 additions & 0 deletions site/content/en/docs/Guides/local-game-server.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ You can register a local game server with Agones. This means you can run an expe

To register your local game server you'll need to know the IP address of the machine running it and the port. With that you'll create a game server config like the one below.

{{% feature expiryVersion="1.1.0" %}}
```yaml
apiVersion: "agones.dev/v1"
kind: GameServer
Expand All @@ -34,6 +35,30 @@ spec:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.15
```
{{% /feature %}}
{{% feature publishVersion="1.1.0" %}}
```yaml
apiVersion: "agones.dev/v1"
kind: GameServer
metadata:
name: my-local-server
annotations:
# Causes Agones to register your local game server at 192.1.1.2, replace with your server's IP address.
agones.dev/dev-address: "192.1.1.2"
spec:
ports:
- name: default
portPolicy: Static
hostPort: 17654
containerPort: 17654
# The following is ignored but required due to validation.
template:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.17
```
{{% /feature %}}

Once you save this to a file make sure you have `kubectl` configured to point to your Agones cluster and then run `kubectl apply -f dev-gameserver.yaml`. This will register your server with Agones.

Expand Down
8 changes: 4 additions & 4 deletions site/content/en/docs/Guides/troubleshooting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Spec:
Creation Timestamp: <nil>
Spec:
Containers:
Image: gcr.io/agones-images/udp-server:0.15
Image: gcr.io/agones-images/udp-server:0.17
Name: simple-udp
Resources:
Limits:
Expand Down Expand Up @@ -82,7 +82,7 @@ Events:
The backing Pod has the same name as the `GameServer` - so it's also worth looking at the
details and events for the Pod to see if there are any issues there, such as restarts due to binary crashes etc.

For example, you can see the restart count on the gcr.io/agones-images/udp-server:0.15 container
For example, you can see the restart count on the gcr.io/agones-images/udp-server:0.17 container
is set to `1`, due to the game server binary crash

```
Expand All @@ -104,7 +104,7 @@ Controlled By: GameServer/simple-udp-zqppv
Containers:
simple-udp:
Container ID: docker://69eacd03cc89b0636b78abe47926b02183ba84d18fa20649ca443f5232511661
Image: gcr.io/agones-images/udp-server:0.15
Image: gcr.io/agones-images/udp-server:0.17
Image ID: docker-pullable://gcr.io/agones-images/udp-server@sha256:6a60eff5e68b88b5ce75ae98082d79cff36cda411a090f3495760e5c3b6c3575
Port: 7654/UDP
Host Port: 7058/UDP
Expand Down Expand Up @@ -173,7 +173,7 @@ Events:
Normal Created 2m28s kubelet, gke-test-cluster-default-590db5e4-4s6r Created container
Normal Created 114s (x2 over 2m31s) kubelet, gke-test-cluster-default-590db5e4-4s6r Created container
Normal Started 114s (x2 over 2m31s) kubelet, gke-test-cluster-default-590db5e4-4s6r Started container
Normal Pulled 114s (x2 over 2m31s) kubelet, gke-test-cluster-default-590db5e4-4s6r Container image "gcr.io/agones-images/udp-server:0.15" already present on machine
Normal Pulled 114s (x2 over 2m31s) kubelet, gke-test-cluster-default-590db5e4-4s6r Container image "gcr.io/agones-images/udp-server:0.17" already present on machine
```

Finally, you can also get the logs of your `GameServer` `Pod` as well via `kubectl logs <pod name> -c <game server container name>`, for example:
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Reference/fleet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
```
{{% /feature %}}

Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Reference/gameserver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.15
image: gcr.io/agones-images/udp-server:0.17
imagePullPolicy: Always
```
{{% /feature %}}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.15",
"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.15")
gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.17",
"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.17")
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")
Expand Down