@@ -16,7 +16,7 @@ func setExternalDnsAnnotation(recordName string, gs *agonesv1.GameServer) string
 	return recordName
 }
 
-func findeExternalDnsAnnotation(gs *agonesv1.GameServer) bool {
+func findExternalDnsAnnotation(gs *agonesv1.GameServer) bool {
 	_, ok := getAnnotation(ExternalDnsAnnotation, gs)
 	return ok
 }
 
@@ -32,20 +32,26 @@ func (r *GameServerReconciler) Reconcile(ctx context.Context, req reconcile.Requ
 	gs := agonesv1.GameServer{}
 
 	if err := r.getGameServer(ctx, req.NamespacedName, &gs); err != nil {
-		return reconcile.Result{}, err
+		return reconcile.Result{}, nil
+	}
+
+	if !r.gameServerIsReady(&gs) {
+		return reconcile.Result{}, nil
 	}
 
-	exists := findeExternalDnsAnnotation(&gs)
+	exists := findExternalDnsAnnotation(&gs)
 	hostname, hostnameFound := getHostnameAnnotation(&gs)
 
 	if exists {
 		if isGameServerDeleted(&gs) {
 			if err := r.cleanUpGameServer(hostname, &gs); err != nil {
 				return reconcile.Result{}, err
 			}
+
+			return reconcile.Result{}, nil
 		}
 
-		r.log.Info(fmt.Sprintf("External DNS set for %s", gs.Name))
+		r.log.Info(fmt.Sprintf("ExternalDNS set for %s", gs.Name))
 		return reconcile.Result{}, nil
 	}
 
@@ -84,7 +90,7 @@ func (r *GameServerReconciler) setGameServerDNS(ctx context.Context, hostname st
 		return err
 	}
 
-	r.log.Info(fmt.Sprintf("GameServer %s externalDNS set to %s", gs.Name, externalDns))
+	r.log.Info(fmt.Sprintf("GameServer %s ExternalDNS set to %s", gs.Name, externalDns))
 	return nil
 }
 
@@ -103,8 +109,13 @@ func (r *GameServerReconciler) getGameServer(ctx context.Context, namespacedName
 	return nil
 }
 
-func isGameServerDeleted(gs *agonesv1.GameServer) bool {
-	return !gs.ObjectMeta.DeletionTimestamp.IsZero()
+func (r *GameServerReconciler) gameServerIsReady(gs *agonesv1.GameServer) bool {
+	if gs.Status.Address == "" && len(gs.Status.Ports) == 0 {
+		r.log.Info("GameServer not ready to set ExternalDNS", "GameServer name", gs.Name)
+		return false
+	}
+
+	return true
 }
 
 func (r *GameServerReconciler) cleanUpGameServer(hostname string, gs *agonesv1.GameServer) error {
@@ -117,10 +128,14 @@ func (r *GameServerReconciler) cleanUpGameServer(hostname string, gs *agonesv1.G
 		}
 	}
 
-	r.log.Info(fmt.Sprintf("GameServer %s externalDNS records removed", gs.Name))
+	r.log.Info(fmt.Sprintf("GameServer %s ExternalDNS records removed", gs.Name))
 	return nil
 }
 
 func NewReconciler(client client.Client, scheme *runtime.Scheme, log logr.Logger, dns provider.DnsClient) reconcile.Reconciler {
 	return &GameServerReconciler{client, scheme, log, dns}
 }
+
+func isGameServerDeleted(gs *agonesv1.GameServer) bool {
+	return !gs.ObjectMeta.DeletionTimestamp.IsZero()
+}
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func setExternalDnsAnnotation(recordName string, gs *agonesv1.GameServer) string`
`16`	`16`	`return recordName`
`17`	`17`	`}`
`18`	`18`
`19`		`-func findeExternalDnsAnnotation(gs *agonesv1.GameServer) bool {`
	`19`	`+func findExternalDnsAnnotation(gs *agonesv1.GameServer) bool {`
`20`	`20`	`_, ok := getAnnotation(ExternalDnsAnnotation, gs)`
`21`	`21`	`return ok`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,20 +32,26 @@ func (r *GameServerReconciler) Reconcile(ctx context.Context, req reconcile.Requ`
`32`	`32`	`gs := agonesv1.GameServer{}`
`33`	`33`
`34`	`34`	`if err := r.getGameServer(ctx, req.NamespacedName, &gs); err != nil {`
`35`		`- return reconcile.Result{}, err`
	`35`	`+ return reconcile.Result{}, nil`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ if !r.gameServerIsReady(&gs) {`
	`39`	`+ return reconcile.Result{}, nil`
`36`	`40`	`}`
`37`	`41`
`38`		`- exists := findeExternalDnsAnnotation(&gs)`
	`42`	`+ exists := findExternalDnsAnnotation(&gs)`
`39`	`43`	`hostname, hostnameFound := getHostnameAnnotation(&gs)`
`40`	`44`
`41`	`45`	`if exists {`
`42`	`46`	`if isGameServerDeleted(&gs) {`
`43`	`47`	`if err := r.cleanUpGameServer(hostname, &gs); err != nil {`
`44`	`48`	`return reconcile.Result{}, err`
`45`	`49`	`}`
	`50`	`+`
	`51`	`+ return reconcile.Result{}, nil`
`46`	`52`	`}`
`47`	`53`
`48`		`- r.log.Info(fmt.Sprintf("External DNS set for %s", gs.Name))`
	`54`	`+ r.log.Info(fmt.Sprintf("ExternalDNS set for %s", gs.Name))`
`49`	`55`	`return reconcile.Result{}, nil`
`50`	`56`	`}`
`51`	`57`
`@@ -84,7 +90,7 @@ func (r *GameServerReconciler) setGameServerDNS(ctx context.Context, hostname st`
`84`	`90`	`return err`
`85`	`91`	`}`
`86`	`92`
`87`		`- r.log.Info(fmt.Sprintf("GameServer %s externalDNS set to %s", gs.Name, externalDns))`
	`93`	`+ r.log.Info(fmt.Sprintf("GameServer %s ExternalDNS set to %s", gs.Name, externalDns))`
`88`	`94`	`return nil`
`89`	`95`	`}`
`90`	`96`
`@@ -103,8 +109,13 @@ func (r *GameServerReconciler) getGameServer(ctx context.Context, namespacedName`
`103`	`109`	`return nil`
`104`	`110`	`}`
`105`	`111`
`106`		`-func isGameServerDeleted(gs *agonesv1.GameServer) bool {`
`107`		`- return !gs.ObjectMeta.DeletionTimestamp.IsZero()`
	`112`	`+func (r GameServerReconciler) gameServerIsReady(gs agonesv1.GameServer) bool {`
	`113`	`+ if gs.Status.Address == "" && len(gs.Status.Ports) == 0 {`
	`114`	`+ r.log.Info("GameServer not ready to set ExternalDNS", "GameServer name", gs.Name)`
	`115`	`+ return false`
	`116`	`+ }`
	`117`	`+`
	`118`	`+ return true`
`108`	`119`	`}`
`109`	`120`
`110`	`121`	`func (r GameServerReconciler) cleanUpGameServer(hostname string, gs agonesv1.GameServer) error {`
`@@ -117,10 +128,14 @@ func (r GameServerReconciler) cleanUpGameServer(hostname string, gs agonesv1.G`
`117`	`128`	`}`
`118`	`129`	`}`
`119`	`130`
`120`		`- r.log.Info(fmt.Sprintf("GameServer %s externalDNS records removed", gs.Name))`
	`131`	`+ r.log.Info(fmt.Sprintf("GameServer %s ExternalDNS records removed", gs.Name))`
`121`	`132`	`return nil`
`122`	`133`	`}`
`123`	`134`
`124`	`135`	`func NewReconciler(client client.Client, scheme *runtime.Scheme, log logr.Logger, dns provider.DnsClient) reconcile.Reconciler {`
`125`	`136`	`return &GameServerReconciler{client, scheme, log, dns}`
`126`	`137`	`}`
	`138`	`+`
	`139`	`+func isGameServerDeleted(gs *agonesv1.GameServer) bool {`
	`140`	`+ return !gs.ObjectMeta.DeletionTimestamp.IsZero()`
	`141`	`+}`