You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by cw...@apache.org on 2023/05/05 20:00:31 UTC

[druid] branch 26.0.0 updated: remove helm chart from release branch, again (#14211)

This is an automated email from the ASF dual-hosted git repository.

cwylie pushed a commit to branch 26.0.0
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/26.0.0 by this push:
     new 0c6d6a5599 remove helm chart from release branch, again (#14211)
0c6d6a5599 is described below

commit 0c6d6a55991e323c202a5084d004bd163547d51a
Author: Clint Wylie <cw...@apache.org>
AuthorDate: Fri May 5 13:00:18 2023 -0700

    remove helm chart from release branch, again (#14211)
    
    * remove helm chart, again
---
 README.md                                          |   1 -
 helm/druid/Chart.yaml                              |  41 --
 helm/druid/README.md                               | 248 ----------
 helm/druid/templates/NOTES.txt                     |  38 --
 helm/druid/templates/_capabilities.tpl             |  32 --
 helm/druid/templates/_helpers.tpl                  | 166 -------
 helm/druid/templates/broker/deployment.yaml        | 112 -----
 helm/druid/templates/broker/ingress.yaml           |  58 ---
 helm/druid/templates/broker/role.yaml              |  40 --
 helm/druid/templates/broker/roleBinding.yaml       |  39 --
 helm/druid/templates/broker/service.yaml           |  42 --
 helm/druid/templates/broker/serviceAccount.yaml    |  39 --
 helm/druid/templates/configmap.yaml                |  52 ---
 helm/druid/templates/coordinator/deployment.yaml   | 123 -----
 helm/druid/templates/coordinator/ingress.yaml      |  58 ---
 helm/druid/templates/coordinator/role.yaml         |  40 --
 helm/druid/templates/coordinator/roleBinding.yaml  |  39 --
 helm/druid/templates/coordinator/service.yaml      |  42 --
 .../templates/coordinator/serviceAccount.yaml      |  39 --
 helm/druid/templates/historical/ingress.yaml       |  58 ---
 helm/druid/templates/historical/pdb.yaml           |  43 --
 helm/druid/templates/historical/role.yaml          |  40 --
 helm/druid/templates/historical/roleBinding.yaml   |  39 --
 helm/druid/templates/historical/service.yaml       |  42 --
 .../druid/templates/historical/serviceAccount.yaml |  39 --
 helm/druid/templates/historical/statefulset.yaml   | 177 --------
 helm/druid/templates/middleManager/hpa.yaml        |  40 --
 helm/druid/templates/middleManager/ingress.yaml    |  58 ---
 helm/druid/templates/middleManager/pdb.yaml        |  43 --
 helm/druid/templates/middleManager/role.yaml       |  40 --
 .../druid/templates/middleManager/roleBinding.yaml |  39 --
 helm/druid/templates/middleManager/service.yaml    |  42 --
 .../templates/middleManager/serviceAccount.yaml    |  39 --
 .../druid/templates/middleManager/statefulset.yaml | 177 --------
 helm/druid/templates/overlord/deployment.yaml      | 123 -----
 helm/druid/templates/overlord/ingress.yaml         |  58 ---
 helm/druid/templates/overlord/role.yaml            |  46 --
 helm/druid/templates/overlord/roleBinding.yaml     |  39 --
 helm/druid/templates/overlord/service.yaml         |  42 --
 helm/druid/templates/overlord/serviceAccount.yaml  |  39 --
 helm/druid/templates/router/deployment.yaml        | 112 -----
 helm/druid/templates/router/ingress.yaml           |  58 ---
 helm/druid/templates/router/role.yaml              |  40 --
 helm/druid/templates/router/roleBinding.yaml       |  39 --
 helm/druid/templates/router/service.yaml           |  42 --
 helm/druid/templates/router/serviceAccount.yaml    |  39 --
 helm/druid/templates/secrets.yaml                  |  28 --
 helm/druid/values.yaml                             | 503 ---------------------
 48 files changed, 3373 deletions(-)

diff --git a/README.md b/README.md
index c23f11d224..8e705f3d59 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,6 @@
 
 [![Coverage Status](https://img.shields.io/codecov/c/gh/apache/druid)](https://codecov.io/gh/apache/druid)
 [![Docker](https://img.shields.io/badge/container-docker-blue.svg)](https://hub.docker.com/r/apache/druid)
-[![Helm](https://img.shields.io/badge/helm-druid-5F90AB?logo=helm)](https://github.com/apache/druid/blob/master/helm/druid/README.md)
 <!--- Following badges are disabled until they can be fixed: -->
 <!--- [![Inspections Status](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/OpenSourceProjects_Druid_Inspections.svg?label=TeamCity%20inspections)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=OpenSourceProjects_Druid_Inspections) -->
 
diff --git a/helm/druid/Chart.yaml b/helm/druid/Chart.yaml
deleted file mode 100644
index aeb629d9fc..0000000000
--- a/helm/druid/Chart.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.
-
-apiVersion: v2
-appVersion: 24.0.0
-description: Apache Druid is a high performance real-time analytics database.
-name: druid
-dependencies:
-  - name: zookeeper
-    version: 2.1.4
-    repository: https://charts.helm.sh/incubator
-    condition: zookeeper.enabled
-  - name: mysql
-    version: 1.6.4
-    repository: https://charts.helm.sh/stable
-    condition: mysql.enabled
-  - name: postgresql
-    version: 8.6.4
-    repository: https://charts.helm.sh/stable
-    condition: postgresql.enabled
-version: 0.3.5
-home: https://druid.apache.org/
-icon: https://druid.apache.org/img/favicon.png
-sources:
-  - https://github.com/apache/druid
-keywords:
-  - olap
-  - database
-  - analytics
diff --git a/helm/druid/README.md b/helm/druid/README.md
deleted file mode 100644
index 85c72ef2a8..0000000000
--- a/helm/druid/README.md
+++ /dev/null
@@ -1,248 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-# Apache Druid
-
-[Apache Druid](https://druid.apache.org/) is a high performance real-time analytics database.
-
-## Dependency Update
-
-Before you install the Druid Chart, update the dependencies :
-```bash
-helm dependency update helm/druid
-```
-
-## Install Chart
-
-To install the Druid Chart into your Kubernetes cluster :
-
-```bash
-helm install druid helm/druid --namespace dev --create-namespace
-```
-
-After installation succeeds, you can get a status of Chart
-
-```bash
-helm status druid -n dev 
-```
-
-If you want to delete your Chart, use this command:
-
-```bash
-helm uninstall druid -n dev
-```
-
-### Helm ingresses
-
-The Chart provides ingress configuration to allow customization the installation by adapting
-the `values.yaml` depending on your setup.
-Please read the comments in the `values.yaml` file for more details on how to configure your reverse
-proxy or load balancer.
-
-### Chart Prefix
-
-This Helm automatically prefixes all names using the release name to avoid collisions.
-
-### URL prefix
-
-This chart exposes 6 endpoints:
-
-- Druid Overlord
-- Druid Broker
-- Druid Coordinator
-- Druid Historical
-- Druid Middle Manager
-- Druid Router
-
-### Druid configuration
-
-Druid configuration can be changed by using environment variables from Docker image.
-
-See the
-[Druid Docker entry point](https://github.com/apache/druid/blob/master/distribution/docker/druid.sh)
-for more informations
-
-### Middle Manager and Historical Statefulset
-
-Middle Managers and Historicals uses StatefulSet. Persistence is enabled by default.
-
-## Helm chart Configuration
-
-The following table lists the configurable parameters of the Druid chart and their default values.
-
-| Parameter                                | Description                                             | Default                                    |
-|------------------------------------------|---------------------------------------------------------|--------------------------------------------|
-| `image.repository`                       | container image name                                    | `apache/druid`                             |
-| `image.tag`                              | container image tag                                     | `0.19.0`                                   |
-| `image.pullPolicy`                       | container pull policy                                   | `IfNotPresent`                             |
-| `image.pullSecrets`                      | image pull secrest for private repositoty               | `[]`                                       |
-| `configMap.enabled`                       | enable druid configuration as configmap                   | `true`                                     |
-| `configVars`                              | druid configuration variables for all components         | ``                                         |
-| `gCloudStorage.enabled`                  | look for secret to set google cloud credentials         | `false`                                    |
-| `gCloudStorage.secretName`               | secretName to be mounted as google cloud credentials    | `false`                                    |
-| `rbac.create`                            | Create roles and roleBindings for service Accounts      | `true`                                     |
-| `broker.enabled`                         | enable broker                                           | `true`                                     |
-| `broker.name`                            | broker component name                                   | `broker`                                   |
-| `broker.replicaCount`                    | broker node replicas (deployment)                       | `1`                                        |
-| `broker.port`                            | port of broker component                                | `8082`                                     |
-| `broker.serviceAccount.create`           | Create a service account for broker service             | `true`                                     |
-| `broker.serviceAccount.name`             | Service account name                                    | Derived from the name of service           |
-| `broker.serviceAccount.annotations`      | Annotations applied to created service account          | `{}`                                       |
-| `broker.serviceAccount.labels`           | Labels applied to created service account               | `{}`                                       |
-| `broker.serviceAccount.automountServiceAccountToken` | Automount API credentials for the Service Account | `true`                               |
-| `broker.serviceType`                     | service type for service                                | `ClusterIP`                                |
-| `broker.resources`                       | broker node resources requests & limits                 | `{}`                                       |
-| `broker.podAnnotations`                  | broker deployment annotations                           | `{}`                                       |
-| `broker.nodeSelector`                    | Node labels for broker pod assignment                   | `{}`                                       |
-| `broker.tolerations`                     | broker tolerations                                      | `[]`                                       |
-| `broker.config`                           | broker private config such as `JAVA_OPTS`                |                                            |
-| `broker.affinity`                         | broker affinity policy                                   | `{}`                                       |
-| `broker.ingress.enabled`                 | enable ingress                                          | `false`                                    |
-| `broker.ingress.hosts`                   | hosts for the broker api                                | `[ "chart-example.local" ]`                |
-| `broker.ingress.path`                    | path of the broker api                                  | `/`                                        |
-| `broker.ingress.annotations`             | annotations for the broker api ingress                  | `{}`                                       |
-| `broker.ingress.tls`                     | TLS configuration for the ingress                        | `[]`                                       |
-| `coordinator.enabled`                    | enable coordinator                                      | `true`                                     |
-| `coordinator.name`                       | coordinator component name                              | `coordinator`                              |
-| `coordinator.replicaCount`               | coordinator node replicas (deployment)                  | `1`                                        |
-| `coordinator.port`                       | port of coordinator component                           | `8081`                                     |
-| `coordinator.serviceType`                | service type for service                                | `ClusterIP`                                |
-| `coordinator.serviceAccount.create`      | Create a service account for coordinator service        | `true`                                     |
-| `coordinator.serviceAccount.name`        | Service account name                                    | Derived from the name of service           |
-| `coordinator.serviceAccount.annotations` | Annotations applied to created service account          | `{}`                                       |
-| `coordinator.serviceAccount.labels`      | Labels applied to created service account               | `{}`                                       |
-| `coordinator.serviceAccount.automountServiceAccountToken` | Automount API credentials for the Service Account | `true`                          |
-| `coordinator.resources`                  | coordinator node resources requests & limits            | `{}`                                       |
-| `coordinator.podAnnotations`             | coordinator Deployment annotations                      | `{}`                                       |
-| `coordinator.nodeSelector`               | node labels for coordinator pod assignment              | `{}`                                       |
-| `coordinator.tolerations`                | coordinator tolerations                                 | `[]`                                       |
-| `coordinator.config`                      | coordinator private config such as `JAVA_OPTS`           |                                            |
-| `coordinator.affinity`                    | coordinator affinity policy                              | `{}`                                       |
-| `coordinator.ingress.enabled`            | enable ingress                                          | `false`                                    |
-| `coordinator.ingress.hosts`              | hosts for the coordinator api                           | `[ "chart-example.local" ]`                |
-| `coordinator.ingress.path`               | path of the coordinator api                             | `/`                                        |
-| `coordinator.ingress.annotations`        | annotations for the coordinator api ingress             | `{}`                                       |
-| `coordinator.ingress.tls`                | TLS configuration for the ingress                        | `[]`                                       |
-| `overlord.enabled`                       | enable overlord                                         | `false`                                    |
-| `overlord.name`                          | overlord component name                                 | `overlord`                                 |
-| `overlord.replicaCount`                  | overlord node replicas (deployment)                     | `1`                                        |
-| `overlord.port`                          | port of overlord component                              | `8081`                                     |
-| `overlord.serviceType`                   | service type for service                                | `ClusterIP`                                |
-| `overlord.serviceAccount.create`         | Create a service account for overlord service           | `true`                                     |
-| `overlord.serviceAccount.name`           | Service account name                                    | Derived from the name of service           |
-| `overlord.serviceAccount.annotations`    | Annotations applied to created service account          | `{}`                                       |
-| `overlord.serviceAccount.labels`         | Labels applied to created service account               | `{}`                                       |
-| `overlord.serviceAccount.automountServiceAccountToken` | Automount API credentials for the Service Account | `true`                             |
-| `overlord.resources`                     | overlord node resources requests & limits               | `{}`                                       |
-| `overlord.podAnnotations`                | overlord Deployment annotations                         | `{}`                                       |
-| `overlord.nodeSelector`                  | node labels for overlord pod assignment                 | `{}`                                       |
-| `overlord.tolerations`                   | overlord tolerations                                    | `[]`                                       |
-| `overlord.config`                         | overlord private config such as `JAVA_OPTS`              |                                            |
-| `overlord.affinity`                       | overlord affinity policy                                 | `{}`                                       |
-| `overlord.ingress.enabled`               | enable ingress                                          | `false`                                    |
-| `overlord.ingress.hosts`                 | hosts for the overlord api                              | `[ "chart-example.local" ]`                |
-| `overlord.ingress.path`                  | path of the overlord api                                | `/`                                        |
-| `overlord.ingress.annotations`           | annotations for the overlord api ingress                | `{}`                                       |
-| `overlord.ingress.tls`                   | TLS configuration for the ingress                        | `[]`                                       |
-| `historical.enabled`                     | enable historical                                       | `true`                                     |
-| `historical.name`                        | historical component name                               | `historical`                               |
-| `historical.replicaCount`                | historical node replicas (statefulset)                  | `1`                                        |
-| `historical.port`                        | port of historical component                            | `8083`                                     |
-| `historical.serviceType`                 | service type for service                                | `ClusterIP`                                |
-| `historical.serviceAccount.create`       | Create a service account for historical service         | `true`                                     |
-| `historical.serviceAccount.name`         | Service account name                                    | Derived from the name of service           |
-| `historical.serviceAccount.annotations`  | Annotations applied to created service account          | `{}`                                       |
-| `historical.serviceAccount.labels`       | Labels applied to created service account               | `{}`                                       |
-| `historical.serviceAccount.automountServiceAccountToken` | Automount API credentials for the Service Account | `true`                           |
-| `historical.resources`                   | historical node resources requests & limits             | `{}`                                       |
-| `historical.livenessProbeInitialDelaySeconds`  | historical node liveness probe initial delay in seconds  | `60`                                |
-| `historical.readinessProbeInitialDelaySeconds` | historical node readiness probe initial delay in seconds | `60`                                |
-| `historical.podAnnotations`              | historical Deployment annotations                       | `{}`                                       |
-| `historical.nodeSelector`                | node labels for historical pod assignment               | `{}`                                       |
-| `historical.securityContext`             | custom security context for historical containers       | `{ fsGroup: 1000 }`                        |
-| `historical.tolerations`                 | historical tolerations                                  | `[]`                                       |
-| `historical.config`                       | historical node private config such as `JAVA_OPTS`       |                                            |
-| `historical.persistence.enabled`         | historical persistent enabled/disabled                  | `true`                                     |
-| `historical.persistence.size`            | historical persistent volume size                       | `4Gi`                                      |
-| `historical.persistence.storageClass`    | historical persistent volume Class                      | `nil`                                      |
-| `historical.persistence.accessMode`      | historical persistent Access Mode                       | `ReadWriteOnce`                            |
-| `historical.antiAffinity`                 | historical anti-affinity policy                          | `soft`                                     |
-| `historical.nodeAffinity`                 | historical node affinity policy                          | `{}`                                       |
-| `historical.ingress.enabled`             | enable ingress                                          | `false`                                    |
-| `historical.ingress.hosts`               | hosts for the historical api                            | `[ "chart-example.local" ]`                |
-| `historical.ingress.path`                | path of the historical api                              | `/`                                        |
-| `historical.ingress.annotations`         | annotations for the historical api ingress              | `{}`                                       |
-| `historical.ingress.tls`                 | TLS configuration for the ingress                        | `[]`                                       |
-| `middleManager.enabled`                  | enable middleManager                                    | `true`                                     |
-| `middleManager.name`                     | middleManager component name                            | `middleManager`                            |
-| `middleManager.replicaCount`             | middleManager node replicas (statefulset)               | `1`                                        |
-| `middleManager.port`                     | port of middleManager component                         | `8091`                                     |
-| `middleManager.serviceType`              | service type for service                                | `ClusterIP`                                |
-| `middleManager.serviceAccount.create`    | Create a service account for middleManager service      | `true`                                     |
-| `middleManager.serviceAccount.name`      | Service account name                                    | ``                                         |
-| `middleManager.serviceAccount.annotations` | Annotations applied to created service account        | `{}`                                       |
-| `middleManager.serviceAccount.labels`    | Labels applied to created service account               | `{}`                                       |
-| `middleManager.serviceAccount.automountServiceAccountToken` | Automount API credentials for the Service Account | `true`                        |
-| `middleManager.resources`                | middleManager node resources requests & limits          | `{}`                                       |
-| `middleManager.podAnnotations`           | middleManager Deployment annotations                    | `{}`                                       |
-| `middleManager.nodeSelector`             | Node labels for middleManager pod assignment            | `{}`                                       |
-| `middleManager.securityContext`          | custom security context for middleManager containers    | `{ fsGroup: 1000 }`                        |
-| `middleManager.tolerations`              | middleManager tolerations                               | `[]`                                       |
-| `middleManager.config`                    | middleManager private config such as `JAVA_OPTS`         |                                            |
-| `middleManager.persistence.enabled`      | middleManager persistent enabled/disabled               | `true`                                     |
-| `middleManager.persistence.size`         | middleManager persistent volume size                    | `4Gi`                                      |
-| `middleManager.persistence.storageClass` | middleManager persistent volume Class                   | `nil`                                      |
-| `middleManager.persistence.accessMode`   | middleManager persistent Access Mode                    | `ReadWriteOnce`                            |
-| `middleManager.antiAffinity`              | middleManager anti-affinity policy                       | `soft`                                     |
-| `middleManager.nodeAffinity`              | middleManager node affinity policy                       | `{}`                                       |
-| `middleManager.autoscaling.enabled`      | enable horizontal pod autoscaling                       | `false`                                    |
-| `middleManager.autoscaling.minReplicas`  | middleManager autoscaling min replicas                  | `2`                                        |
-| `middleManager.autoscaling.maxReplicas`  | middleManager autoscaling max replicas                  | `5`                                        |
-| `middleManager.autoscaling.metrics`      | middleManager autoscaling metrics                       | `{}`                                       |
-| `middleManager.ingress.enabled`          | enable ingress                                          | `false`                                    |
-| `middleManager.ingress.hosts`            | hosts for the middleManager api                         | `[ "chart-example.local" ]`                |
-| `middleManager.ingress.path`             | path of the middleManager api                           | `/`                                        |
-| `middleManager.ingress.annotations`      | annotations for the middleManager api ingress           | `{}`                                       |
-| `middleManager.ingress.tls`              | TLS configuration for the ingress                        | `[]`                                       |
-| `router.enabled`                         | enable router                                           | `false`                                    |
-| `router.name`                            | router component name                                   | `router`                                   |
-| `router.replicaCount`                    | router node replicas (deployment)                       | `1`                                        |
-| `router.port`                            | port of router component                                | `8888`                                     |
-| `router.serviceType`                     | service type for service                                | `ClusterIP`                                |
-| `router.serviceAccount.create`           | Create a service account for router service             | `true`                                     |
-| `router.serviceAccount.name`             | Service account name                                    | Derived from the name of service           |
-| `router.serviceAccount.annotations`      | Annotations applied to created service account          | `{}`                                       |
-| `router.serviceAccount.labels`           | Labels applied to created service account               | `{}`                                       |
-| `router.serviceAccount.automountServiceAccountToken` | Automount API credentials for the Service Account | `true`                               |
-| `router.resources`                       | router node resources requests & limits                 | `{}`                                       |
-| `router.podAnnotations`                  | router Deployment annotations                           | `{}`                                       |
-| `router.nodeSelector`                    | node labels for router pod assignment                   | `{}`                                       |
-| `router.tolerations`                     | router tolerations                                      | `[]`                                       |
-| `router.config`                           | router private config such as `JAVA_OPTS`                |                                            |
-| `router.affinity`                         | router affinity policy                                   | `{}`                                       |
-| `router.ingress.enabled`                 | enable ingress                                          | `false`                                    |
-| `router.ingress.hosts`                   | hosts for the router api                                | `[ "chart-example.local" ]`                |
-| `router.ingress.path`                    | path of the router api                                  | `/`                                        |
-| `router.ingress.annotations`             | annotations for the router api ingress                  | `{}`                                       |
-| `router.ingress.tls`                     | TLS configuration for the ingress                        | `[]`                                       |
-| `prometheus.enabled`                     | Support scraping from prometheus                     | `false`                                                       |
-| `prometheus.port`                        | expose prometheus port                               | `9090`                                                        |
-| `prometheus.annotation`                  | pods annotation to notify prometheus scraping        | `{prometheus.io/scrape: "true", prometheus.io/port: "9090"}`  |
-
-Full and up-to-date documentation can be found in the comments of the `values.yaml` file.
diff --git a/helm/druid/templates/NOTES.txt b/helm/druid/templates/NOTES.txt
deleted file mode 100644
index be1c96faa2..0000000000
--- a/helm/druid/templates/NOTES.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-1. Get the router URL by running these commands:
-{{- if .Values.router.ingress.enabled }}
-{{- range .Values.router.ingress.hosts }}
-  http{{ if $.Values.router.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.router.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.router.serviceType }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "druid.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.router.serviceType }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "druid.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "druid.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.router.port }}
-{{- else if contains "ClusterIP" .Values.router.serviceType }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "druid.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ .Values.router.port }}
-{{- end }}
diff --git a/helm/druid/templates/_capabilities.tpl b/helm/druid/templates/_capabilities.tpl
deleted file mode 100644
index 2cccff8a27..0000000000
--- a/helm/druid/templates/_capabilities.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{/*
- 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.
-*/}}
-
-{{/*
-Return the target Kubernetes version
-*/}}
-{{- define "capabilities.kubeVersion" -}}
-{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
-{{- end -}}
-
-{{/*
-Return the appropriate apiVersion for poddisruptionbudget.
-*/}}
-{{- define "capabilities.policy.apiVersion" -}}
-{{- if semverCompare "<1.21-0" (include "capabilities.kubeVersion" .) -}}
-{{- print "policy/v1beta1" -}}
-{{- else -}}
-{{- print "policy/v1" -}}
-{{- end -}}
-{{- end -}}
diff --git a/helm/druid/templates/_helpers.tpl b/helm/druid/templates/_helpers.tpl
deleted file mode 100644
index a4ca3c9a0e..0000000000
--- a/helm/druid/templates/_helpers.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "druid.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "druid.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "druid.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified historical name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "druid.historical.fullname" -}}
-{{ template "druid.fullname" . }}-{{ .Values.historical.name }}
-{{- end -}}
-
-{{/*
-Create a default fully qualified middleManager name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "druid.middleManager.fullname" -}}
-{{ template "druid.fullname" . }}-{{ .Values.middleManager.name }}
-{{- end -}}
-
-
-{{/*
-Create a default fully qualified broker name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "druid.broker.fullname" -}}
-{{ template "druid.fullname" . }}-{{ .Values.broker.name }}
-{{- end -}}
-
-{{/*
-Create a default fully qualified overlord name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "druid.overlord.fullname" -}}
-{{ template "druid.fullname" . }}-{{ .Values.overlord.name }}
-{{- end -}}
-
-{{/*
-Create a default fully qualified coordinator name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "druid.coordinator.fullname" -}}
-{{ template "druid.fullname" . }}-{{ .Values.coordinator.name }}
-{{- end -}}
-
-{{/*
-Create a default fully qualified router name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "druid.router.fullname" -}}
-{{ template "druid.fullname" . }}-{{ .Values.router.name }}
-{{- end -}}
-
-{{/*
-Create the name of the broker service account
-*/}}
-{{- define "druid.broker.serviceAccountName" -}}
-  {{- if .Values.broker.serviceAccount.create }}
-    {{- default (include "druid.broker.fullname" .) .Values.broker.serviceAccount.name }}
-  {{- else }}
-    {{- default "default" .Values.broker.serviceAccount.name }}
-  {{- end }}
-{{- end }}
-
-{{/*
-Create the name of the historical service account
-*/}}
-{{- define "druid.historical.serviceAccountName" -}}
-  {{- if .Values.historical.serviceAccount.create }}
-    {{- default (include "druid.historical.fullname" .) .Values.historical.serviceAccount.name }}
-  {{- else }}
-    {{- default "default" .Values.historical.serviceAccount.name }}
-  {{- end }}
-{{- end }}
-
-{{/*
-Create the name of the middleManager service account
-*/}}
-{{- define "druid.middleManager.serviceAccountName" -}}
-  {{- if .Values.middleManager.serviceAccount.create }}
-    {{- default (include "druid.middleManager.fullname" .) .Values.middleManager.serviceAccount.name }}
-  {{- else }}
-    {{- default "default" .Values.middleManager.serviceAccount.name }}
-  {{- end }}
-{{- end }}
-
-{{/*
-Create the name of the coordinator service account
-*/}}
-{{- define "druid.coordinator.serviceAccountName" -}}
-  {{- if .Values.coordinator.serviceAccount.create }}
-    {{- default (include "druid.coordinator.fullname" .) .Values.coordinator.serviceAccount.name }}
-  {{- else }}
-    {{- default "default" .Values.coordinator.serviceAccount.name }}
-  {{- end }}
-{{- end }}
-
-{{/*
-Create the name of the overlord service account
-*/}}
-{{- define "druid.overlord.serviceAccountName" -}}
-  {{- if .Values.overlord.serviceAccount.create }}
-    {{- default (include "druid.overlord.fullname" .) .Values.overlord.serviceAccount.name }}
-  {{- else }}
-    {{- default "default" .Values.overlord.serviceAccount.name }}
-  {{- end }}
-{{- end }}
-
-{{/*
-Create the name of the router service account
-*/}}
-{{- define "druid.router.serviceAccountName" -}}
-  {{- if .Values.router.serviceAccount.create }}
-    {{- default (include "druid.router.fullname" .) .Values.router.serviceAccount.name }}
-  {{- else }}
-    {{- default "default" .Values.router.serviceAccount.name }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/broker/deployment.yaml b/helm/druid/templates/broker/deployment.yaml
deleted file mode 100644
index 80251de1ec..0000000000
--- a/helm/druid/templates/broker/deployment.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.broker.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "druid.broker.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.broker.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.broker.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "druid.name" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Values.broker.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "druid.name" . }}
-        release: {{ .Release.Name }}
-        component: {{ .Values.broker.name }}
-      annotations:
-        druid.k8s.enablePatching: "true"
-        {{- with .Values.broker.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.prometheus.enabled }}
-          {{- with .Values.prometheus.annotation }}
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-        {{- end }}
-    spec:
-      {{- if .Values.broker.serviceAccount.create }}
-      serviceAccountName: {{ include "druid.broker.serviceAccountName" . }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: [ "broker" ]
-          env:
-          - name: POD_NAME
-            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
-          - name: POD_NAMESPACE
-            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
-          {{- range $key, $val := .Values.broker.config }}
-          - name: {{ $key }}
-            value: {{ $val | quote }}
-          {{- end}}
-          envFrom:
-            - configMapRef:
-                name: {{ template "druid.name" . }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.broker.port }}
-              protocol: TCP
-            {{- if .Values.prometheus.enabled }}
-            - name: prometheus
-              containerPort: {{ .Values.prometheus.port }}
-              protocol: TCP
-            {{- end }}
-          livenessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.broker.port }}
-          readinessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.broker.port }}
-          resources:
-{{ toYaml .Values.broker.resources | indent 12 }}
-    {{- with .Values.broker.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.broker.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.broker.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/broker/ingress.yaml b/helm/druid/templates/broker/ingress.yaml
deleted file mode 100644
index df27d7e35c..0000000000
--- a/helm/druid/templates/broker/ingress.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.broker.ingress.enabled -}}
-{{- $fullName := include "druid.broker.fullname" . -}}
-{{- $ingressPath := .Values.broker.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.broker.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.broker.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.broker.ingress.tls }}
-  tls:
-  {{- range .Values.broker.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.broker.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/broker/role.yaml b/helm/druid/templates/broker/role.yaml
deleted file mode 100644
index f6ff22d8b5..0000000000
--- a/helm/druid/templates/broker/role.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.broker.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "druid.broker.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.broker.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - configmaps
-    verbs:
-      - '*'
-{{- end }}
-
diff --git a/helm/druid/templates/broker/roleBinding.yaml b/helm/druid/templates/broker/roleBinding.yaml
deleted file mode 100644
index 0667c282cf..0000000000
--- a/helm/druid/templates/broker/roleBinding.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.broker.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "druid.broker.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.broker.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "druid.broker.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "druid.broker.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/helm/druid/templates/broker/service.yaml b/helm/druid/templates/broker/service.yaml
deleted file mode 100644
index 4c76785534..0000000000
--- a/helm/druid/templates/broker/service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.broker.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "druid.broker.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.broker.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.broker.serviceType }}
-  ports:
-    - port: {{ .Values.broker.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "druid.name" . }}
-    release: {{ .Release.Name }}
-    component: {{ .Values.broker.name }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/broker/serviceAccount.yaml b/helm/druid/templates/broker/serviceAccount.yaml
deleted file mode 100644
index 644aa7dad8..0000000000
--- a/helm/druid/templates/broker/serviceAccount.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.broker.serviceAccount.create) (.Values.broker.enabled) }}
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: {{ .Values.broker.serviceAccount.automountServiceAccountToken }}
-metadata:
-  name: {{ include "druid.broker.serviceAccountName" . }}
-  {{- with .Values.broker.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.broker.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  {{- with .Values.broker.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/configmap.yaml b/helm/druid/templates/configmap.yaml
deleted file mode 100644
index ef8e67af4c..0000000000
--- a/helm/druid/templates/configmap.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.configMap.enabled -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "druid.name" . }}
-  labels:
-    app: {{ template "druid.name" . }}
-    chart: {{ template "druid.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ toYaml .Values.configVars | indent 2 }}
-{{- if .Values.zookeeper.enabled }}
-  druid_zk_service_host: {{ .Release.Name }}-zookeeper-headless:2181
-{{- else if .Values.zkHosts }}
-  druid_zk_service_host: {{ .Values.zkHosts }}
-{{- end }}
-{{- if .Values.mysql.enabled }}
-  druid_metadata_storage_type: mysql
-  druid_metadata_storage_connector_connectURI: jdbc:mysql://{{ .Release.Name }}-mysql:3306/{{ .Values.mysql.mysqlDatabase}}
-  druid_metadata_storage_connector_user: {{ .Values.mysql.mysqlUser }}
-  druid_metadata_storage_connector_password: {{ .Values.mysql.mysqlPassword }}
-{{- end }}
-{{- if .Values.postgresql.enabled }}
-  druid_metadata_storage_type: postgresql
-  druid_metadata_storage_connector_connectURI: jdbc:postgresql://{{ .Release.Name }}-postgresql:{{ .Values.postgresql.service.port}}/{{ .Values.postgresql.postgresqlDatabase }}
-  druid_metadata_storage_connector_user: {{ .Values.postgresql.postgresqlUsername }}
-  druid_metadata_storage_connector_password: {{ .Values.postgresql.postgresqlPassword }}
-{{- end }}
-{{- if .Values.gCloudStorage.enabled }}
-  GOOGLE_APPLICATION_CREDENTIALS: /var/secrets/google/key.json
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/coordinator/deployment.yaml b/helm/druid/templates/coordinator/deployment.yaml
deleted file mode 100644
index 66456a5112..0000000000
--- a/helm/druid/templates/coordinator/deployment.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.coordinator.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "druid.coordinator.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.coordinator.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.coordinator.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "druid.name" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Values.coordinator.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "druid.name" . }}
-        release: {{ .Release.Name }}
-        component: {{ .Values.coordinator.name }}
-      annotations:
-        druid.k8s.enablePatching: "true"
-        {{- with .Values.coordinator.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.prometheus.enabled }}
-          {{- with .Values.prometheus.annotation }}
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-        {{- end }}
-    spec:
-      {{- if .Values.coordinator.serviceAccount.create }}
-      serviceAccountName: {{ include "druid.coordinator.serviceAccountName" . }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: [ "coordinator" ]
-          env:
-          - name: POD_NAME
-            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
-          - name: POD_NAMESPACE
-            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
-          {{- range $key, $val := .Values.coordinator.config }}
-          - name: {{ $key }}
-            value: {{ $val | quote }}
-          {{- end}}
-          envFrom:
-            - configMapRef:
-                name: {{ template "druid.name" . }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.coordinator.port }}
-              protocol: TCP
-            {{- if .Values.prometheus.enabled }}
-            - name: prometheus
-              containerPort: {{ .Values.prometheus.port }}
-              protocol: TCP
-            {{- end }}
-          livenessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.coordinator.port }}
-          readinessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.coordinator.port }}
-          resources:
-{{ toYaml .Values.coordinator.resources | indent 12 }}
-          volumeMounts:
-  {{- if .Values.gCloudStorage.enabled }}
-            - name: google-cloud-key
-              mountPath: /var/secrets/google
-  {{- end }}
-      volumes:
-  {{- if .Values.gCloudStorage.enabled }}
-      - name: google-cloud-key
-        secret:
-          secretName: {{ .Values.gCloudStorage.secretName }}
-  {{- end }}
-    {{- with .Values.coordinator.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.coordinator.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.coordinator.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/coordinator/ingress.yaml b/helm/druid/templates/coordinator/ingress.yaml
deleted file mode 100644
index 8d64ea77de..0000000000
--- a/helm/druid/templates/coordinator/ingress.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.coordinator.ingress.enabled -}}
-{{- $fullName := include "druid.coordinator.fullname" . -}}
-{{- $ingressPath := .Values.coordinator.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.coordinator.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.coordinator.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.coordinator.ingress.tls }}
-  tls:
-  {{- range .Values.coordinator.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.coordinator.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/coordinator/role.yaml b/helm/druid/templates/coordinator/role.yaml
deleted file mode 100644
index c4dc3ba136..0000000000
--- a/helm/druid/templates/coordinator/role.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.coordinator.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "druid.coordinator.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.coordinator.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - configmaps
-    verbs:
-      - '*'
-{{- end }}
-
diff --git a/helm/druid/templates/coordinator/roleBinding.yaml b/helm/druid/templates/coordinator/roleBinding.yaml
deleted file mode 100644
index fd60eb5d06..0000000000
--- a/helm/druid/templates/coordinator/roleBinding.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.coordinator.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "druid.coordinator.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.coordinator.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "druid.coordinator.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "druid.coordinator.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/helm/druid/templates/coordinator/service.yaml b/helm/druid/templates/coordinator/service.yaml
deleted file mode 100644
index 953b03fec6..0000000000
--- a/helm/druid/templates/coordinator/service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.coordinator.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "druid.coordinator.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.coordinator.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.coordinator.serviceType }}
-  ports:
-    - port: {{ .Values.coordinator.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "druid.name" . }}
-    release: {{ .Release.Name }}
-    component: {{ .Values.coordinator.name }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/coordinator/serviceAccount.yaml b/helm/druid/templates/coordinator/serviceAccount.yaml
deleted file mode 100644
index b7778322c7..0000000000
--- a/helm/druid/templates/coordinator/serviceAccount.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.coordinator.serviceAccount.create) (.Values.coordinator.enabled) }}
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: {{ .Values.coordinator.serviceAccount.automountServiceAccountToken }}
-metadata:
-  name: {{ include "druid.coordinator.serviceAccountName" . }}
-  {{- with .Values.coordinator.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.coordinator.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  {{- with .Values.coordinator.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/historical/ingress.yaml b/helm/druid/templates/historical/ingress.yaml
deleted file mode 100644
index 466e3c5ae5..0000000000
--- a/helm/druid/templates/historical/ingress.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.historical.ingress.enabled -}}
-{{- $fullName := include "druid.historical.fullname" . -}}
-{{- $ingressPath := .Values.historical.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.historical.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.historical.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.historical.ingress.tls }}
-  tls:
-  {{- range .Values.historical.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.historical.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/historical/pdb.yaml b/helm/druid/templates/historical/pdb.yaml
deleted file mode 100644
index c921b1909d..0000000000
--- a/helm/druid/templates/historical/pdb.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.historical.podDisruptionBudget.enabled }}
-apiVersion: {{ include "capabilities.policy.apiVersion" . }}
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    app: {{ template "druid.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: {{ .Values.historical.name }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "druid.historical.fullname" . }}
-spec:
-{{- if .Values.historical.podDisruptionBudget.minAvailable }}
-  minAvailable: {{ .Values.historical.podDisruptionBudget.minAvailable }}
-{{- end }}
-{{- if .Values.historical.podDisruptionBudget.maxUnavailable }}
-  maxUnavailable: {{ .Values.historical.podDisruptionBudget.maxUnavailable }}
-{{- end }}
-  selector:
-    matchLabels:
-      app: {{ template "druid.name" . }}
-      component: {{ .Values.historical.name }}
-      release: {{ .Release.Name }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/historical/role.yaml b/helm/druid/templates/historical/role.yaml
deleted file mode 100644
index b4be8cc42f..0000000000
--- a/helm/druid/templates/historical/role.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.historical.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "druid.historical.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.historical.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - configmaps
-    verbs:
-      - '*'
-{{- end }}
-
diff --git a/helm/druid/templates/historical/roleBinding.yaml b/helm/druid/templates/historical/roleBinding.yaml
deleted file mode 100644
index aa9e9fbeb3..0000000000
--- a/helm/druid/templates/historical/roleBinding.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.historical.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "druid.historical.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.historical.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "druid.historical.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "druid.historical.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/helm/druid/templates/historical/service.yaml b/helm/druid/templates/historical/service.yaml
deleted file mode 100644
index 2ccbe539bc..0000000000
--- a/helm/druid/templates/historical/service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.historical.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "druid.historical.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.historical.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.historical.serviceType }}
-  ports:
-    - port: {{ .Values.historical.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "druid.name" . }}
-    release: {{ .Release.Name }}
-    component: {{ .Values.historical.name }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/historical/serviceAccount.yaml b/helm/druid/templates/historical/serviceAccount.yaml
deleted file mode 100644
index 2524503c89..0000000000
--- a/helm/druid/templates/historical/serviceAccount.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.historical.serviceAccount.create) (.Values.historical.enabled) }}
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: {{ .Values.historical.serviceAccount.automountServiceAccountToken }}
-metadata:
-  name: {{ include "druid.historical.serviceAccountName" . }}
-  {{- with .Values.historical.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.historical.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  {{- with .Values.historical.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/historical/statefulset.yaml b/helm/druid/templates/historical/statefulset.yaml
deleted file mode 100644
index 0e12c6508c..0000000000
--- a/helm/druid/templates/historical/statefulset.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.historical.enabled -}}
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  labels:
-    app: {{ template "druid.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: {{ .Values.historical.name }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "druid.historical.fullname" . }}
-spec:
-  serviceName: {{ template "druid.historical.fullname" . }}
-  replicas: {{ .Values.historical.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "druid.name" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Values.historical.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "druid.name" . }}
-        component: {{ .Values.historical.name }}
-        release: {{ .Release.Name }}
-      annotations:
-        druid.k8s.enablePatching: "true"
-        {{- with .Values.historical.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.prometheus.enabled }}
-          {{- with .Values.prometheus.annotation }}
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-        {{- end }}
-    spec:
-      {{- if or .Values.historical.antiAffinity .Values.historical.nodeAffinity }}
-      affinity:
-      {{- end }}
-      {{- if eq .Values.historical.antiAffinity "hard" }}
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - topologyKey: "kubernetes.io/hostname"
-              labelSelector:
-                matchLabels:
-                  app: "{{ template "druid.name" . }}"
-                  release: "{{ .Release.Name }}"
-                  component: "{{ .Values.historical.name }}"
-      {{- else if eq .Values.historical.antiAffinity "soft" }}
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              topologyKey: kubernetes.io/hostname
-              labelSelector:
-                matchLabels:
-                  app: "{{ template "druid.name" . }}"
-                  release: "{{ .Release.Name }}"
-                  component: "{{ .Values.historical.name }}"
-      {{- end }}
-      {{- with .Values.historical.nodeAffinity }}
-        nodeAffinity:
-{{ toYaml . | indent 10 }}
-      {{- end }}
-{{- if .Values.historical.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.historical.nodeSelector | indent 8 }}
-{{- end }}
-{{- if .Values.historical.securityContext }}
-      securityContext:
-{{ toYaml .Values.historical.securityContext | indent 8 }}
-{{- end }}
-{{- if .Values.historical.tolerations }}
-      tolerations:
-{{ toYaml .Values.historical.tolerations | indent 8 }}
-{{- end }}
-{{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.image.pullSecrets | indent 8 }}
-{{- end }}
-      {{- if .Values.historical.serviceAccount.create }}
-      serviceAccountName: {{ include "druid.historical.serviceAccountName" . }}
-      {{- end }}
-      containers:
-      - name: druid
-        args: [ "historical" ]
-        env:
-        - name: POD_NAME
-          valueFrom:  {fieldRef: {fieldPath: metadata.name}}
-        - name: POD_NAMESPACE
-          valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
-        {{- range $key, $val := .Values.historical.config }}
-        - name: {{ $key }}
-          value: {{ $val | quote }}
-        {{- end}}
-        envFrom:
-          - configMapRef:
-              name: {{ template "druid.name" . }}
-        resources:
-{{ toYaml .Values.historical.resources | indent 12 }}
-        livenessProbe:
-          initialDelaySeconds: {{ .Values.historical.livenessProbeInitialDelaySeconds }}
-          httpGet:
-            path: /status/health
-            port: {{ .Values.historical.port }}
-        readinessProbe:
-          initialDelaySeconds: {{ .Values.historical.readinessProbeInitialDelaySeconds }}
-          httpGet:
-            path: /status/health
-            port: {{ .Values.historical.port }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-        ports:
-        - containerPort: {{ .Values.historical.port }}
-          name: http
-        {{- if .Values.prometheus.enabled }}
-        - name: prometheus
-          containerPort: {{ .Values.prometheus.port }}
-          protocol: TCP
-        {{- end }}
-        volumeMounts:
-        - mountPath: /opt/druid/var/druid/
-          name: data
-  {{- if .Values.gCloudStorage.enabled }}
-        - name: google-cloud-key
-          mountPath: /var/secrets/google
-  {{- end }}
-      volumes:
-  {{- if not .Values.historical.persistence.enabled }} 
-      - name: data
-        emptyDir: {}
-  {{- end }}
-  {{- if .Values.gCloudStorage.enabled }}
-      - name: google-cloud-key
-        secret:
-          secretName: {{ .Values.gCloudStorage.secretName }}
-  {{- end }}
-  updateStrategy:
-    type: {{ .Values.historical.updateStrategy.type }}
-  {{- if .Values.historical.persistence.enabled }}
-  volumeClaimTemplates:
-  - metadata:
-      name: data
-    spec:
-      accessModes:
-        - {{ .Values.historical.persistence.accessMode | quote }}
-    {{- if .Values.historical.persistence.storageClass }}
-    {{- if (eq "-" .Values.historical.persistence.storageClass) }}
-      storageClassName: ""
-    {{- else }}
-      storageClassName: "{{ .Values.historical.persistence.storageClass }}"
-    {{- end }}
-    {{- end }}
-      resources:
-        requests:
-          storage: "{{ .Values.historical.persistence.size }}"
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/middleManager/hpa.yaml b/helm/druid/templates/middleManager/hpa.yaml
deleted file mode 100644
index fcda2f2f1b..0000000000
--- a/helm/druid/templates/middleManager/hpa.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.middleManager.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "druid.middleManager.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: "{{ .Values.name }}"
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: StatefulSet
-    name: {{ include "druid.middleManager.fullname" . }}
-  minReplicas: {{ .Values.middleManager.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.middleManager.autoscaling.maxReplicas }}
-  metrics:
-{{ toYaml .Values.middleManager.autoscaling.metrics | indent 4 }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/middleManager/ingress.yaml b/helm/druid/templates/middleManager/ingress.yaml
deleted file mode 100644
index 672580a2e7..0000000000
--- a/helm/druid/templates/middleManager/ingress.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.middleManager.ingress.enabled -}}
-{{- $fullName := include "druid.middleManager.fullname" . -}}
-{{- $ingressPath := .Values.middleManager.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.middleManager.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.middleManager.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.middleManager.ingress.tls }}
-  tls:
-  {{- range .Values.middleManager.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.middleManager.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/middleManager/pdb.yaml b/helm/druid/templates/middleManager/pdb.yaml
deleted file mode 100644
index 71a592979a..0000000000
--- a/helm/druid/templates/middleManager/pdb.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.middleManager.podDisruptionBudget.enabled }}
-apiVersion: {{ include "capabilities.policy.apiVersion" . }}
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    app: {{ template "druid.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: {{ .Values.middleManager.name }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "druid.middleManager.fullname" . }}
-spec:
-{{- if .Values.middleManager.podDisruptionBudget.minAvailable }}
-  minAvailable: {{ .Values.middleManager.podDisruptionBudget.minAvailable }}
-{{- end }}
-{{- if .Values.middleManager.podDisruptionBudget.maxUnavailable }}
-  maxUnavailable: {{ .Values.middleManager.podDisruptionBudget.maxUnavailable }}
-{{- end }}
-  selector:
-    matchLabels:
-      app: {{ template "druid.name" . }}
-      component: {{ .Values.middleManager.name }}
-      release: {{ .Release.Name }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/middleManager/role.yaml b/helm/druid/templates/middleManager/role.yaml
deleted file mode 100644
index 22e0622f2c..0000000000
--- a/helm/druid/templates/middleManager/role.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.middleManager.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "druid.middleManager.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.middleManager.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - configmaps
-    verbs:
-      - '*'
-{{- end }}
-
diff --git a/helm/druid/templates/middleManager/roleBinding.yaml b/helm/druid/templates/middleManager/roleBinding.yaml
deleted file mode 100644
index fbca099428..0000000000
--- a/helm/druid/templates/middleManager/roleBinding.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.middleManager.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "druid.middleManager.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.middleManager.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "druid.middleManager.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "druid.middleManager.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/helm/druid/templates/middleManager/service.yaml b/helm/druid/templates/middleManager/service.yaml
deleted file mode 100644
index a081701515..0000000000
--- a/helm/druid/templates/middleManager/service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.middleManager.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "druid.middleManager.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.middleManager.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.middleManager.serviceType }}
-  ports:
-    - port: {{ .Values.middleManager.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "druid.name" . }}
-    release: {{ .Release.Name }}
-    component: {{ .Values.middleManager.name }}
-{{- end }}
\ No newline at end of file
diff --git a/helm/druid/templates/middleManager/serviceAccount.yaml b/helm/druid/templates/middleManager/serviceAccount.yaml
deleted file mode 100644
index 00dc83cb1f..0000000000
--- a/helm/druid/templates/middleManager/serviceAccount.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.middleManager.serviceAccount.create) (.Values.middleManager.enabled) }}
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: {{ .Values.middleManager.serviceAccount.automountServiceAccountToken }}
-metadata:
-  name: {{ include "druid.middleManager.serviceAccountName" . }}
-  {{- with .Values.middleManager.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.middleManager.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  {{- with .Values.middleManager.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/middleManager/statefulset.yaml b/helm/druid/templates/middleManager/statefulset.yaml
deleted file mode 100644
index b91824e2c5..0000000000
--- a/helm/druid/templates/middleManager/statefulset.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.middleManager.enabled -}}
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  labels:
-    app: {{ template "druid.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    component: {{ .Values.middleManager.name }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "druid.middleManager.fullname" . }}
-spec:
-  serviceName: {{ template "druid.middleManager.fullname" . }}
-  replicas: {{ .Values.middleManager.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "druid.name" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Values.middleManager.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "druid.name" . }}
-        component: {{ .Values.middleManager.name }}
-        release: {{ .Release.Name }}
-      annotations:
-        druid.k8s.enablePatching: "true"
-        {{- with .Values.middleManager.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.prometheus.enabled }}
-          {{- with .Values.prometheus.annotation }}
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-        {{- end }}
-    spec:
-      {{- if or .Values.middleManager.antiAffinity .Values.middleManager.nodeAffinity }}
-      affinity:
-      {{- end }}
-      {{- if eq .Values.middleManager.antiAffinity "hard" }}
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - topologyKey: "kubernetes.io/hostname"
-              labelSelector:
-                matchLabels:
-                  app: "{{ template "druid.name" . }}"
-                  release: "{{ .Release.Name }}"
-                  component: "{{ .Values.middleManager.name }}"
-      {{- else if eq .Values.middleManager.antiAffinity "soft" }}
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              topologyKey: kubernetes.io/hostname
-              labelSelector:
-                matchLabels:
-                  app: "{{ template "druid.name" . }}"
-                  release: "{{ .Release.Name }}"
-                  component: "{{ .Values.middleManager.name }}"
-      {{- end }}
-      {{- with .Values.middleManager.nodeAffinity }}
-        nodeAffinity:
-{{ toYaml . | indent 10 }}
-      {{- end }}
-{{- if .Values.middleManager.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.middleManager.nodeSelector | indent 8 }}
-{{- end }}
-{{- if .Values.middleManager.securityContext }}
-      securityContext:
-{{ toYaml .Values.middleManager.securityContext | indent 8 }}
-{{- end }}
-{{- if .Values.middleManager.tolerations }}
-      tolerations:
-{{ toYaml .Values.middleManager.tolerations | indent 8 }}
-{{- end }}
-{{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml .Values.image.pullSecrets | indent 8 }}
-{{- end }}
-      {{- if .Values.middleManager.serviceAccount.create }}
-      serviceAccountName: {{ include "druid.middleManager.serviceAccountName" . }}
-      {{- end }}
-      containers:
-      - name: druid
-        args: [ "middleManager" ]
-        env:
-        - name: POD_NAME
-          valueFrom:  {fieldRef: {fieldPath: metadata.name}}
-        - name: POD_NAMESPACE
-          valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
-        {{- range $key, $val := .Values.middleManager.config }}
-        - name: {{ $key }}
-          value: {{ $val | quote }}
-        {{- end}}
-        envFrom:
-          - configMapRef:
-              name: {{ template "druid.name" . }} 
-        resources:
-{{ toYaml .Values.middleManager.resources | indent 12 }}
-        livenessProbe:
-          initialDelaySeconds: 60
-          httpGet:
-            path: /status/health
-            port: {{ .Values.middleManager.port }}
-        readinessProbe:
-          initialDelaySeconds: 60
-          httpGet:
-            path: /status/health
-            port: {{ .Values.middleManager.port }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-        ports:
-        - containerPort: {{ .Values.middleManager.port }}
-          name: http
-        {{- if .Values.prometheus.enabled}}
-        - name: prometheus
-          containerPort: {{ .Values.prometheus.port }}
-          protocol: TCP
-        {{- end }}
-        volumeMounts:
-        - mountPath: /opt/druid/var/druid/
-          name: data
-  {{- if .Values.gCloudStorage.enabled }}
-        - name: google-cloud-key
-          mountPath: /var/secrets/google
-  {{- end }}
-      volumes:
-  {{- if not .Values.middleManager.persistence.enabled }} 
-      - name: data
-        emptyDir: {}
-  {{- end }}
-  {{- if .Values.gCloudStorage.enabled }}
-      - name: google-cloud-key
-        secret:
-          secretName: {{ .Values.gCloudStorage.secretName }}
-  {{- end }}
-  updateStrategy:
-    type: {{ .Values.middleManager.updateStrategy.type }}
-  {{- if .Values.middleManager.persistence.enabled }}
-  volumeClaimTemplates:
-  - metadata:
-      name: data
-    spec:
-      accessModes:
-        - {{ .Values.middleManager.persistence.accessMode | quote }}
-    {{- if .Values.middleManager.persistence.storageClass }}
-    {{- if (eq "-" .Values.middleManager.persistence.storageClass) }}
-      storageClassName: ""
-    {{- else }}
-      storageClassName: "{{ .Values.middleManager.persistence.storageClass }}"
-    {{- end }}
-    {{- end }}
-      resources:
-        requests:
-          storage: "{{ .Values.middleManager.persistence.size }}"
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/overlord/deployment.yaml b/helm/druid/templates/overlord/deployment.yaml
deleted file mode 100644
index f347228859..0000000000
--- a/helm/druid/templates/overlord/deployment.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.overlord.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "druid.overlord.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.overlord.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.overlord.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "druid.name" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Values.overlord.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "druid.name" . }}
-        release: {{ .Release.Name }}
-        component: {{ .Values.overlord.name }}
-      annotations:
-        druid.k8s.enablePatching: "true"
-        {{- with .Values.overlord.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.prometheus.enabled }}
-          {{- with .Values.prometheus.annotation }}
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-        {{- end }}
-    spec:
-      {{- if .Values.overlord.serviceAccount.create }}
-      serviceAccountName: {{ include "druid.overlord.serviceAccountName" . }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: [ "overlord" ]
-          env:
-          - name: POD_NAME
-            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
-          - name: POD_NAMESPACE
-            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
-          {{- range $key, $val := .Values.overlord.config }}
-          - name: {{ $key }}
-            value: {{ $val | quote }}
-          {{- end}}
-          envFrom:
-            - configMapRef:
-                name: {{ template "druid.name" . }} 
-          ports:
-            - name: http
-              containerPort: {{ .Values.overlord.port }}
-              protocol: TCP
-            {{- if .Values.prometheus.enabled }}
-            - name: prometheus
-              containerPort: {{ .Values.prometheus.port }}
-              protocol: TCP
-            {{- end }}
-          livenessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.overlord.port }}
-          readinessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.overlord.port }}
-          resources:
-{{ toYaml .Values.overlord.resources | indent 12 }}
-          volumeMounts:
-  {{- if .Values.gCloudStorage.enabled }}
-            - name: google-cloud-key
-              mountPath: /var/secrets/google
-  {{- end }}
-      volumes:
-  {{- if .Values.gCloudStorage.enabled }}
-      - name: google-cloud-key
-        secret:
-          secretName: {{ .Values.gCloudStorage.secretName }}
-  {{- end }}
-    {{- with .Values.overlord.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.overlord.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.overlord.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/overlord/ingress.yaml b/helm/druid/templates/overlord/ingress.yaml
deleted file mode 100644
index f1f3051dbf..0000000000
--- a/helm/druid/templates/overlord/ingress.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.overlord.ingress.enabled -}}
-{{- $fullName := include "druid.overlord.fullname" . -}}
-{{- $ingressPath := .Values.overlord.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.overlord.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.overlord.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.overlord.ingress.tls }}
-  tls:
-  {{- range .Values.overlord.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.overlord.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/overlord/role.yaml b/helm/druid/templates/overlord/role.yaml
deleted file mode 100644
index 37ffbd8918..0000000000
--- a/helm/druid/templates/overlord/role.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.overlord.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "druid.overlord.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.overlord.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - configmaps
-    verbs:
-      - '*'
-  - apiGroups:
-      - batch
-    resources:
-      - jobs
-    verbs:
-      - '*'
-{{- end }}
-
diff --git a/helm/druid/templates/overlord/roleBinding.yaml b/helm/druid/templates/overlord/roleBinding.yaml
deleted file mode 100644
index 2a5284e606..0000000000
--- a/helm/druid/templates/overlord/roleBinding.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.overlord.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "druid.overlord.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.overlord.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "druid.overlord.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "druid.overlord.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/helm/druid/templates/overlord/service.yaml b/helm/druid/templates/overlord/service.yaml
deleted file mode 100644
index 6a9b856d87..0000000000
--- a/helm/druid/templates/overlord/service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.overlord.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "druid.overlord.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.overlord.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.overlord.serviceType }}
-  ports:
-    - port: {{ .Values.overlord.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "druid.name" . }}
-    release: {{ .Release.Name }}
-    component: {{ .Values.overlord.name }}
-{{- end }}
diff --git a/helm/druid/templates/overlord/serviceAccount.yaml b/helm/druid/templates/overlord/serviceAccount.yaml
deleted file mode 100644
index b27ea8b4b3..0000000000
--- a/helm/druid/templates/overlord/serviceAccount.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.overlord.serviceAccount.create) (.Values.overlord.enabled) }}
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: {{ .Values.overlord.serviceAccount.automountServiceAccountToken }}
-metadata:
-  name: {{ include "druid.overlord.serviceAccountName" . }}
-  {{- with .Values.overlord.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.overlord.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  {{- with .Values.overlord.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/router/deployment.yaml b/helm/druid/templates/router/deployment.yaml
deleted file mode 100644
index 79960fe13b..0000000000
--- a/helm/druid/templates/router/deployment.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.router.enabled -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "druid.router.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.router.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.router.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "druid.name" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Values.router.name }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "druid.name" . }}
-        release: {{ .Release.Name }}
-        component: {{ .Values.router.name }}
-      annotations:
-        druid.k8s.enablePatching: "true"
-        {{- with .Values.router.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.prometheus.enabled }}
-          {{- with .Values.prometheus.annotation }}
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-        {{- end }}
-    spec:
-      {{- if .Values.router.serviceAccount.create }}
-      serviceAccountName: {{ include "druid.router.serviceAccountName" . }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: [ "router" ]
-          env:
-          - name: POD_NAME
-            valueFrom:  {fieldRef: {fieldPath: metadata.name}}
-          - name: POD_NAMESPACE
-            valueFrom: {fieldRef: {fieldPath: metadata.namespace}}
-          {{- range $key, $val := .Values.router.config }}
-          - name: {{ $key }}
-            value: {{ $val | quote }}
-          {{- end}}
-          envFrom:
-            - configMapRef:
-                name: {{ template "druid.name" . }} 
-          ports:
-            - name: http
-              containerPort: {{ .Values.router.port }}
-              protocol: TCP
-            {{- if .Values.prometheus.enabled }}
-            - name: prometheus
-              containerPort: {{ .Values.prometheus.port }}
-              protocol: TCP
-            {{- end }}
-          livenessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.router.port }}
-          readinessProbe:
-            initialDelaySeconds: 60
-            httpGet:
-              path: /status/health
-              port: {{ .Values.router.port }}
-          resources:
-{{ toYaml .Values.router.resources | indent 12 }}
-    {{- with .Values.router.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.router.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.router.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/router/ingress.yaml b/helm/druid/templates/router/ingress.yaml
deleted file mode 100644
index aab27fc79b..0000000000
--- a/helm/druid/templates/router/ingress.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.router.ingress.enabled -}}
-{{- $fullName := include "druid.router.fullname" . -}}
-{{- $ingressPath := .Values.router.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.router.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- with .Values.router.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.router.ingress.tls }}
-  tls:
-  {{- range .Values.router.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.router.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/router/role.yaml b/helm/druid/templates/router/role.yaml
deleted file mode 100644
index 52afc0a685..0000000000
--- a/helm/druid/templates/router/role.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.router.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "druid.router.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.router.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - configmaps
-    verbs:
-      - '*'
-{{- end }}
-
diff --git a/helm/druid/templates/router/roleBinding.yaml b/helm/druid/templates/router/roleBinding.yaml
deleted file mode 100644
index 1b9e129305..0000000000
--- a/helm/druid/templates/router/roleBinding.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.rbac.create) (.Values.router.enabled) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "druid.router.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.router.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "druid.router.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "druid.router.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/helm/druid/templates/router/service.yaml b/helm/druid/templates/router/service.yaml
deleted file mode 100644
index 07d3659c5a..0000000000
--- a/helm/druid/templates/router/service.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.router.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "druid.router.fullname" . }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.router.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.router.serviceType }}
-  ports:
-    - port: {{ .Values.router.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app: {{ include "druid.name" . }}
-    release: {{ .Release.Name }}
-    component: {{ .Values.router.name }}
-{{- end }}
diff --git a/helm/druid/templates/router/serviceAccount.yaml b/helm/druid/templates/router/serviceAccount.yaml
deleted file mode 100644
index d357b2bd0c..0000000000
--- a/helm/druid/templates/router/serviceAccount.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if and (.Values.router.serviceAccount.create) (.Values.router.enabled) }}
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: {{ .Values.router.serviceAccount.automountServiceAccountToken }}
-metadata:
-  name: {{ include "druid.router.serviceAccountName" . }}
-  {{- with .Values.router.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    app: {{ include "druid.name" . }}
-    chart: {{ include "druid.chart" . }}
-    component: {{ .Values.router.name }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  {{- with .Values.router.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/helm/druid/templates/secrets.yaml b/helm/druid/templates/secrets.yaml
deleted file mode 100644
index 52451802f5..0000000000
--- a/helm/druid/templates/secrets.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{/*
-
- 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.
-
-*/}}
-
-{{- if .Values.gCloudStorage.enabled -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: google-cloud-key
-type: Opaque
-data:
-  key.json: {{ .Values.google.gcsAPIKey }}
-{{- end }}
diff --git a/helm/druid/values.yaml b/helm/druid/values.yaml
deleted file mode 100644
index dab6a49b80..0000000000
--- a/helm/druid/values.yaml
+++ /dev/null
@@ -1,503 +0,0 @@
-# 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.
-
-# Default values for druid.
-
-image:
-  repository: apache/druid
-  tag: 24.0.0
-  pullPolicy: IfNotPresent
-  pullSecrets: []
-
-configMap:
-  ## If false, configMap will not be applied
-  ##
-  enabled: true
-
-# Required if using kubernetes extensions which modify resources like 'druid-kubernetes-extensions' or 'druid-kubernetes-overlord-extensions'
-rbac:
-  create: true
-
-## Define the key value pairs in the configmap
-configVars:
-  ## DRUID env vars. ref: https://github.com/apache/druid/blob/master/distribution/docker/druid.sh#L29
-  # DRUID_LOG_LEVEL: "warn"
-  # DRUID_LOG4J: <?xml version="1.0" encoding="UTF-8" ?><Configuration status="WARN"><Appenders><Console name="Console" target="SYSTEM_OUT"><PatternLayout pattern="%d{ISO8601} %p [%t] %c - %m%n"/></Console></Appenders><Loggers><Root level="info"><AppenderRef ref="Console"/></Root><Logger name="org.apache.druid.jetty.RequestLog" additivity="false" level="DEBUG"><AppenderRef ref="Console"/></Logger></Loggers></Configuration>
-  DRUID_USE_CONTAINER_IP: "true"
-
-  ## Druid Common Configurations. ref: https://druid.apache.org/docs/latest/configuration/index.html#common-configurations
-  druid_extensions_loadList: '["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage"]'
-  druid_metadata_storage_type: postgresql
-  druid_metadata_storage_connector_connectURI: jdbc:postgresql://postgres:5432/druid
-  druid_metadata_storage_connector_user: druid
-  druid_metadata_storage_connector_password: druid
-  druid_storage_type: local
-  druid_indexer_logs_type: file
-  druid_indexer_logs_directory: /opt/data/indexing-logs
-
-  ## Druid Emitting Metrics. ref: https://druid.apache.org/docs/latest/configuration/index.html#emitting-metrics
-  druid_emitter: noop
-  druid_emitter_logging_logLevel: debug
-  druid_emitter_http_recipientBaseUrl: http://druid_exporter_url:druid_exporter_port/druid
-
-gCloudStorage:
-  enabled: false
-  secretName: google-cloud-key
-
-broker:
-  ## If false, broker will not be installed
-  ##
-  enabled: true
-  name: broker
-  replicaCount: 1
-  port: 8082
-  serviceType: ClusterIP
-
-  config:
-    DRUID_XMX: 512m
-    DRUID_XMS: 512m
-    DRUID_MAXDIRECTMEMORYSIZE: 400m
-    druid_processing_buffer_sizeBytes: '50000000'
-    druid_processing_numMergeBuffers: 2
-    druid_processing_numThreads: 1
-    # druid_monitoring_monitors: '["org.apache.druid.client.cache.CacheMonitor", "org.apache.druid.server.metrics.QueryCountStatsMonitor"]'
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-
-  resources: {}
-    # limits:
-    #   cpu: 1
-    #   memory: 1Gi
-    # requests:
-    #   cpu: 250m
-    #   memory: 512Mi
-
-  serviceAccount:
-    # -- Create a service account for the broker
-    create: true
-    # -- Service Account name
-    name:
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Labels applied to created service account
-    labels: {}
-    # -- Automount API credentials for the service account
-    automountServiceAccountToken: true
-
-  nodeSelector: {}
-
-  tolerations: []
-
-  affinity: {}
-
-  podAnnotations: {}
-
-coordinator:
-  ## If false, coordinator will not be installed
-  ##
-  enabled: true
-  name: coordinator
-  replicaCount: 1
-  port: 8081
-  serviceType: ClusterIP
-
-  config:
-    DRUID_XMX: 256m
-    DRUID_XMS: 256m
-    # druid_monitoring_monitors: '["org.apache.druid.server.metrics.TaskCountStatsMonitor"]'
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-
-  resources: {}
-    # limits:
-    #   cpu: 500m
-    #   memory: 1Gi
-    # requests:
-    #   cpu: 250m
-    #   memory: 512Mi
-
-  serviceAccount:
-    # -- Create a service account for the coordinator
-    create: true
-    # -- Service Account name
-    name:
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Labels applied to created service account
-    labels: {}
-    # -- Automount API credentials for the service account
-    automountServiceAccountToken: true
-
-  nodeSelector: {}
-
-  tolerations: []
-
-  affinity: {}
-
-  podAnnotations: {}
-
-overlord:
-  ## If true, the separate overlord will be installed
-  ##
-  enabled: false
-  name: overlord
-  replicaCount: 1
-  port: 8081
-  serviceType: ClusterIP
-
-  javaOpts: "-Xms1G -Xmx1G"
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-
-  resources: {}
-
-  serviceAccount:
-    # -- Create a service account for the overlord
-    create: true
-    # -- Service Account name
-    name:
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Labels applied to created service account
-    labels: {}
-    # -- Automount API credentials for the service account
-    automountServiceAccountToken: true
-
-  nodeSelector: {}
-
-  tolerations: []
-
-  affinity: {}
-
-  podAnnotations: {}
-
-historical:
-  ## If false, historical will not be installed
-  ##
-  enabled: true
-  name: historical
-  replicaCount: 1
-  port: 8083
-  serviceType: ClusterIP
-
-  config:
-    DRUID_XMX: 512m
-    DRUID_XMS: 512m
-    DRUID_MAXDIRECTMEMORYSIZE: 400m
-    druid_processing_buffer_sizeBytes: '50000000'
-    druid_processing_numMergeBuffers: 2
-    druid_processing_numThreads: 1
-    # druid_monitoring_monitors: '["org.apache.druid.client.cache.CacheMonitor", "org.apache.druid.server.metrics.HistoricalMetricsMonitor", "org.apache.druid.server.metrics.QueryCountStatsMonitor"]'
-    # druid_segmentCache_locations: '[{"path":"/opt/druid/var/druid/segment-cache","maxSize":300000000000}]'
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-
-  persistence:
-    enabled: true
-    accessMode: ReadWriteOnce
-    size: "4Gi"
-    # storageClass: "ssd"
-
-  antiAffinity: "soft"
-
-  nodeAffinity: {}
-
-  nodeSelector: {}
-
-  securityContext:
-    fsGroup: 1000
-
-  tolerations: []
-
-  resources: {}
-    # limits:
-    #   cpu: 2
-    #   memory: 2Gi
-    # requests:
-    #   cpu: 500m
-    #   memory: 512Mi
-
-  serviceAccount:
-    # -- Create a service account for the overlord
-    create: true
-    # -- Service Account name
-    name:
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Labels applied to created service account
-    labels: {}
-    # -- Automount API credentials for the service account
-    automountServiceAccountToken: true
-
-  livenessProbeInitialDelaySeconds: 60
-  readinessProbeInitialDelaySeconds: 60
-
-  ## (dict) If specified, apply these annotations to each master Pod
-  podAnnotations: {}
-
-  podDisruptionBudget:
-    enabled: false
-    # minAvailable: 2
-    maxUnavailable: 1
-
-  updateStrategy:
-    type: RollingUpdate
-
-middleManager:
-  ## If false, middleManager will not be installed
-  ##
-  enabled: true
-  name: middle-manager
-  replicaCount: 1
-  port: 8091
-  serviceType: ClusterIP
-
-  config:
-    DRUID_XMX: 64m
-    DRUID_XMS: 64m
-    druid_indexer_runner_javaOptsArray: '["-server", "-Xms256m", "-Xmx256m", "-XX:MaxDirectMemorySize=300m", "-Duser.timezone=UTC", "-Dfile.encoding=UTF-8", "-XX:+ExitOnOutOfMemoryError", "-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"]'
-    druid_indexer_fork_property_druid_processing_buffer_sizeBytes: '25000000'
-
-  autoscaling:
-    enabled: false
-    minReplicas: 2
-    maxReplicas: 5
-    metrics:
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: 60
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: 60
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-
-  persistence:
-    enabled: true
-    accessMode: ReadWriteOnce
-    size: "4Gi"
-    # storageClass: "ssd"
-
-  antiAffinity: "soft"
-
-  nodeAffinity: {}
-
-  nodeSelector: {}
-
-  securityContext:
-    fsGroup: 1000
-
-  tolerations: []
-
-  resources: {}
-    # limits:
-    #   cpu: 500m
-    #   memory: 1Gi
-    # requests:
-    #   cpu: 250m
-    #   memory: 256Mi
-
-  serviceAccount:
-    # -- Create a service account for the overlord
-    create: true
-    # -- Service Account name
-    name:
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Labels applied to created service account
-    labels: {}
-    # -- Automount API credentials for the service account
-    automountServiceAccountToken: true
-
-  ## (dict) If specified, apply these annotations to each master Pod
-  podAnnotations: {}
-
-  podDisruptionBudget:
-    enabled: false
-    # minAvailable: 2
-    maxUnavailable: 1
-
-  updateStrategy:
-    type: RollingUpdate
-
-router:
-  ## If false, router will not be installed
-  ##
-  enabled: true
-  name: router
-  replicaCount: 1
-  port: 8888
-  serviceType: ClusterIP
-
-  config:
-    DRUID_XMX: 128m
-    DRUID_XMS: 128m
-    DRUID_MAXDIRECTMEMORYSIZE: 128m
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - chart-example.local
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-
-  resources: {}
-    # limits:
-    #   cpu: 250m
-    #   memory: 256Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-
-  serviceAccount:
-    # -- Create a service account for the overlord
-    create: true
-    # -- Service Account name
-    name:
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Labels applied to created service account
-    labels: {}
-    # -- Automount API credentials for the service account
-    automountServiceAccountToken: true
-
-  nodeSelector: {}
-
-  tolerations: []
-
-  affinity: {}
-
-  podAnnotations: {}
-
-# ------------------------------------------------------------------------------
-# Zookeeper:
-# ------------------------------------------------------------------------------
-
-# If using a zookeeper installed outside of this chart you must uncomment and set this line
-# zkHosts: druid-zookeeper-headless:2181
-
-zookeeper:
-  enabled: true
-  ## Environmental variables to set in Zookeeper
-  ##
-  env:
-    ## The JVM heap size to allocate to Zookeeper
-    ZK_HEAP_SIZE: "512M"
-  ## Configure Zookeeper headless
-  headless:
-    publishNotReadyAddresses: true
-
-
-# ------------------------------------------------------------------------------
-# MySQL:
-# ------------------------------------------------------------------------------
-mysql:
-  enabled: false
-  mysqlRootPassword: druidroot
-  mysqlUser: druid
-  mysqlPassword: druid
-  mysqlDatabase: druid
-  configurationFiles:
-    mysql_collate.cnf: |-
-      [mysqld]
-      character-set-server=utf8
-      collation-server=utf8_unicode_ci
-
-# ------------------------------------------------------------------------------
-# postgres:
-# ------------------------------------------------------------------------------
-postgresql:
-  enabled: true
-  postgresqlUsername: druid
-  postgresqlPassword: druid
-  postgresqlDatabase: druid
-  service:
-    port: 5432
-
-# Secrets
-prometheus:
-  enabled: false
-  #pick the any port what you want
-  port: 9090
-  annotation:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: "9090"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org