fix jsonpatch test

Author: liebman

test/integration/model_jsonpatch_test.go

@@ -13,13 +13,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// TestModelProfiles tests that profiles are applied as expected.
+// Test that patch can apply the priorityClassName to the model pod.
 func TestJSONPatch(t *testing.T) {
+	const expectedPriorityClassName = "test-patch-priority-class"
 	sysCfg := baseSysCfg(t)
 	initTest(t, sysCfg)
 	priorityClass := &schedulingv1.PriorityClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "test-priority-class",
+			Name: expectedPriorityClassName,
 		},
 	}
 	require.NoError(t, testK8sClient.Create(testCtx, priorityClass))
@@ -28,7 +29,6 @@ func TestJSONPatch(t *testing.T) {
 	m := modelForTest(t)
 	// Make sure there is a Pod created to run assertions against.
 	m.Spec.MinReplicas = 1
-	const expectedPriorityClassName = "test-priority-class"
 	m.Spec.JSONPatches = []v1.JSONPatch{
 		{
 			Op:    "add",
@@ -53,30 +53,5 @@ func TestJSONPatch(t *testing.T) {
 		// Verify the priorityClassName is set on the pod
 		assert.Equal(t, expectedPriorityClassName, pod.Spec.PriorityClassName)
 
-	}, 5*time.Second, time.Second/10, "Resource profile and ModelServerPods settings should be applied to the model Pod object")
-
-	const userImage = "my-repo.com/my-repo/my-image:latest"
-	require.EventuallyWithT(t, func(t *assert.CollectT) {
-		if !assert.NoError(t, testK8sClient.Get(testCtx, client.ObjectKeyFromObject(m), m)) {
-			return
-		}
-		m.Spec.Image = userImage
-		require.NoError(t, testK8sClient.Update(testCtx, m))
-	}, 2*time.Second, time.Second/10, "Update model with user specified image")
-
-	require.NoError(t, testK8sClient.Delete(testCtx, pod))
-	require.EventuallyWithT(t, func(t *assert.CollectT) {
-		podList := &corev1.PodList{}
-		if !assert.NoError(t, testK8sClient.List(testCtx, podList, client.InNamespace(testNS), client.MatchingLabels{"model": m.Name})) {
-			return
-		}
-		if !assert.Len(t, podList.Items, 1) {
-			return
-		}
-		pod = &podList.Items[0]
-
-		// The Pod should have a single container named "server".
-		container := mustFindPodContainerByName(t, pod, "server")
-		assert.Equal(t, userImage, container.Image)
-	}, 15*time.Second, time.Second/10, "User specified image should be respected")
+	}, 5*time.Second, time.Second/10, "Pod should have the correct priorityClassName")
 }