fix: use namespace from objectMetadata and fix unit tests

googleforgames · Jan 25, 2025 · e9a8b98 · e9a8b98
1 parent 3d8c6ff
commit e9a8b98
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/pkg/fleetautoscalers/controller.go b/pkg/fleetautoscalers/controller.go
@@ -313,7 +313,7 @@ func (c *Controller) syncFleetAutoscaler(ctx context.Context, key string) error
 	}
 
 	currentReplicas := fleet.Status.Replicas
-	gameServerNamespacedLister := c.gameServerLister.GameServers(fleet.Namespace)
+	gameServerNamespacedLister := c.gameServerLister.GameServers(fleet.ObjectMeta.Namespace)
 	desiredReplicas, scalingLimited, err := computeDesiredFleetSize(fas.Spec.Policy, fleet, gameServerNamespacedLister, c.counter.Counts())
 	// If there err is nil and not an inactive schedule error (ignorable in this case), then record the event
 	if err != nil && !errors.Is(err, InactiveScheduleError{}) {

diff --git a/pkg/fleetautoscalers/fleetautoscalers_test.go b/pkg/fleetautoscalers/fleetautoscalers_test.go
@@ -189,7 +189,7 @@ func TestComputeDesiredFleetSize(t *testing.T) {
 			_, cancel := agtesting.StartInformers(m, gameServers.Informer().HasSynced)
 			defer cancel()
 
-			replicas, limited, err := computeDesiredFleetSize(fas.Spec.Policy, f, gameServers.Lister().GameServers(f.Namespace), nc)
+			replicas, limited, err := computeDesiredFleetSize(fas.Spec.Policy, f, gameServers.Lister().GameServers(f.ObjectMeta.Namespace), nc)
 
 			if tc.expected.err != "" && assert.NotNil(t, err) {
 				assert.Equal(t, tc.expected.err, err.Error())
@@ -1487,7 +1487,7 @@ func TestApplyCounterPolicy(t *testing.T) {
 				informer.GameServers().Informer().HasSynced)
 			defer cancel()
 
-			replicas, limited, err := applyCounterOrListPolicy(tc.cp, nil, tc.fleet, informer.GameServers().Lister().GameServers(tc.fleet.Namespace), nc)
+			replicas, limited, err := applyCounterOrListPolicy(tc.cp, nil, tc.fleet, informer.GameServers().Lister().GameServers(tc.fleet.ObjectMeta.Namespace), nc)
 
 			if tc.want.wantErr {
 				assert.NotNil(t, err)
@@ -2212,7 +2212,7 @@ func TestApplyListPolicy(t *testing.T) {
 				informer.GameServers().Informer().HasSynced)
 			defer cancel()
 
-			replicas, limited, err := applyCounterOrListPolicy(nil, tc.lp, tc.fleet, informer.GameServers().Lister().GameServers(tc.fleet.Namespace), nc)
+			replicas, limited, err := applyCounterOrListPolicy(nil, tc.lp, tc.fleet, informer.GameServers().Lister().GameServers(tc.fleet.ObjectMeta.Namespace), nc)
 
 			if tc.want.wantErr {
 				assert.NotNil(t, err)

diff --git a/pkg/fleets/controller.go b/pkg/fleets/controller.go
@@ -290,7 +290,7 @@ func (c *Controller) syncFleet(ctx context.Context, key string) error {
 		return nil
 	}
 
-	gameServerSetNamespacedLister := c.gameServerSetLister.GameServerSets(fleet.Namespace)
+	gameServerSetNamespacedLister := c.gameServerSetLister.GameServerSets(fleet.ObjectMeta.Namespace)
 	list, err := ListGameServerSetsByFleetOwner(gameServerSetNamespacedLister, fleet)
 	if err != nil {
 		return err
@@ -662,7 +662,7 @@ func (c *Controller) rollingUpdateRest(ctx context.Context, fleet *agonesv1.Flee
 func (c *Controller) updateFleetStatus(ctx context.Context, fleet *agonesv1.Fleet) error {
 	loggerForFleet(fleet, c.baseLogger).Debug("Update Fleet Status")
 
-	gameServerSetNamespacedLister := c.gameServerSetLister.GameServerSets(fleet.Namespace)
+	gameServerSetNamespacedLister := c.gameServerSetLister.GameServerSets(fleet.ObjectMeta.Namespace)
 	list, err := ListGameServerSetsByFleetOwner(gameServerSetNamespacedLister, fleet)
 	if err != nil {
 		return err

diff --git a/pkg/fleets/controller_test.go b/pkg/fleets/controller_test.go
@@ -1869,8 +1869,13 @@ func (fgsl *fakeGSSListerWithErr) List(_ labels.Selector) (ret []*v1.GameServerS
 	return nil, errors.New("random-err")
 }
 
+// GameServerSetLister interface implementation
+func (fgsl *fakeGSSListerWithErr) Get(_ string) (ret *v1.GameServerSet, err error) {
+	return nil, errors.New("random-err")
+}
+
 func (fgsl *fakeGSSListerWithErr) GameServerSets(_ string) agonesv1client.GameServerSetNamespaceLister {
-	panic("not implemented")
+	return fgsl
 }
 
 type fakeFleetsGetterWithErr struct{}

diff --git a/pkg/fleets/fleets_test.go b/pkg/fleets/fleets_test.go
@@ -65,7 +65,7 @@ func TestListGameServerSetsByFleetOwner(t *testing.T) {
 	_, cancel := agtesting.StartInformers(m, gameServerSets.Informer().HasSynced)
 	defer cancel()
 
-	list, err := ListGameServerSetsByFleetOwner(gameServerSets.Lister(), f)
+	list, err := ListGameServerSetsByFleetOwner(gameServerSets.Lister().GameServerSets(f.ObjectMeta.Namespace), f)
 	require.NoError(t, err)
 
 	// sort of stable ordering
@@ -100,7 +100,7 @@ func TestListGameServersByFleetOwner(t *testing.T) {
 		informer.GameServers().Informer().HasSynced)
 	defer cancel()
 
-	list, err := ListGameServersByFleetOwner(informer.GameServers().Lister().GameServers(f.Namespace), f)
+	list, err := ListGameServersByFleetOwner(informer.GameServers().Lister().GameServers(f.ObjectMeta.Namespace), f)
 	require.NoError(t, err)
 	assert.Len(t, list, len(gsList), "Retrieved list should be same size as original")
 

diff --git a/pkg/metrics/controller.go b/pkg/metrics/controller.go
@@ -259,7 +259,7 @@ func (c *Controller) recordFleetChanges(obj interface{}) {
 }
 
 func (c *Controller) recordFleetRolloutPercentage(fleet *agonesv1.Fleet) {
-	gameServerSetNamespacedLister := c.gameServerSetLister.GameServerSets(fleet.Namespace)
+	gameServerSetNamespacedLister := c.gameServerSetLister.GameServerSets(fleet.ObjectMeta.Namespace)
 	list, err := fleetsv1.ListGameServerSetsByFleetOwner(gameServerSetNamespacedLister, fleet)
 	if err != nil {
 		c.logger.Errorf("Error listing GameServerSets for fleet %s in namespace %s: %v", fleet.Name, fleet.Namespace, err.Error())