Add status subresource for Fleet and Gameserverset

Switch to using UpdateStatus function when it is necessary, add RBAC
permissions for "fleets/status" and "gameserversets/status".

install/helm/agones/templates/crds/fleet.yaml

@@ -79,6 +79,8 @@ spec:
             template:
               {{- include "gameserver.validation" . | indent 14 }}
   subresources:
+    # status enables the status subresource.
+    status: {}
     # scale enables the scale subresource.
     scale:
       # specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.

install/helm/agones/templates/crds/gameserverset.yaml

@@ -73,6 +73,8 @@ spec:
             template:
               {{- include "gameserver.validation" . | indent 14 }}
   subresources:
+    # status enables the status subresource.
+    status: {}
     # scale enables the scale subresource.
     scale:
       # specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.

install/helm/agones/templates/serviceaccounts/controller.yaml

@@ -52,12 +52,18 @@ rules:
 - apiGroups: ["stable.agones.dev"]
   resources: ["gameservers", "gameserversets"]
   verbs: ["create", "delete", "get", "list", "update", "watch"]
+- apiGroups: ["stable.agones.dev"]
+  resources: ["gameserversets/status"]
+  verbs: ["update"]
 - apiGroups: ["stable.agones.dev"]
   resources: ["gameservers"]
   verbs: ["patch"]
 - apiGroups: ["stable.agones.dev"]
   resources: ["fleets", "fleetallocations", "fleetautoscalers"]
   verbs: ["get", "list", "update", "watch"]
+- apiGroups: ["stable.agones.dev"]
+  resources: ["fleets/status"]
+  verbs: ["update"]
 - apiGroups: ["stable.agones.dev"]
   resources: ["gameserverallocations"]
   verbs: ["list", "watch",  "delete"]

install/yaml/install.yaml

@@ -50,12 +50,18 @@ rules:
 - apiGroups: ["stable.agones.dev"]
   resources: ["gameservers", "gameserversets"]
   verbs: ["create", "delete", "get", "list", "update", "watch"]
+- apiGroups: ["stable.agones.dev"]
+  resources: ["gameserversets/status"]
+  verbs: ["update"]
 - apiGroups: ["stable.agones.dev"]
   resources: ["gameservers"]
   verbs: ["patch"]
 - apiGroups: ["stable.agones.dev"]
   resources: ["fleets", "fleetallocations", "fleetautoscalers"]
   verbs: ["get", "list", "update", "watch"]
+- apiGroups: ["stable.agones.dev"]
+  resources: ["fleets/status"]
+  verbs: ["update"]
 - apiGroups: ["stable.agones.dev"]
   resources: ["gameserverallocations"]
   verbs: ["list", "watch",  "delete"]
@@ -328,6 +334,8 @@ spec:
                           minimum: 1
                           maximum: 2147483648
   subresources:
+    # status enables the status subresource.
+    status: {}
     # scale enables the scale subresource.
     scale:
       # specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.
@@ -936,6 +944,8 @@ spec:
                           minimum: 1
                           maximum: 2147483648
   subresources:
+    # status enables the status subresource.
+    status: {}
     # scale enables the scale subresource.
     scale:
       # specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.

pkg/fleets/controller.go

@@ -291,11 +291,24 @@ func (c *Controller) syncFleet(key string) error {
 func (c *Controller) upsertGameServerSet(fleet *stablev1alpha1.Fleet, active *stablev1alpha1.GameServerSet, replicas int32) error {
 	if active.ObjectMeta.UID == "" {
 		active.Spec.Replicas = replicas
-		gsSet, err := c.gameServerSetGetter.GameServerSets(active.ObjectMeta.Namespace).Create(active)
+		gsSets := c.gameServerSetGetter.GameServerSets(active.ObjectMeta.Namespace)
+		gsSet, err := gsSets.Create(active)
 		if err != nil {
 			return errors.Wrapf(err, "error creating gameserverset for fleet %s", fleet.ObjectMeta.Name)
 		}
 
+		// extra step which is needed to set
+		// default values for GameServerSet Status Subresource
+		gsSetCopy := gsSet.DeepCopy()
+		gsSetCopy.Status.ReadyReplicas = 0
+		gsSetCopy.Status.Replicas = 0
+		gsSetCopy.Status.AllocatedReplicas = 0
+		_, err = gsSets.UpdateStatus(gsSetCopy)
+		if err != nil {
+			return errors.Wrapf(err, "error updating status of gameserverset for fleet %s",
+				fleet.ObjectMeta.Name)
+		}
+
 		c.recorder.Eventf(fleet, corev1.EventTypeNormal, "CreatingGameServerSet",
 			"Created GameServerSet %s", gsSet.ObjectMeta.Name)
 		return nil
@@ -492,7 +505,7 @@ func (c *Controller) updateFleetStatus(fleet *stablev1alpha1.Fleet) error {
 		fCopy.Status.AllocatedReplicas += gsSet.Status.AllocatedReplicas
 	}
 
-	_, err = c.fleetGetter.Fleets(fCopy.Namespace).Update(fCopy)
+	_, err = c.fleetGetter.Fleets(fCopy.Namespace).UpdateStatus(fCopy)
 	return errors.Wrapf(err, "error updating status of fleet %s", fCopy.ObjectMeta.Name)
 }
 

pkg/fleets/controller_test.go

@@ -217,6 +217,12 @@ func TestControllerSyncFleet(t *testing.T) {
 		m.AgonesClient.AddReactor("update", "gameserversets", func(action k8stesting.Action) (bool, runtime.Object, error) {
 			updated = true
 			ua := action.(k8stesting.UpdateAction)
+			// separate update of status subresource
+			if ua.GetSubresource() != "" {
+				assert.Equal(t, ua.GetSubresource(), "status")
+				return true, nil, nil
+			}
+			// update main resource
 			gsSet := ua.GetObject().(*v1alpha1.GameServerSet)
 			assert.Equal(t, int32(3), gsSet.Spec.Replicas)
 			assert.Equal(t, "gsSet1", gsSet.ObjectMeta.Name)

pkg/gameserversets/controller.go

@@ -555,7 +555,7 @@ func (c *Controller) updateStatusIfChanged(gsSet *v1alpha1.GameServerSet, status
 	if gsSet.Status != status {
 		gsSetCopy := gsSet.DeepCopy()
 		gsSetCopy.Status = status
-		_, err := c.gameServerSetGetter.GameServerSets(gsSet.ObjectMeta.Namespace).Update(gsSetCopy)
+		_, err := c.gameServerSetGetter.GameServerSets(gsSet.ObjectMeta.Namespace).UpdateStatus(gsSetCopy)
 		if err != nil {
 			return errors.Wrapf(err, "error updating status on GameServerSet %s", gsSet.ObjectMeta.Name)
 		}