Merge branch 'master' into master

examples/simple-udp/server/Dockerfile → examples/simple-udp/Dockerfile

@@ -12,12 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# build
+FROM golang:1.10.3 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.7
 
 RUN adduser -D server
-
-COPY ./bin/server /home/server/server
-
+COPY --from=builder /go/src/simple-udp/server /home/server/server
 RUN chown -R server /home/server && \
     chmod o+x /home/server/server
 

examples/simple-udp/Makefile

@@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 server_tag = $(REPOSITORY)/udp-server:0.3
-package = agones.dev/agones/examples/simple-udp
+root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
@@ -37,19 +37,6 @@ package = agones.dev/agones/examples/simple-udp
 #    |_|\__,_|_|  \__, |\___|\__|___/
 #                 |___/
 
-# build both client and server
-build: build-server build-client
-
-# Build the server
-build-server:
-	CGO_ENABLED=0 go build -o $(project_path)/server/bin/server -a -installsuffix cgo $(package)/server
-
 # Build a docker image for the server, and tag it
-build-server-image:
-	docker build $(project_path)/server/ --tag=$(server_tag)
-
-# Build the client
-build-client:
-	go build -o $(project_path)/client/bin/client $(package)/client
-
-
+build:
+	cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(server_tag) .

examples/simple-udp/README.md

@@ -1,6 +1,6 @@
 # Simple UDP Server
 
-A very simple UDP logging server and client, for the purposes of demoing and testing
+A very simple UDP logging server, for the purposes of demoing and testing
 running a UDP based server on Agones.
 
 ## Server
@@ -10,7 +10,5 @@ When it receives a text packet, it will send back "ACK:<text content>" as an ech
 
 If it receives the text "EXIT", then it will `sys.Exit(0)`
 
-## Client
-Client will read in from stdin and send each line to the server.
-
-Address defaults to `localhost:7654` but can be changed through the `address` flag.
+To learn how to deploy your edited version of go server to gcp, please check out this link: [Edit Your First Game Server (Go)](../../../docs/edit_first_game_server.md),
+or also look at the [`Makefile`](./Makefile).

examples/simple-udp/server/main.go → examples/simple-udp/main.go

@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

pkg/apis/stable/v1alpha1/fleet_test.go

@@ -34,7 +34,7 @@ func TestFleetGameServerSetGameServer(t *testing.T) {
 			Replicas: 10,
 			Template: GameServerTemplateSpec{
 				Spec: GameServerSpec{
-					GameServerPort: &GameServerPort{ContainerPort: 1234},
+					Ports: []GameServerPort{{ContainerPort: 1234}},
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
 							Containers: []corev1.Container{{Name: "container", Image: "myimage"}},

pkg/apis/stable/v1alpha1/gameserver.go

@@ -110,8 +110,6 @@ type GameServerSpec struct {
 	// Container specifies which Pod container is the game server. Only required if there is more than one
 	// container defined
 	Container string `json:"container,omitempty"`
-	// GameServerPort is deprecated, to be removed in 0.4.0:
-	*GameServerPort `json:",inline,omitempty"`
 	// Ports are the array of ports that can be exposed via the game server
 	Ports []GameServerPort `json:"ports"`
 	// Health configures health checking
@@ -178,7 +176,6 @@ func (gs *GameServer) ApplyDefaults() {
 	gs.ObjectMeta.Finalizers = append(gs.ObjectMeta.Finalizers, stable.GroupName)
 
 	gs.applyContainerDefaults()
-	gs.applyLegacyConversion()
 	gs.applyPortDefaults()
 	gs.applyStateDefaults()
 	gs.applyHealthDefaults()
@@ -216,14 +213,6 @@ func (gs *GameServer) applyStateDefaults() {
 	}
 }
 
-// applyLegacyConversion applies the legacy conversion
-func (gs *GameServer) applyLegacyConversion() {
-	if gs.Spec.GameServerPort != nil {
-		gs.Spec.Ports = append(gs.Spec.Ports, *gs.Spec.GameServerPort)
-		gs.Spec.GameServerPort = nil
-	}
-}
-
 // applyPortDefaults applies default values for all ports
 func (gs *GameServer) applyPortDefaults() {
 	for i, p := range gs.Spec.Ports {

pkg/apis/stable/v1alpha1/gameserver_test.go

@@ -89,10 +89,10 @@ func TestGameServerApplyDefaults(t *testing.T) {
 			gameServer: GameServer{
 				Spec: GameServerSpec{
 					Container: "testing2",
-					GameServerPort: &GameServerPort{
+					Ports: []GameServerPort{{
 						Protocol:   "TCP",
 						PortPolicy: Static,
-					},
+					}},
 					Health: Health{
 						Disabled:            false,
 						PeriodSeconds:       12,
@@ -123,7 +123,7 @@ func TestGameServerApplyDefaults(t *testing.T) {
 		"set basic defaults on static gameserver": {
 			gameServer: GameServer{
 				Spec: GameServerSpec{
-					GameServerPort: &GameServerPort{PortPolicy: Static},
+					Ports: []GameServerPort{{PortPolicy: Static}},
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: "testing", Image: "testing/image"}}}}},
 			},
@@ -161,11 +161,13 @@ func TestGameServerApplyDefaults(t *testing.T) {
 		"convert from legacy single port to multiple": {
 			gameServer: GameServer{
 				Spec: GameServerSpec{
-					GameServerPort: &GameServerPort{
-						ContainerPort: 777,
-						HostPort:      777,
-						PortPolicy:    Static,
-						Protocol:      corev1.ProtocolTCP,
+					Ports: []GameServerPort{
+						{
+							ContainerPort: 777,
+							HostPort:      777,
+							PortPolicy:    Static,
+							Protocol:      corev1.ProtocolTCP,
+						},
 					},
 					Health: Health{Disabled: true},
 					Template: corev1.PodTemplateSpec{
@@ -235,10 +237,12 @@ func TestGameServerValidate(t *testing.T) {
 func TestGameServerPod(t *testing.T) {
 	fixture := &GameServer{ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "default", UID: "1234"},
 		Spec: GameServerSpec{
-			GameServerPort: &GameServerPort{
-				ContainerPort: 7777,
-				HostPort:      9999,
-				PortPolicy:    Static,
+			Ports: []GameServerPort{
+				{
+					ContainerPort: 7777,
+					HostPort:      9999,
+					PortPolicy:    Static,
+				},
 			},
 			Template: corev1.PodTemplateSpec{
 				Spec: corev1.PodSpec{

pkg/apis/stable/v1alpha1/gameserverset_test.go

@@ -33,7 +33,7 @@ func TestGameServerSetGameServer(t *testing.T) {
 			Replicas: 10,
 			Template: GameServerTemplateSpec{
 				Spec: GameServerSpec{
-					GameServerPort: &GameServerPort{ContainerPort: 1234},
+					Ports: []GameServerPort{{ContainerPort: 1234}},
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
 							Containers: []corev1.Container{{Name: "container", Image: "myimage"}},
@@ -59,7 +59,7 @@ func TestGameServerSetValidateUpdate(t *testing.T) {
 		Spec: GameServerSetSpec{
 			Replicas: 10,
 			Template: GameServerTemplateSpec{
-				Spec: GameServerSpec{GameServerPort: &GameServerPort{ContainerPort: 1234}},
+				Spec: GameServerSpec{Ports: []GameServerPort{{ContainerPort: 1234}}},
 			},
 		},
 	}
@@ -74,7 +74,7 @@ func TestGameServerSetValidateUpdate(t *testing.T) {
 	assert.True(t, ok)
 	assert.Empty(t, causes)
 
-	newGSS.Spec.Template.Spec.ContainerPort = 321
+	newGSS.Spec.Template.Spec.Ports[0].ContainerPort = 321
 	ok, causes = gsSet.ValidateUpdate(newGSS)
 	assert.False(t, ok)
 	assert.Len(t, causes, 1)