merge minor conflicts

fectrain · Feb 23, 2024 · 55f9e03 · 55f9e03
1 parent 01c9cd8
commit 55f9e03
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...xtensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapterTest.java b/...xtensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapterTest.java
@@ -409,10 +409,9 @@ void testEphemeralResourceIsEspected() throws IOException
         taskConfig,
         startupLoggingConfig,
         node,
-        jsonMapper,
-        taskLogs
+        jsonMapper
     );
-    NoopTask task = K8sTestUtils.createTask("id", 1);
+    NoopTask task = NoopTask.create("id", 1);
     Job actual = adapter.createJobFromPodSpec(
         pod.getSpec(),
         task,