fix setAnnotation for simple-udp to set key & value

Yingxin-Jiang · markmandel · commit 30cb07ff3237 · 2019-02-11T16:33:09.000-08:00
diff --git a/build/Makefile b/build/Makefile
@@ -57,7 +57,7 @@ KIND_PROFILE ?= agones
 KIND_CONTAINER_NAME=kind-$(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.6
+GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.7
 
 # Directory that this Makefile is in.
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
diff --git a/examples/fleet.yaml b/examples/fleet.yaml
@@ -67,4 +67,4 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.6
+            image: gcr.io/agones-images/udp-server:0.7
diff --git a/examples/simple-udp/Makefile b/examples/simple-udp/Makefile
@@ -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.6
+server_tag = $(REPOSITORY)/udp-server:0.7
 root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
diff --git a/examples/simple-udp/fleet-distributed.yaml b/examples/simple-udp/fleet-distributed.yaml
@@ -32,7 +32,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.6
+            image: gcr.io/agones-images/udp-server:0.7
             resources:
               requests:
                 memory: "32Mi"
diff --git a/examples/simple-udp/fleet.yaml b/examples/simple-udp/fleet.yaml
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.6
+            image: gcr.io/agones-images/udp-server:0.7
             resources:
               requests:
                 memory: "64Mi"
diff --git a/examples/simple-udp/gameserver.yaml b/examples/simple-udp/gameserver.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image: gcr.io/agones-images/udp-server:0.6
+        image: gcr.io/agones-images/udp-server:0.7
         resources:
           requests:
             memory: "32Mi"
diff --git a/examples/simple-udp/gameserverset.yaml b/examples/simple-udp/gameserverset.yaml
@@ -31,4 +31,4 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.6
+            image: gcr.io/agones-images/udp-server:0.7
diff --git a/examples/simple-udp/main.go b/examples/simple-udp/main.go
@@ -190,9 +190,9 @@ func watchGameServerEvents(s *sdk.SDK) {
 }
 
 // setAnnotation sets a given annotation
-func setAnnotation(s *sdk.SDK, key string, value string) {
+func setAnnotation(s *sdk.SDK, key, value string) {
 	log.Printf("Setting annotation %v=%v", key, value)
-	err := s.SetAnnotation("timestamp", time.Now().UTC().String())
+	err := s.SetAnnotation(key, value)
 	if err != nil {
 		log.Fatalf("could not set annotation: %v", err)
 	}
diff --git a/install/helm/agones/templates/NOTES.txt b/install/helm/agones/templates/NOTES.txt
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image: gcr.io/agones-images/udp-server:0.6
+        image: gcr.io/agones-images/udp-server:0.7
 
 Finally don't forget to explore our documentation and usage guides on how to develop and host dedicated game servers on top of Agones. :
 
diff --git a/site/content/en/docs/Advanced/limiting-resources.md b/site/content/en/docs/Advanced/limiting-resources.md
@@ -39,7 +39,7 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image: gcr.io/agones-images/udp-server:0.6
+        image: gcr.io/agones-images/udp-server:0.7
         resources:
           limit:
             cpu: "250m" #this is our limit here
diff --git a/site/content/en/docs/Advanced/scheduling-and-autoscaling.md b/site/content/en/docs/Advanced/scheduling-and-autoscaling.md
@@ -79,7 +79,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.6
+            image: gcr.io/agones-images/udp-server:0.7
 ```
 
 This is the *default* Fleet scheduling strategy. It is designed for dynamic Kubernetes environments, wherein you wish 
@@ -134,7 +134,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.6
+            image: gcr.io/agones-images/udp-server:0.7
 ```
 
 This Fleet scheduling strategy is designed for static Kubernetes environments, such as when you are running Kubernetes
diff --git a/site/content/en/docs/Getting Started/create-fleet.md b/site/content/en/docs/Getting Started/create-fleet.md
@@ -111,7 +111,7 @@ Spec:
           Creation Timestamp:  <nil>
         Spec:
           Containers:
-            Image:  gcr.io/agones-images/udp-server:0.6
+            Image:  gcr.io/agones-images/udp-server:0.7
             Name:   simple-udp
             Resources:
 Status:
@@ -326,7 +326,7 @@ status:
           creationTimestamp: null
         spec:
           containers:
-          - image: gcr.io/agones-images/udp-server:0.6
+          - image: gcr.io/agones-images/udp-server:0.7
             name: simple-udp
             resources: {}
     status:
diff --git a/site/content/en/docs/Getting Started/create-gameserver.md b/site/content/en/docs/Getting Started/create-gameserver.md
@@ -107,7 +107,7 @@ Spec:
       Creation Timestamp:  <nil>
     Spec:
       Containers:
-        Image:  gcr.io/agones-images/udp-server:0.6
+        Image:  gcr.io/agones-images/udp-server:0.7
         Name:   simple-udp
         Resources:
 Status:
diff --git a/site/content/en/docs/Guides/access-api.md b/site/content/en/docs/Guides/access-api.md
@@ -88,7 +88,7 @@ func main() {
 		Spec: v1alpha1.GameServerSpec{
 			Template: corev1.PodTemplateSpec{
 				Spec: corev1.PodSpec{
-					Containers: []corev1.Container{{Name: "udp-server", Image: "gcr.io/agones-images/udp-server:0.6"}},
+					Containers: []corev1.Container{{Name: "udp-server", Image: "gcr.io/agones-images/udp-server:0.7"}},
 				},
 			},
 		},
@@ -176,7 +176,7 @@ $ curl http://localhost:8001/apis/stable.agones.dev/v1alpha1/namespaces/default/
             "kind": "GameServer",
             "metadata": {
                 "annotations": {
-                    "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"stable.agones.dev/v1alpha1\",\"kind\":\"GameServer\",\"metadata\":{\"annotations\":{},\"name\":\"simple-udp\",\"namespace\":\"default\"},\"spec\":{\"containerPort\":7654,\"hostPort\":7777,\"portPolicy\":\"static\",\"template\":{\"spec\":{\"containers\":[{\"image\":\"gcr.io/agones-images/udp-server:0.6\",\"name\":\"simple-udp\"}]}}}}\n"
+                    "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"stable.agones.dev/v1alpha1\",\"kind\":\"GameServer\",\"metadata\":{\"annotations\":{},\"name\":\"simple-udp\",\"namespace\":\"default\"},\"spec\":{\"containerPort\":7654,\"hostPort\":7777,\"portPolicy\":\"static\",\"template\":{\"spec\":{\"containers\":[{\"image\":\"gcr.io/agones-images/udp-server:0.7\",\"name\":\"simple-udp\"}]}}}}\n"
                 },
                 "clusterName": "",
                 "creationTimestamp": "2018-03-02T21:41:05Z",
@@ -208,7 +208,7 @@ $ curl http://localhost:8001/apis/stable.agones.dev/v1alpha1/namespaces/default/
                     "spec": {
                         "containers": [
                             {
-                                "image": "gcr.io/agones-images/udp-server:0.6",
+                                "image": "gcr.io/agones-images/udp-server:0.7",
                                 "name": "simple-udp",
                                 "resources": {}
                             }
@@ -316,7 +316,7 @@ $ curl -d '{"apiVersion":"stable.agones.dev/v1alpha1","kind":"FleetAllocation","
                     "spec": {
                         "containers": [
                             {
-                                "image": "gcr.io/agones-images/udp-server:0.6",
+                                "image": "gcr.io/agones-images/udp-server:0.7",
                                 "name": "simple-udp",
                                 "resources": {}
                             }
diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
@@ -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.6",
-		"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.6")
+	gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.7",
+		"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.7")
 	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")

Original file line number	Diff line number	Diff line change
`@@ -190,9 +190,9 @@ func watchGameServerEvents(s *sdk.SDK) {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`// setAnnotation sets a given annotation`
`193`		`-func setAnnotation(s *sdk.SDK, key string, value string) {`
	`193`	`+func setAnnotation(s *sdk.SDK, key, value string) {`
`194`	`194`	`log.Printf("Setting annotation %v=%v", key, value)`
`195`		`- err := s.SetAnnotation("timestamp", time.Now().UTC().String())`
	`195`	`+ err := s.SetAnnotation(key, value)`
`196`	`196`	`if err != nil {`
`197`	`197`	`log.Fatalf("could not set annotation: %v", err)`
`198`	`198`	`}`