This is an automated email from the ASF dual-hosted git repository.
georgew5656 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new a64e9a17462 Add annotation for pod template (#16772)
a64e9a17462 is described below
commit a64e9a17462d34c246a8793b3efebcb4ad4a3736
Author: George Shiqi Wu <[email protected]>
AuthorDate: Tue Jul 23 07:25:15 2024 -0700
Add annotation for pod template (#16772)
* Add annotation for pod template
* pr comments
* add test cases
* add tests
---
.../k8s/overlord/common/DruidK8sConstants.java | 2 +
.../execution/PodTemplateSelectStrategy.java | 5 +-
.../SelectorBasedPodTemplateSelectStrategy.java | 11 ++--
.../TaskTypePodTemplateSelectStrategy.java | 7 ++-
.../taskadapter/PodTemplateTaskAdapter.java | 6 ++-
.../PodTemplateWithName.java} | 52 +++++++++++--------
.../overlord/common/PodTemplateWithNameTest.java | 60 ++++++++++++++++++++++
...SelectorBasedPodTemplateSelectStrategyTest.java | 14 +++--
.../taskadapter/PodTemplateTaskAdapterTest.java | 4 +-
.../src/test/resources/expectedNoopJob.yaml | 3 ++
...pectedNoopJob.yaml => expectedNoopJobBase.yaml} | 3 ++
.../src/test/resources/expectedNoopJobLongIds.yaml | 2 +
.../test/resources/expectedNoopJobNoTaskJson.yaml | 2 +
.../test/resources/expectedNoopJobTlsEnabled.yaml | 2 +
...led.yaml => expectedNoopJobTlsEnabledBase.yaml} | 2 +
15 files changed, 141 insertions(+), 34 deletions(-)
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
index 6c195ed1515..568f8ed5a11 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
@@ -28,6 +28,7 @@ public class DruidK8sConstants
public static final String TASK_TYPE = "task.type";
public static final String TASK_GROUP_ID = "task.group.id";
public static final String TASK_DATASOURCE = "task.datasource";
+ public static final String TASK_JOB_TEMPLATE = "task.jobTemplate";
public static final int PORT = 8100;
public static final int TLS_PORT = 8091;
public static final int DEFAULT_CPU_MILLICORES = 1000;
@@ -42,6 +43,7 @@ public class DruidK8sConstants
public static final String DRUID_HOSTNAME_ENV = "HOSTNAME";
public static final String LABEL_KEY = "druid.k8s.peons";
public static final String DRUID_LABEL_PREFIX = "druid.";
+ public static final String BASE_TEMPLATE_NAME = "base";
public static final long MAX_ENV_VARIABLE_KBS = 130048; // 127 KB
static final Predicate<Throwable> IS_TRANSIENT = e -> e instanceof
KubernetesResourceNotFoundException;
}
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
index ae7869707fc..885a4e3e59a 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.fabric8.kubernetes.api.model.PodTemplate;
import org.apache.druid.indexing.common.task.Task;
+import org.apache.druid.k8s.overlord.taskadapter.PodTemplateWithName;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -42,7 +43,7 @@ public interface PodTemplateSelectStrategy
* allows for customized resource allocation and management tailored to the
task's specific requirements.
*
* @param task The task for which the Pod template is determined.
- * @return The pod template that should be used to run the task.
+ * @return The PodTemplateWithName POJO that contains the name of the
template selected and the template itself.
*/
- @NotNull PodTemplate getPodTemplateForTask(Task task, Map<String,
PodTemplate> templates);
+ @NotNull PodTemplateWithName getPodTemplateForTask(Task task, Map<String,
PodTemplate> templates);
}
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
index 4c2d01b5218..bf3082a79b1 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import io.fabric8.kubernetes.api.model.PodTemplate;
import org.apache.druid.indexing.common.task.Task;
+import org.apache.druid.k8s.overlord.common.DruidK8sConstants;
+import org.apache.druid.k8s.overlord.taskadapter.PodTemplateWithName;
import java.util.List;
import java.util.Map;
@@ -53,15 +55,18 @@ public class SelectorBasedPodTemplateSelectStrategy
implements PodTemplateSelect
* @return the template if a selector matches, otherwise fallback to base
template
*/
@Override
- public PodTemplate getPodTemplateForTask(Task task, Map<String, PodTemplate>
templates)
+ public PodTemplateWithName getPodTemplateForTask(Task task, Map<String,
PodTemplate> templates)
{
String templateKey = selectors.stream()
.filter(selector -> selector.evaluate(task))
.findFirst()
.map(Selector::getSelectionKey)
- .orElse("base");
+
.orElse(DruidK8sConstants.BASE_TEMPLATE_NAME);
- return templates.getOrDefault(templateKey, templates.get("base"));
+ if (!templates.containsKey(templateKey)) {
+ templateKey = DruidK8sConstants.BASE_TEMPLATE_NAME;
+ }
+ return new PodTemplateWithName(templateKey, templates.get(templateKey));
}
@JsonProperty
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
index b374e0b6ff4..bda7788e3c4 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
@@ -22,6 +22,8 @@ package org.apache.druid.k8s.overlord.execution;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.fabric8.kubernetes.api.model.PodTemplate;
import org.apache.druid.indexing.common.task.Task;
+import org.apache.druid.k8s.overlord.common.DruidK8sConstants;
+import org.apache.druid.k8s.overlord.taskadapter.PodTemplateWithName;
import java.util.Map;
@@ -40,9 +42,10 @@ public class TaskTypePodTemplateSelectStrategy implements
PodTemplateSelectStrat
}
@Override
- public PodTemplate getPodTemplateForTask(Task task, Map<String, PodTemplate>
templates)
+ public PodTemplateWithName getPodTemplateForTask(Task task, Map<String,
PodTemplate> templates)
{
- return templates.getOrDefault(task.getType(), templates.get("base"));
+ String templateKey = templates.containsKey(task.getType()) ?
task.getType() : DruidK8sConstants.BASE_TEMPLATE_NAME;
+ return new PodTemplateWithName(templateKey, templates.get(templateKey));
}
@Override
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
index 19cc788b3ee..e8aaf1bbab3 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
@@ -138,19 +138,21 @@ public class PodTemplateTaskAdapter implements TaskAdapter
podTemplateSelectStrategy = dynamicConfig.getPodTemplateSelectStrategy();
}
- PodTemplate podTemplate =
podTemplateSelectStrategy.getPodTemplateForTask(task, templates);
+ PodTemplateWithName podTemplateWithName =
podTemplateSelectStrategy.getPodTemplateForTask(task, templates);
return new JobBuilder()
.withNewMetadata()
.withName(new K8sTaskId(task).getK8sJobName())
.addToLabels(getJobLabels(taskRunnerConfig, task))
.addToAnnotations(getJobAnnotations(taskRunnerConfig, task))
+ .addToAnnotations(DruidK8sConstants.TASK_JOB_TEMPLATE,
podTemplateWithName.getName())
.endMetadata()
.withNewSpec()
- .withTemplate(podTemplate.getTemplate())
+ .withTemplate(podTemplateWithName.getPodTemplate().getTemplate())
.editTemplate()
.editOrNewMetadata()
.addToAnnotations(getPodTemplateAnnotations(task))
+ .addToAnnotations(DruidK8sConstants.TASK_JOB_TEMPLATE,
podTemplateWithName.getName())
.addToLabels(getPodLabels(taskRunnerConfig, task))
.endMetadata()
.editSpec()
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
similarity index 52%
copy from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
copy to
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
index b374e0b6ff4..eeebd9fdb1f 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
@@ -17,50 +17,62 @@
* under the License.
*/
-package org.apache.druid.k8s.overlord.execution;
+package org.apache.druid.k8s.overlord.taskadapter;
-import com.fasterxml.jackson.annotation.JsonCreator;
import io.fabric8.kubernetes.api.model.PodTemplate;
-import org.apache.druid.indexing.common.task.Task;
-import java.util.Map;
+import javax.annotation.Nonnull;
+import java.util.Objects;
-/**
- * This strategy defines how task template is selected based on their type for
execution purposes.
- *
- * This implementation selects pod template by looking at the type of the task,
- * making it a straightforward, type-based template selection strategy.
- */
-public class TaskTypePodTemplateSelectStrategy implements
PodTemplateSelectStrategy
+public class PodTemplateWithName
{
+ private final String name;
+ private final PodTemplate podTemplate;
- @JsonCreator
- public TaskTypePodTemplateSelectStrategy()
+ public PodTemplateWithName(String name, PodTemplate podTemplate)
{
+ this.name = name;
+ this.podTemplate = podTemplate;
}
- @Override
- public PodTemplate getPodTemplateForTask(Task task, Map<String, PodTemplate>
templates)
+ @Nonnull
+ public String getName()
+ {
+ return name;
+ }
+
+ @Nonnull
+ public PodTemplate getPodTemplate()
{
- return templates.getOrDefault(task.getType(), templates.get("base"));
+ return podTemplate;
}
@Override
public boolean equals(Object o)
{
- return o instanceof TaskTypePodTemplateSelectStrategy;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ PodTemplateWithName that = (PodTemplateWithName) o;
+ return Objects.equals(name, that.name) &&
+ Objects.equals(podTemplate, that.podTemplate);
}
@Override
public int hashCode()
{
- return 1; // Any constant will work here
+ return Objects.hash(name, podTemplate);
}
@Override
public String toString()
{
- return "TaskTypePodTemplateSelectStrategy{" +
- '}';
+ return "PodTemplateWithName{" +
+ "name='" + name + '\'' +
+ ", podTemplate=" + podTemplate +
+ '}';
}
}
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
new file mode 100644
index 00000000000..58259606c86
--- /dev/null
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.k8s.overlord.common;
+
+import io.fabric8.kubernetes.api.model.PodTemplate;
+import io.fabric8.kubernetes.api.model.PodTemplateBuilder;
+import org.apache.druid.k8s.overlord.taskadapter.PodTemplateWithName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class PodTemplateWithNameTest
+{
+ @Test
+ void testEqualityToMakeCoverageHappy()
+ {
+ PodTemplateWithName podTemplateWithName = new PodTemplateWithName(
+ "name",
+ new PodTemplateBuilder().build()
+ );
+ PodTemplateWithName podTemplateWithName2 = podTemplateWithName;
+
+ assertEquals(podTemplateWithName, podTemplateWithName2);
+ assertNotEquals(podTemplateWithName, null);
+ assertNotEquals(podTemplateWithName, "string");
+ assertEquals(podTemplateWithName.hashCode(),
podTemplateWithName2.hashCode());
+ }
+
+ @Test
+ void testGettersToMakeCoverageHappy()
+ {
+ String name = "name";
+ PodTemplate podTemplate = new PodTemplateBuilder().build();
+ PodTemplateWithName podTemplateWithName = new PodTemplateWithName(
+ name,
+ podTemplate
+ );
+
+ assertEquals(name, podTemplateWithName.getName());
+ assertEquals(podTemplate, podTemplateWithName.getPodTemplate());
+ }
+}
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
index a82bb076855..81589c75128 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
@@ -27,6 +27,7 @@ import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.PodTemplate;
import org.apache.druid.indexing.common.task.NoopTask;
import org.apache.druid.indexing.common.task.Task;
+import org.apache.druid.k8s.overlord.taskadapter.PodTemplateWithName;
import org.apache.druid.segment.TestHelper;
import org.junit.Assert;
import org.junit.Before;
@@ -97,7 +98,10 @@ public class SelectorBasedPodTemplateSelectStrategyTest
List<Selector> emptySelectors = Collections.emptyList();
SelectorBasedPodTemplateSelectStrategy strategy = new
SelectorBasedPodTemplateSelectStrategy(emptySelectors);
Task task = NoopTask.create();
- Assert.assertEquals("base", strategy.getPodTemplateForTask(task,
templates).getMetadata().getName());
+ PodTemplateWithName podTemplateWithName =
strategy.getPodTemplateForTask(task, templates);
+ Assert.assertEquals("base", podTemplateWithName.getName());
+ Assert.assertEquals("base",
podTemplateWithName.getPodTemplate().getMetadata().getName());
+
}
@Test
@@ -107,7 +111,9 @@ public class SelectorBasedPodTemplateSelectStrategyTest
List<Selector> selectors = Collections.singletonList(noMatchSelector);
SelectorBasedPodTemplateSelectStrategy strategy = new
SelectorBasedPodTemplateSelectStrategy(selectors);
Task task = NoopTask.create();
- Assert.assertEquals("base", strategy.getPodTemplateForTask(task,
templates).getMetadata().getName());
+ PodTemplateWithName podTemplateWithName =
strategy.getPodTemplateForTask(task, templates);
+ Assert.assertEquals("base", podTemplateWithName.getName());
+ Assert.assertEquals("base",
podTemplateWithName.getPodTemplate().getMetadata().getName());
}
@Test
@@ -124,7 +130,9 @@ public class SelectorBasedPodTemplateSelectStrategyTest
);
SelectorBasedPodTemplateSelectStrategy strategy = new
SelectorBasedPodTemplateSelectStrategy(selectors);
Task task = NoopTask.create();
- Assert.assertEquals("match", strategy.getPodTemplateForTask(task,
templates).getMetadata().getName());
+ PodTemplateWithName podTemplateWithName =
strategy.getPodTemplateForTask(task, templates);
+ Assert.assertEquals("match", podTemplateWithName.getName());
+ Assert.assertEquals("match",
podTemplateWithName.getPodTemplate().getMetadata().getName());
}
@Test
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
index 4aad419007e..ac2aaa70558 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
@@ -163,7 +163,7 @@ public class PodTemplateTaskAdapterTest
Task task = new NoopTask("id", "id", "datasource", 0, 0, null);
Job actual = adapter.fromTask(task);
- Job expected = K8sTestUtils.fileToResource("expectedNoopJob.yaml",
Job.class);
+ Job expected = K8sTestUtils.fileToResource("expectedNoopJobBase.yaml",
Job.class);
assertJobSpecsEqual(actual, expected);
}
@@ -197,7 +197,7 @@ public class PodTemplateTaskAdapterTest
Task task = new NoopTask("id", "id", "datasource", 0, 0, null);
Job actual = adapter.fromTask(task);
- Job expected =
K8sTestUtils.fileToResource("expectedNoopJobTlsEnabled.yaml", Job.class);
+ Job expected =
K8sTestUtils.fileToResource("expectedNoopJobTlsEnabledBase.yaml", Job.class);
assertJobSpecsEqual(actual, expected);
}
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
index 2cef837f397..ddae7c0567f 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
@@ -8,11 +8,13 @@ metadata:
druid.task.type: "noop"
druid.task.group.id: "id"
druid.task.datasource: "datasource"
+
annotations:
task.id: "id"
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: noop
spec:
activeDeadlineSeconds: 14400
backoffLimit: 0
@@ -32,6 +34,7 @@ spec:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: noop
spec:
containers:
- command:
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobBase.yaml
similarity index 96%
copy from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
copy to
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobBase.yaml
index 2cef837f397..532c3dd53e8 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobBase.yaml
@@ -8,11 +8,13 @@ metadata:
druid.task.type: "noop"
druid.task.group.id: "id"
druid.task.datasource: "datasource"
+
annotations:
task.id: "id"
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: base
spec:
activeDeadlineSeconds: 14400
backoffLimit: 0
@@ -32,6 +34,7 @@ spec:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: base
spec:
containers:
- command:
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
index cf16c49c5db..d6c316dcdde 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
@@ -13,6 +13,7 @@ metadata:
task.type: "noop"
task.group.id:
"api-issued_kill_wikipedia3_omjobnbc_1000-01-01T00:00:00.000Z_2023-05-14T00:00:00.000Z_2023-05-15T17:03:01.220Z"
task.datasource: "data_source"
+ task.jobTemplate: noop
spec:
activeDeadlineSeconds: 14400
backoffLimit: 0
@@ -32,6 +33,7 @@ spec:
task.type: "noop"
task.group.id:
"api-issued_kill_wikipedia3_omjobnbc_1000-01-01T00:00:00.000Z_2023-05-14T00:00:00.000Z_2023-05-15T17:03:01.220Z"
task.datasource: "data_source"
+ task.jobTemplate: noop
spec:
containers:
- command:
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
index d72d0ef37b0..90ae9970959 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
@@ -13,6 +13,7 @@ metadata:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: noop
spec:
activeDeadlineSeconds: 14400
backoffLimit: 0
@@ -31,6 +32,7 @@ spec:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: noop
spec:
containers:
- command:
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
index a230ac913a6..72405445414 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
@@ -13,6 +13,7 @@ metadata:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: noop
spec:
activeDeadlineSeconds: 14400
backoffLimit: 0
@@ -32,6 +33,7 @@ spec:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: noop
spec:
containers:
- command:
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
similarity index 96%
copy from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
copy to
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
index a230ac913a6..0e52beac9e3 100644
---
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
+++
b/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
@@ -13,6 +13,7 @@ metadata:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: base
spec:
activeDeadlineSeconds: 14400
backoffLimit: 0
@@ -32,6 +33,7 @@ spec:
task.type: "noop"
task.group.id: "id"
task.datasource: "datasource"
+ task.jobTemplate: base
spec:
containers:
- command:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
