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 images with latest everything #1261 #1344

Merged
merged 7 commits into from
Feb 25, 2020
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 @@ -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.17
GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.18

# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
Expand Down
4 changes: 2 additions & 2 deletions examples/allocator-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Gather dependencies and build the executable
FROM golang:1.10.3 as builder
FROM golang:1.13.7 as builder

WORKDIR /go/src/agones.dev
# TODO: Clone from the latest release branch instead of from the master branch.
Expand All @@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o service .


# Create the final image that will run the allocator service
FROM alpine:3.8
FROM alpine:3.11
RUN apk add --update ca-certificates
RUN adduser -D -u 1000 service

Expand Down
4 changes: 2 additions & 2 deletions examples/autoscaler-webhook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# limitations under the License.

# Gather dependencies and build the executable
FROM golang:1.11.5 as builder
FROM golang:1.13.7 as builder
WORKDIR /go/src/autoscaler-webhook

COPY examples/autoscaler-webhook/main.go .
COPY . /go/src/agones.dev/agones
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .

# Create the final image that will run the webhook server for FleetAutoscaler webhook policy
FROM alpine:3.8
FROM alpine:3.11
RUN adduser -D -u 1000 server

COPY --from=builder /go/src/autoscaler-webhook \
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscaler-webhook/autoscaler-service-tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
secretName: autoscalersecret
containers:
- name: autoscaler-webhook
image: gcr.io/agones-images/autoscaler-webhook:0.2
image: gcr.io/agones-images/autoscaler-webhook:0.3
imagePullPolicy: Always
volumeMounts:
- mountPath: /home/service/certs
Expand Down
2 changes: 1 addition & 1 deletion examples/autoscaler-webhook/autoscaler-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
#serviceAccount: autoscaler-webhook
containers:
- name: autoscaler-webhook
image: gcr.io/agones-images/autoscaler-webhook:0.2
image: gcr.io/agones-images/autoscaler-webhook:0.3
imagePullPolicy: Always
ports:
- name: autoscaler
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-simple/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcc:8 as builder
FROM gcc:9 as builder

WORKDIR /project

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-simple/fleet.yaml
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.11
image: gcr.io/agones-images/cpp-simple-server:0.12
# imagePullPolicy: Always # add for development
2 changes: 1 addition & 1 deletion examples/cpp-simple/gameserver.yaml
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.11
image: gcr.io/agones-images/cpp-simple-server:0.12
imagePullPolicy: Always # add for development
4 changes: 2 additions & 2 deletions examples/crd-client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# limitations under the License.

# Gather dependencies and build the executable
FROM golang:1.13.1 as builder
FROM golang:1.13.7 as builder
WORKDIR /go/src/crd-client

COPY ./main.go .
COPY ./go.mod ./
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o client .

# Create the final image that will run the webhook server for FleetAutoscaler webhook policy
FROM alpine:3.8
FROM alpine:3.11
RUN adduser -D -u 1000 client

COPY --from=builder /go/src/crd-client \
Expand Down
4 changes: 2 additions & 2 deletions examples/crd-client/create-gs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ spec:
serviceAccountName: agones-controller
containers:
- name: create-gameserver
image: gcr.io/agones-images/crd-client:0.1
image: gcr.io/agones-images/crd-client:0.2
imagePullPolicy: Always
env:
- name: GAMESERVER_IMAGE
value: "gcr.io/agones-images/udp-server:0.17"
value: "gcr.io/agones-images/udp-server:0.18"
restartPolicy: Never
2 changes: 1 addition & 1 deletion examples/crd-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
const (
gameServerImage = "GAMESERVER_IMAGE"

defaultImage = "gcr.io/agones-images/udp-server:0.17"
defaultImage = "gcr.io/agones-images/udp-server:0.18"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/fleet.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
2 changes: 1 addition & 1 deletion examples/gameserver.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion examples/rust-simple/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM rust:1.36.0 as builder
FROM rust:1.41.0 as builder
RUN useradd -m build

# Rust SDK depends on https://github.com/pingcap/grpc-rs and it requires CMake and Go
Expand Down
2 changes: 1 addition & 1 deletion examples/rust-simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $ make run-image

You will see the following output:
```
docker run --network=host gcr.io/agones-images/rust-simple-server:0.4
docker run --network=host gcr.io/agones-images/rust-simple-server:0.7
Rust Game Server has started!
Creating SDK instance
Setting a label
Expand Down
2 changes: 1 addition & 1 deletion examples/rust-simple/gameserver.yaml
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.6
image: gcr.io/agones-images/rust-simple-server:0.7
imagePullPolicy: Always
4 changes: 2 additions & 2 deletions examples/simple-tcp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# limitations under the License.

# build
FROM golang:1.11.5 as builder
FROM golang:1.13.7 as builder
WORKDIR /go/src/simple-tcp

COPY examples/simple-tcp/main.go .
COPY . /go/src/agones.dev/agones
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .

# final image
FROM alpine:3.10
FROM alpine:3.11

RUN adduser -D -u 1000 server
COPY --from=builder /go/src/simple-tcp/server /home/server/server
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-tcp/gameserver.yaml
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.3
image: gcr.io/agones-images/tcp-server:0.4
resources:
requests:
memory: "32Mi"
Expand Down
4 changes: 2 additions & 2 deletions examples/simple-udp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# limitations under the License.

# build
FROM golang:1.11.5 as builder
FROM golang:1.13.7 as builder
WORKDIR /go/src/simple-udp

COPY examples/simple-udp/main.go .
COPY . /go/src/agones.dev/agones
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .

# final image
FROM alpine:3.10
FROM alpine:3.11

RUN adduser -D -u 1000 server
COPY --from=builder /go/src/simple-udp/server /home/server/server
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/dev-gameserver.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
2 changes: 1 addition & 1 deletion examples/simple-udp/fleet-distributed.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
resources:
requests:
memory: "32Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/fleet.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
resources:
requests:
memory: "64Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/gameserver-passthrough.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
env:
- name: "PASSTHROUGH"
value: "TRUE"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/gameserver.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
resources:
requests:
memory: "32Mi"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-udp/gameserverset.yaml
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.17
image: gcr.io/agones-images/udp-server:0.18
2 changes: 1 addition & 1 deletion examples/xonotic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# build
FROM golang:1.11.5 as builder
FROM golang:1.13.7 as builder
WORKDIR /go/src/xonotic

RUN apt-get update && apt-get install -y unzip curl
Expand Down
2 changes: 1 addition & 1 deletion examples/xonotic/fleet.yaml
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.7
image: gcr.io/agones-images/xonotic-example:0.8
2 changes: 1 addition & 1 deletion examples/xonotic/gameserver.yaml
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.7
image: gcr.io/agones-images/xonotic-example:0.8
# imagePullPolicy: Always # add for development
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/udp-server:0.17",
"image": "gcr.io/agones-images/udp-server:0.18",
"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 @@ -91,7 +91,7 @@ release_branch = "release-1.3.0"
release_version = "1.3.0"

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

# User interface configuration
[params.ui]
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Guides/local-game-server.md
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.17
image: gcr.io/agones-images/udp-server:0.18
```

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
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.17
Image: gcr.io/agones-images/udp-server:0.18
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.17 container
For example, you can see the restart count on the gcr.io/agones-images/udp-server:0.18 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.17
Image: gcr.io/agones-images/udp-server:0.18
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.17" 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.18" 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
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.17
image: gcr.io/agones-images/udp-server:0.18
```

Since Agones defines a new
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Reference/gameserver.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.17
image: gcr.io/agones-images/udp-server:0.18
imagePullPolicy: Always
```

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/fleetautoscaler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ func defaultAutoscalerWebhook() (*corev1.Pod, *corev1.Service) {
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "webhook",
Image: "gcr.io/agones-images/autoscaler-webhook:0.2",
Image: "gcr.io/agones-images/autoscaler-webhook:0.3",
ImagePullPolicy: corev1.PullAlways,
Ports: []corev1.ContainerPort{{
ContainerPort: 8000,
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 @@ -92,8 +92,8 @@ func NewFromFlags() (*Framework, error) {
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.17",
"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.17")
gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.18",
"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.18")
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