Fix panic in GS controller, failed pod logging

Propagate error to event.
googleforgames · Apr 29, 2020 · 6072398 · 6072398
1 parent 387188a
commit 6072398
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/gameservers/controller.go b/pkg/gameservers/controller.go
@@ -573,12 +573,11 @@ func (c *Controller) createGameServerPod(gs *agonesv1.GameServer) (*agonesv1.Gam
 
 	c.loggerForGameServer(gs).WithField("pod", pod).Debug("Creating Pod for GameServer")
 	pod, err = c.podGetter.Pods(gs.ObjectMeta.Namespace).Create(pod)
-	if k8serrors.IsAlreadyExists(err) {
-		c.recorder.Event(gs, corev1.EventTypeNormal, string(gs.Status.State), "Pod already exists, reused")
-		return gs, nil
-	}
 	if err != nil {
-		if k8serrors.IsInvalid(err) {
+		if k8serrors.IsAlreadyExists(err) {
+			c.recorder.Event(gs, corev1.EventTypeNormal, string(gs.Status.State), "Pod already exists, reused")
+			return gs, nil
+		} else if k8serrors.IsInvalid(err) {
 			c.loggerForGameServer(gs).WithField("pod", pod).Errorf("Pod created is invalid")
 			gs, err = c.moveToErrorState(gs, err.Error())
 			return gs, err
@@ -587,6 +586,8 @@ func (c *Controller) createGameServerPod(gs *agonesv1.GameServer) (*agonesv1.Gam
 			gs, err = c.moveToErrorState(gs, err.Error())
 			return gs, err
 		}
+		c.loggerForGameServer(gs).WithField("pod", pod).WithError(err)
+		c.recorder.Eventf(gs, corev1.EventTypeWarning, string(gs.Status.State), "error creating Pod for GameServer %s", gs.Name)
 		return gs, errors.Wrapf(err, "error creating Pod for GameServer %s", gs.Name)
 	}
 	c.recorder.Event(gs, corev1.EventTypeNormal, string(gs.Status.State),