[AUTO-BACKPORT release-0.38.0] 10224: fix: make some k8s tests pass (#…

…10228) Co-authored-by: Max Russell <[email protected]>
determined-ai · Nov 21, 2024 · a554cd0 · a554cd0
1 parent 0d373b1
commit a554cd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/master/internal/rm/kubernetesrm/jobs_test.go b/master/internal/rm/kubernetesrm/jobs_test.go
@@ -123,8 +123,8 @@ func TestListPodsInAllNamespaces(t *testing.T) {
 		},
 	}
 
-	var expectedPods []k8sV1.Pod
-	copy(expectedPods, append(detPods, outsidePod))
+	//nolint:gocritic
+	expectedPods := append(detPods, outsidePod)
 	expectedPodList := k8sV1.PodList{Items: expectedPods}
 	emptyNS.On("List", mock.Anything, mock.Anything).Once().
 		Return(&k8sV1.PodList{Items: expectedPods}, nil)
@@ -133,7 +133,7 @@ func TestListPodsInAllNamespaces(t *testing.T) {
 	opts := metaV1.ListOptions{}
 	actualPodList, err := js.listPodsInAllNamespaces(ctx, opts)
 	require.NoError(t, err)
-	require.NotNil(t, actualPodList)
+	require.NotEmpty(t, actualPodList)
 	require.ElementsMatch(t, expectedPodList.Items, actualPodList)
 
 	forbiddenErr := k8error.NewForbidden(schema.GroupResource{}, "forbidden",
@@ -204,8 +204,8 @@ func TestHealthStatus(t *testing.T) {
 		},
 	}
 
-	var expectedPods []k8sV1.Pod
-	copy(expectedPods, append(detPods, outsidePod))
+	//nolint:gocritic
+	expectedPods := append(detPods, outsidePod)
 	emptyNS.On("List", mock.Anything, mock.Anything).Once().
 		Return(&k8sV1.PodList{Items: expectedPods}, nil)
 

diff --git a/master/internal/rm/kubernetesrm/kubernetes_resource_manager_intg_test.go b/master/internal/rm/kubernetesrm/kubernetes_resource_manager_intg_test.go
@@ -778,6 +778,7 @@ func TestHealthCheck(t *testing.T) {
 		jobsService: &jobsService{
 			podInterfaces: map[string]typedV1.PodInterface{
 				"namespace": mockPodInterface,
+				"":          mockPodInterface,
 			},
 			syslog: logrus.WithField("namespace", "test"),
 		},