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 62a53ab41bf make k8s ingestion core (#17614)
62a53ab41bf is described below
commit 62a53ab41bfdd0c9f6eddd95630b42f82f8ba89b
Author: George Shiqi Wu <[email protected]>
AuthorDate: Fri Jan 17 09:41:31 2025 -0500
make k8s ingestion core (#17614)
* make k8s ingestion core
* add redirects
* missing licenses
* Add disclaimer for druid 28
* Fix redirect
---
.github/labeler.yml | 2 +-
distribution/pom.xml | 4 +-
docs/configuration/extensions.md | 2 +-
docs/design/architecture.md | 2 +-
docs/design/indexer.md | 2 +-
.../k8s-jobs.md | 4 ++
.../kubernetes-overlord-extensions/README.md | 0
.../kubernetes-overlord-extensions/pom.xml | 2 +-
.../overlord/KubernetesAndWorkerTaskRunner.java | 0
.../KubernetesAndWorkerTaskRunnerConfig.java | 0
.../KubernetesAndWorkerTaskRunnerFactory.java | 0
.../k8s/overlord/KubernetesOverlordModule.java | 0
.../k8s/overlord/KubernetesPeonLifecycle.java | 0
.../overlord/KubernetesPeonLifecycleFactory.java | 0
.../druid/k8s/overlord/KubernetesTaskRunner.java | 0
.../k8s/overlord/KubernetesTaskRunnerConfig.java | 0
.../k8s/overlord/KubernetesTaskRunnerFactory.java | 0
.../druid/k8s/overlord/KubernetesWorkItem.java | 0
.../druid/k8s/overlord/PeonLifecycleFactory.java | 0
.../k8s/overlord/common/Base64Compression.java | 0
.../k8s/overlord/common/DruidK8sConstants.java | 0
.../k8s/overlord/common/DruidKubernetesClient.java | 0
.../druid/k8s/overlord/common/JobResponse.java | 0
.../druid/k8s/overlord/common/JobStatus.java | 0
.../druid/k8s/overlord/common/K8sTaskId.java | 0
.../k8s/overlord/common/KubernetesClientApi.java | 0
.../k8s/overlord/common/KubernetesExecutor.java | 0
.../overlord/common/KubernetesOverlordUtils.java | 0
.../k8s/overlord/common/KubernetesPeonClient.java | 0
.../KubernetesResourceNotFoundException.java | 0
.../k8s/overlord/common/PeonCommandContext.java | 0
.../druid/k8s/overlord/common/PeonPhase.java | 0
.../DefaultKubernetesTaskRunnerDynamicConfig.java | 0
.../KubernetesTaskExecutionConfigResource.java | 0
.../KubernetesTaskRunnerDynamicConfig.java | 0
.../execution/PodTemplateSelectStrategy.java | 0
.../druid/k8s/overlord/execution/Selector.java | 0
.../SelectorBasedPodTemplateSelectStrategy.java | 0
.../TaskTypePodTemplateSelectStrategy.java | 0
.../runnerstrategy/KubernetesRunnerStrategy.java | 0
.../overlord/runnerstrategy/RunnerStrategy.java | 0
.../runnerstrategy/TaskTypeRunnerStrategy.java | 0
.../runnerstrategy/WorkerRunnerStrategy.java | 0
.../DynamicConfigPodTemplateSelector.java | 0
.../k8s/overlord/taskadapter/K8sTaskAdapter.java | 0
.../taskadapter/MultiContainerTaskAdapter.java | 0
.../overlord/taskadapter/PodTemplateSelector.java | 0
.../taskadapter/PodTemplateTaskAdapter.java | 0
.../overlord/taskadapter/PodTemplateWithName.java | 0
.../taskadapter/SingleContainerTaskAdapter.java | 0
.../k8s/overlord/taskadapter/TaskAdapter.java | 0
.../org.apache.druid.initialization.DruidModule | 0
.../KubernetesAndWorkerTaskRunnerConfigTest.java | 0
.../KubernetesAndWorkerTaskRunnerFactoryTest.java | 0
.../KubernetesAndWorkerTaskRunnerTest.java | 0
.../k8s/overlord/KubernetesOverlordModuleTest.java | 0
.../k8s/overlord/KubernetesPeonLifecycleTest.java | 0
.../overlord/KubernetesTaskRunnerConfigTest.java | 0
.../overlord/KubernetesTaskRunnerFactoryTest.java | 0
.../k8s/overlord/KubernetesTaskRunnerTest.java | 0
.../druid/k8s/overlord/KubernetesWorkItemTest.java | 0
.../k8s/overlord/TestPeonLifecycleFactory.java | 0
.../k8s/overlord/common/Base64CompressionTest.java | 0
.../druid/k8s/overlord/common/JobResponseTest.java | 0
.../druid/k8s/overlord/common/JobStatusTest.java | 0
.../druid/k8s/overlord/common/K8sTaskIdTest.java | 0
.../druid/k8s/overlord/common/K8sTestUtils.java | 0
.../common/KubernetesOverlordUtilsTest.java | 0
.../overlord/common/KubernetesPeonClientTest.java | 0
.../druid/k8s/overlord/common/PeonPhaseTest.java | 0
.../overlord/common/PodTemplateWithNameTest.java | 0
.../k8s/overlord/common/TestKubernetesClient.java | 0
...faultKubernetesTaskRunnerDynamicConfigTest.java | 0
.../KubernetesTaskExecutionConfigResourceTest.java | 0
.../KubernetesTaskRunnerDynamicConfigTest.java | 0
...SelectorBasedPodTemplateSelectStrategyTest.java | 0
.../druid/k8s/overlord/execution/SelectorTest.java | 0
.../KubernetesRunnerStrategyTest.java | 0
.../runnerstrategy/TaskTypeRunnerStrategyTest.java | 0
.../runnerstrategy/WorkerRunnerStrategyTest.java | 0
.../DruidPeonClientIntegrationTest.java | 0
.../DynamicConfigPodTemplateSelectorTest.java | 0
.../overlord/taskadapter/K8sTaskAdapterTest.java | 0
.../taskadapter/MultiContainerTaskAdapterTest.java | 0
.../taskadapter/PodTemplateTaskAdapterTest.java | 0
.../SingleContainerTaskAdapterTest.java | 0
.../taskadapter/TestPodTemplateSelector.java | 0
.../src/test/resources/baseJob.yaml | 0
.../test/resources/baseJobWithoutAnnotations.yaml | 0
.../src/test/resources/basePodTemplate.yaml | 0
.../src/test/resources/ephemeralPodSpec.yaml | 0
.../test/resources/expectedCPUResourceOutput.yaml | 0
.../test/resources/expectedEphemeralOutput.yaml | 0
.../resources/expectedMultiContainerOutput.yaml | 0
.../expectedMultiContainerOutputOrder.yaml | 0
.../src/test/resources/expectedNoopJob.yaml | 0
.../src/test/resources/expectedNoopJobLongIds.yaml | 0
.../test/resources/expectedNoopJobNoTaskJson.yaml | 0
.../test/resources/expectedNoopJobTlsEnabled.yaml | 0
.../resources/expectedNoopJobTlsEnabledBase.yaml | 0
.../test/resources/expectedNoopPodTemplate.yaml | 0
.../src/test/resources/expectedPodSpec.yaml | 0
.../resources/expectedSingleContainerOutput.yaml | 0
.../kubernetesAndWorkerTaskRunnerConfig.json | 0
.../test/resources/kubernetesTaskRunnerConfig.json | 0
.../src/test/resources/multiContainerPodSpec.yaml | 0
.../test/resources/multiContainerPodSpecOrder.yaml | 0
.../src/test/resources/podSpec.yaml | 0
licenses.yaml | 47 ++++++++++++++++++++--
pom.xml | 2 +-
website/redirects.js | 4 ++
111 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index e48b7da430a..b04bba08e03 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -88,7 +88,7 @@
'Kubernetes':
- changed-files:
- any-glob-to-any-file:
- - 'extensions-contrib/kubernetes-overlord-extensions/**'
+ - 'extensions-core/kubernetes-overlord-extensions/**'
'GHA':
- changed-files:
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a695b8a5af4..6c5c1da60c3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -254,6 +254,8 @@
<argument>-c</argument>
<argument>org.apache.druid.extensions:druid-kubernetes-extensions</argument>
<argument>-c</argument>
+
<argument>org.apache.druid.extensions:druid-kubernetes-overlord-extensions</argument>
+ <argument>-c</argument>
<argument>org.apache.druid.extensions:druid-catalog</argument>
<argument>${druid.distribution.pulldeps.opts}</argument>
</arguments>
@@ -413,8 +415,6 @@
<argument>-c</argument>
<argument>org.apache.druid.extensions.contrib:kafka-emitter</argument>
<argument>-c</argument>
-
<argument>org.apache.druid.extensions.contrib:druid-kubernetes-overlord-extensions</argument>
- <argument>-c</argument>
<argument>org.apache.druid.extensions.contrib:materialized-view-maintenance</argument>
<argument>-c</argument>
<argument>org.apache.druid.extensions.contrib:materialized-view-selection</argument>
diff --git a/docs/configuration/extensions.md b/docs/configuration/extensions.md
index 81045d66d69..45dcb2eb7ff 100644
--- a/docs/configuration/extensions.md
+++ b/docs/configuration/extensions.md
@@ -62,6 +62,7 @@ Core extensions are maintained by Druid committers.
|simple-client-sslcontext|Simple SSLContext provider module to be used by
Druid's internal HttpClient when talking to other Druid processes over
HTTPS.|[link](../development/extensions-core/simple-client-sslcontext.md)|
|druid-pac4j|OpenID Connect authentication for druid
processes.|[link](../development/extensions-core/druid-pac4j.md)|
|druid-kubernetes-extensions|Druid cluster deployment on Kubernetes without
Zookeeper.|[link](../development/extensions-core/kubernetes.md)|
+|druid-kubernetes-overlord-extensions|Support for launching tasks in k8s
without Middle Managers|[link](../development/extensions-core/k8s-jobs.md)|
## Community extensions
@@ -100,7 +101,6 @@ All of these community extensions can be downloaded using
[pull-deps](../operati
|druid-tdigestsketch|Support for approximate sketch aggregators based on
[T-Digest](https://github.com/tdunning/t-digest)|[link](../development/extensions-contrib/tdigestsketch-quantiles.md)|
|gce-extensions|GCE
Extensions|[link](../development/extensions-contrib/gce-extensions.md)|
|prometheus-emitter|Exposes [Druid metrics](../operations/metrics.md) for
Prometheus server collection
(<https://prometheus.io/>)|[link](../development/extensions-contrib/prometheus.md)|
-|druid-kubernetes-overlord-extensions|Support for launching tasks in k8s
without Middle Managers|[link](../development/extensions-contrib/k8s-jobs.md)|
|druid-spectator-histogram|Support for efficient approximate percentile
queries|[link](../development/extensions-contrib/spectator-histogram.md)|
|druid-rabbit-indexing-service|Support for creating and managing
[RabbitMQ](https://www.rabbitmq.com/) indexing
tasks|[link](../development/extensions-contrib/rabbit-stream-ingestion.md)|
|druid-ranger-security|Support for access control through Apache
Ranger.|[link](../development/extensions-contrib/druid-ranger-security.md)|
diff --git a/docs/design/architecture.md b/docs/design/architecture.md
index 55cfb42f35f..04498defb16 100644
--- a/docs/design/architecture.md
+++ b/docs/design/architecture.md
@@ -107,7 +107,7 @@ forking separate JVM processes per-task, the Indexer runs
tasks as individual th
The Indexer is designed to be easier to configure and deploy compared to the
MiddleManager + Peon system and to better enable resource sharing across tasks,
which can help streaming ingestion. The Indexer is currently designated
[experimental](../development/experimental.md).
-Typically, you would deploy one of the following: MiddleManagers,
[MiddleManager-less ingestion using
Kubernetes](../development/extensions-contrib/k8s-jobs.md), or Indexers. You
wouldn't deploy more than one of these options.
+Typically, you would deploy one of the following: MiddleManagers,
[MiddleManager-less ingestion using
Kubernetes](../development/extensions-core/k8s-jobs.md), or Indexers. You
wouldn't deploy more than one of these options.
## Colocation of services
diff --git a/docs/design/indexer.md b/docs/design/indexer.md
index b18408ce389..ebfffe7f1ce 100644
--- a/docs/design/indexer.md
+++ b/docs/design/indexer.md
@@ -24,7 +24,7 @@ sidebar_label: "Indexer"
-->
:::info
- The Indexer is an optional and experimental feature. If you're primarily
performing batch ingestion, we recommend you use either the MiddleManager and
Peon task execution system or [MiddleManager-less ingestion using
Kubernetes](../development/extensions-contrib/k8s-jobs.md). If you're primarily
doing streaming ingestion, you may want to try either [MiddleManager-less
ingestion using Kubernetes](../development/extensions-contrib/k8s-jobs.md) or
the Indexer service.
+ The Indexer is an optional and experimental feature. If you're primarily
performing batch ingestion, we recommend you use either the MiddleManager and
Peon task execution system or [MiddleManager-less ingestion using
Kubernetes](../development/extensions-core/k8s-jobs.md). If you're primarily
doing streaming ingestion, you may want to try either [MiddleManager-less
ingestion using Kubernetes](../development/extensions-core/k8s-jobs.md) or the
Indexer service.
:::
The Apache Druid Indexer service is an alternative to the Middle Manager +
Peon task execution system. Instead of forking a separate JVM process per-task,
the Indexer runs tasks as separate threads within a single JVM process.
diff --git a/docs/development/extensions-contrib/k8s-jobs.md
b/docs/development/extensions-core/k8s-jobs.md
similarity index 99%
rename from docs/development/extensions-contrib/k8s-jobs.md
rename to docs/development/extensions-core/k8s-jobs.md
index d33db3e95df..14134af94aa 100644
--- a/docs/development/extensions-contrib/k8s-jobs.md
+++ b/docs/development/extensions-core/k8s-jobs.md
@@ -696,6 +696,10 @@ roleRef:
```
## Migration/Kubernetes and Worker Task Runner
+:::info
+This feature is only available starting in Druid 28. If you require a rolling
update to enable Kubernetes-based ingestion, first update your cluster to Druid
28 then apply the overlord configurations mentioned in this section.
+:::
+
If you are running a cluster with tasks running on middle managers or indexers
and want to do a zero downtime migration to mm-less ingestion, the mm-less
ingestion system is capable of running in migration mode by reading tasks from
middle managers/indexers and Kubernetes and writing tasks to either middle
managers or to Kubernetes.
To do this, set the following property.
diff --git a/extensions-contrib/kubernetes-overlord-extensions/README.md
b/extensions-core/kubernetes-overlord-extensions/README.md
similarity index 100%
rename from extensions-contrib/kubernetes-overlord-extensions/README.md
rename to extensions-core/kubernetes-overlord-extensions/README.md
diff --git a/extensions-contrib/kubernetes-overlord-extensions/pom.xml
b/extensions-core/kubernetes-overlord-extensions/pom.xml
similarity index 99%
rename from extensions-contrib/kubernetes-overlord-extensions/pom.xml
rename to extensions-core/kubernetes-overlord-extensions/pom.xml
index 310e280039f..aff9f37541d 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/pom.xml
+++ b/extensions-core/kubernetes-overlord-extensions/pom.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.druid.extensions.contrib</groupId>
+ <groupId>org.apache.druid.extensions</groupId>
<artifactId>druid-kubernetes-overlord-extensions</artifactId>
<name>druid-kubernetes-overlord-extensions</name>
<description>druid-kubernetes-overlord-extensions</description>
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunner.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunner.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunner.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunner.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactory.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactory.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactory.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactory.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesOverlordModule.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesOverlordModule.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesOverlordModule.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesOverlordModule.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycle.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycle.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycle.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycle.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleFactory.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleFactory.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleFactory.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleFactory.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunner.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactory.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactory.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactory.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactory.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesWorkItem.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesWorkItem.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesWorkItem.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesWorkItem.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/PeonLifecycleFactory.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/PeonLifecycleFactory.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/PeonLifecycleFactory.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/PeonLifecycleFactory.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/Base64Compression.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/Base64Compression.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/Base64Compression.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/Base64Compression.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidK8sConstants.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesClient.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesClient.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesClient.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesClient.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobResponse.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobResponse.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobResponse.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobResponse.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobStatus.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobStatus.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobStatus.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/JobStatus.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/K8sTaskId.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/K8sTaskId.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/K8sTaskId.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/K8sTaskId.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesClientApi.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesClientApi.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesClientApi.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesClientApi.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesExecutor.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesExecutor.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesExecutor.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesExecutor.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtils.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtils.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtils.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtils.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClient.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClient.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClient.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClient.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesResourceNotFoundException.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesResourceNotFoundException.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesResourceNotFoundException.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/KubernetesResourceNotFoundException.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonCommandContext.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonCommandContext.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonCommandContext.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonCommandContext.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfig.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfig.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfig.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfig.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResource.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfig.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfig.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfig.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfig.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/PodTemplateSelectStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/Selector.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/Selector.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/Selector.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/Selector.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/execution/TaskTypePodTemplateSelectStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/RunnerStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/RunnerStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/RunnerStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/RunnerStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategy.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategy.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategy.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategy.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelector.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelector.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelector.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelector.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapter.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapter.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapter.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapter.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapter.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateSelector.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateSelector.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateSelector.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateSelector.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapter.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateWithName.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapter.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapter.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapter.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapter.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/TaskAdapter.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/TaskAdapter.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/TaskAdapter.java
rename to
extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/taskadapter/TaskAdapter.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule
b/extensions-core/kubernetes-overlord-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule
rename to
extensions-core/kubernetes-overlord-extensions/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfigTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfigTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfigTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfigTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactoryTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactoryTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactoryTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerFactoryTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesOverlordModuleTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesOverlordModuleTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesOverlordModuleTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesOverlordModuleTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycleTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfigTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfigTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfigTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfigTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactoryTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactoryTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactoryTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerFactoryTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesWorkItemTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesWorkItemTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesWorkItemTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesWorkItemTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/TestPeonLifecycleFactory.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/TestPeonLifecycleFactory.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/TestPeonLifecycleFactory.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/TestPeonLifecycleFactory.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/Base64CompressionTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/Base64CompressionTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/Base64CompressionTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/Base64CompressionTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobResponseTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobResponseTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobResponseTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobResponseTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobStatusTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobStatusTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobStatusTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/JobStatusTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTaskIdTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTaskIdTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTaskIdTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTaskIdTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtilsTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtilsTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtilsTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesOverlordUtilsTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClientTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClientTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClientTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/KubernetesPeonClientTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PeonPhaseTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PeonPhaseTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PeonPhaseTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PeonPhaseTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/PodTemplateWithNameTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/TestKubernetesClient.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/TestKubernetesClient.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/TestKubernetesClient.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/TestKubernetesClient.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfigTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfigTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfigTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/DefaultKubernetesTaskRunnerDynamicConfigTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResourceTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResourceTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResourceTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskExecutionConfigResourceTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfigTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfigTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfigTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/KubernetesTaskRunnerDynamicConfigTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorBasedPodTemplateSelectStrategyTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/execution/SelectorTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategyTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategyTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategyTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/KubernetesRunnerStrategyTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategyTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategyTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategyTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/TaskTypeRunnerStrategyTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategyTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategyTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategyTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/runnerstrategy/WorkerRunnerStrategyTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelectorTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelectorTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelectorTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DynamicConfigPodTemplateSelectorTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapterTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapterTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapterTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/K8sTaskAdapterTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapterTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapterTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapterTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/MultiContainerTaskAdapterTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/PodTemplateTaskAdapterTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapterTest.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapterTest.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapterTest.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/SingleContainerTaskAdapterTest.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/TestPodTemplateSelector.java
b/extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/TestPodTemplateSelector.java
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/TestPodTemplateSelector.java
rename to
extensions-core/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/TestPodTemplateSelector.java
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/baseJob.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/baseJob.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/baseJob.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/baseJob.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/baseJobWithoutAnnotations.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/baseJobWithoutAnnotations.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/baseJobWithoutAnnotations.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/baseJobWithoutAnnotations.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/basePodTemplate.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/basePodTemplate.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/basePodTemplate.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/basePodTemplate.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/ephemeralPodSpec.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/ephemeralPodSpec.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/ephemeralPodSpec.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/ephemeralPodSpec.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedCPUResourceOutput.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedCPUResourceOutput.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedCPUResourceOutput.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedCPUResourceOutput.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedEphemeralOutput.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedEphemeralOutput.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedEphemeralOutput.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedEphemeralOutput.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutput.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutput.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutput.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutput.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutputOrder.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutputOrder.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutputOrder.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedMultiContainerOutputOrder.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJob.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobLongIds.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobNoTaskJson.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabled.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopJobTlsEnabledBase.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopPodTemplate.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopPodTemplate.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedNoopPodTemplate.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedNoopPodTemplate.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedPodSpec.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedPodSpec.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedPodSpec.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedPodSpec.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedSingleContainerOutput.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedSingleContainerOutput.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/expectedSingleContainerOutput.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/expectedSingleContainerOutput.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/kubernetesAndWorkerTaskRunnerConfig.json
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/kubernetesAndWorkerTaskRunnerConfig.json
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/kubernetesAndWorkerTaskRunnerConfig.json
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/kubernetesAndWorkerTaskRunnerConfig.json
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/kubernetesTaskRunnerConfig.json
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/kubernetesTaskRunnerConfig.json
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/kubernetesTaskRunnerConfig.json
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/kubernetesTaskRunnerConfig.json
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpec.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpec.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpec.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpec.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpecOrder.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpecOrder.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpecOrder.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/multiContainerPodSpecOrder.yaml
diff --git
a/extensions-contrib/kubernetes-overlord-extensions/src/test/resources/podSpec.yaml
b/extensions-core/kubernetes-overlord-extensions/src/test/resources/podSpec.yaml
similarity index 100%
rename from
extensions-contrib/kubernetes-overlord-extensions/src/test/resources/podSpec.yaml
rename to
extensions-core/kubernetes-overlord-extensions/src/test/resources/podSpec.yaml
diff --git a/licenses.yaml b/licenses.yaml
index 8d7457ec1dc..87faae70ad8 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -853,12 +853,33 @@ libraries:
name: kubernetes fabric java client
license_category: binary
-module: extensions-contrib/kubernetes-overlord-extensions
+module: extensions-core/kubernetes-overlord-extensions
license_name: Apache License version 2.0
version: 6.7.2
libraries:
- - io.fabric8: kubernetes-client
-
+ - io.fabric8: kubernetes-client-api
+ - io.fabric8: kubernetes-model-batch
+ - io.fabric8: kubernetes-model-core
+ - io.fabric8: kubernetes-model-admissionregistration
+ - io.fabric8: kubernetes-model-apiextensions
+ - io.fabric8: kubernetes-model-apps
+ - io.fabric8: kubernetes-model-autoscaling
+ - io.fabric8: kubernetes-model-certificates
+ - io.fabric8: kubernetes-model-common
+ - io.fabric8: kubernetes-model-coordination
+ - io.fabric8: kubernetes-model-discovery
+ - io.fabric8: kubernetes-model-events
+ - io.fabric8: kubernetes-model-extensions
+ - io.fabric8: kubernetes-model-flowcontrol
+ - io.fabric8: kubernetes-model-gatewayapi
+ - io.fabric8: kubernetes-model-metrics
+ - io.fabric8: kubernetes-model-networking
+ - io.fabric8: kubernetes-model-node
+ - io.fabric8: kubernetes-model-policy
+ - io.fabric8: kubernetes-model-rbac
+ - io.fabric8: kubernetes-model-resource
+ - io.fabric8: kubernetes-model-scheduling
+ - io.fabric8: kubernetes-model-storageclass
---
name: kubernetes official java client
@@ -1026,6 +1047,26 @@ libraries:
---
+name: org.snakeyaml snakeyaml-engine
+license_category: binary
+module: extensions-core/druid-kubernetes-overlord-extensions
+license_name: Apache License version 2.0
+version: 2.6
+libraries:
+ - org.snakeyaml: snakeyaml-engine
+
+---
+
+name: org.yaml snakeyaml
+license_category: binary
+module: extensions-core/druid-kubernetes-overlord-extensions
+license_name: Apache License version 2.0
+version: 1.33
+libraries:
+ - org.yaml: snakeyaml
+
+---
+
name: org.yaml snakeyaml
license_category: binary
module: extensions/druid-kubernetes-extensions
diff --git a/pom.xml b/pom.xml
index ee701ae5d73..a44f0acfce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,7 @@
<module>cloud/gcp-common</module>
<!-- Core extensions -->
<module>extensions-core/kubernetes-extensions</module>
+ <module>extensions-core/kubernetes-overlord-extensions</module>
<module>extensions-core/avro-extensions</module>
<module>extensions-core/azure-extensions</module>
<module>extensions-core/datasketches</module>
@@ -250,7 +251,6 @@
<module>extensions-contrib/aliyun-oss-extensions</module>
<module>extensions-contrib/prometheus-emitter</module>
<module>extensions-contrib/opentelemetry-emitter</module>
- <module>extensions-contrib/kubernetes-overlord-extensions</module>
<module>extensions-contrib/grpc-query</module>
<module>extensions-contrib/druid-iceberg-extensions</module>
<module>extensions-contrib/druid-deltalake-extensions</module>
diff --git a/website/redirects.js b/website/redirects.js
index 6d2745378cc..7f5e13b549f 100644
--- a/website/redirects.js
+++ b/website/redirects.js
@@ -294,6 +294,10 @@ const Redirects=[
"from": "/docs/latest/development/extensions-contrib/google.html",
"to": "/docs/latest/development/extensions-core/google"
},
+ {
+ "from": "/docs/latest/development/extensions-contrib/k8s-jobs",
+ "to": "/docs/latest/development/extensions-core/k8s-jobs"
+ },
{
"from":
"/docs/latest/development/integrating-druid-with-other-technologies.html",
"to": "/docs/latest/ingestion/"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
