From a24817d20ac3aace04ba7a6f9aab1ee98bd43bc7 Mon Sep 17 00:00:00 2001 From: Hellis Date: Fri, 28 May 2021 13:46:02 +0800 Subject: [PATCH] Migrate helm chart from helm v2 to v3 (#11290) * move all files from helm to helm/druid * migrate druid helm chart from helm v2 to v3 * add license headers * bump version to 0.3.0 --- helm/{requirements.lock => druid/Chart.lock} | 4 +-- helm/{ => druid}/Chart.yaml | 17 +++++++++-- helm/{ => druid}/README.md | 0 helm/{ => druid}/templates/NOTES.txt | 0 helm/{ => druid}/templates/_helpers.tpl | 0 .../templates/broker/deployment.yaml | 0 .../{ => druid}/templates/broker/ingress.yaml | 0 .../{ => druid}/templates/broker/service.yaml | 0 helm/{ => druid}/templates/configmap.yaml | 0 .../templates/coordinator/deployment.yaml | 0 .../templates/coordinator/ingress.yaml | 0 .../templates/coordinator/service.yaml | 0 .../templates/historical/ingress.yaml | 0 .../{ => druid}/templates/historical/pdb.yaml | 0 .../templates/historical/service.yaml | 0 .../templates/historical/statefulset.yaml | 0 .../templates/middleManager/hpa.yaml | 0 .../templates/middleManager/ingress.yaml | 0 .../templates/middleManager/pdb.yaml | 0 .../templates/middleManager/service.yaml | 0 .../templates/middleManager/statefulset.yaml | 0 .../templates/overlord/deployment.yaml | 0 .../templates/overlord/ingress.yaml | 0 .../templates/overlord/service.yaml | 0 .../templates/router/deployment.yaml | 0 .../{ => druid}/templates/router/ingress.yaml | 0 .../{ => druid}/templates/router/service.yaml | 0 helm/{ => druid}/templates/secrets.yaml | 0 helm/{ => druid}/values.yaml | 0 helm/requirements.yaml | 28 ------------------- 30 files changed, 17 insertions(+), 32 deletions(-) rename helm/{requirements.lock => druid/Chart.lock} (89%) rename helm/{ => druid}/Chart.yaml (73%) rename helm/{ => druid}/README.md (100%) rename helm/{ => druid}/templates/NOTES.txt (100%) rename helm/{ => druid}/templates/_helpers.tpl (100%) rename helm/{ => druid}/templates/broker/deployment.yaml (100%) rename helm/{ => druid}/templates/broker/ingress.yaml (100%) rename helm/{ => druid}/templates/broker/service.yaml (100%) rename helm/{ => druid}/templates/configmap.yaml (100%) rename helm/{ => druid}/templates/coordinator/deployment.yaml (100%) rename helm/{ => druid}/templates/coordinator/ingress.yaml (100%) rename helm/{ => druid}/templates/coordinator/service.yaml (100%) rename helm/{ => druid}/templates/historical/ingress.yaml (100%) rename helm/{ => druid}/templates/historical/pdb.yaml (100%) rename helm/{ => druid}/templates/historical/service.yaml (100%) rename helm/{ => druid}/templates/historical/statefulset.yaml (100%) rename helm/{ => druid}/templates/middleManager/hpa.yaml (100%) rename helm/{ => druid}/templates/middleManager/ingress.yaml (100%) rename helm/{ => druid}/templates/middleManager/pdb.yaml (100%) rename helm/{ => druid}/templates/middleManager/service.yaml (100%) rename helm/{ => druid}/templates/middleManager/statefulset.yaml (100%) rename helm/{ => druid}/templates/overlord/deployment.yaml (100%) rename helm/{ => druid}/templates/overlord/ingress.yaml (100%) rename helm/{ => druid}/templates/overlord/service.yaml (100%) rename helm/{ => druid}/templates/router/deployment.yaml (100%) rename helm/{ => druid}/templates/router/ingress.yaml (100%) rename helm/{ => druid}/templates/router/service.yaml (100%) rename helm/{ => druid}/templates/secrets.yaml (100%) rename helm/{ => druid}/values.yaml (100%) delete mode 100644 helm/requirements.yaml diff --git a/helm/requirements.lock b/helm/druid/Chart.lock similarity index 89% rename from helm/requirements.lock rename to helm/druid/Chart.lock index c75b6590cb6..52d02eaa73f 100644 --- a/helm/requirements.lock +++ b/helm/druid/Chart.lock @@ -23,5 +23,5 @@ dependencies: - name: postgresql repository: https://charts.helm.sh/stable version: 8.6.4 -digest: sha256:9d0d913f859b6adcd4d9006ee6fa1f7eae86795bb79c7392e1ce6d74d5d853f6 -generated: "2020-10-30T03:45:54.8287927Z" +digest: sha256:fb2ab5eed4b4fc00eee5f23764209d7cb494a07161439ea28d85ed3741eaf7f7 +generated: "2021-05-22T23:07:19.829637+08:00" diff --git a/helm/Chart.yaml b/helm/druid/Chart.yaml similarity index 73% rename from helm/Chart.yaml rename to helm/druid/Chart.yaml index 309a126c973..04eb07e92b6 100644 --- a/helm/Chart.yaml +++ b/helm/druid/Chart.yaml @@ -13,11 +13,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: v1 +apiVersion: v2 appVersion: 0.19.0 description: DEPRECATED Apache Druid is a high performance real-time analytics database. name: druid -version: 0.2.18 +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.0 home: https://druid.apache.org/ icon: https://druid.apache.org/img/favicon.png deprecated: true diff --git a/helm/README.md b/helm/druid/README.md similarity index 100% rename from helm/README.md rename to helm/druid/README.md diff --git a/helm/templates/NOTES.txt b/helm/druid/templates/NOTES.txt similarity index 100% rename from helm/templates/NOTES.txt rename to helm/druid/templates/NOTES.txt diff --git a/helm/templates/_helpers.tpl b/helm/druid/templates/_helpers.tpl similarity index 100% rename from helm/templates/_helpers.tpl rename to helm/druid/templates/_helpers.tpl diff --git a/helm/templates/broker/deployment.yaml b/helm/druid/templates/broker/deployment.yaml similarity index 100% rename from helm/templates/broker/deployment.yaml rename to helm/druid/templates/broker/deployment.yaml diff --git a/helm/templates/broker/ingress.yaml b/helm/druid/templates/broker/ingress.yaml similarity index 100% rename from helm/templates/broker/ingress.yaml rename to helm/druid/templates/broker/ingress.yaml diff --git a/helm/templates/broker/service.yaml b/helm/druid/templates/broker/service.yaml similarity index 100% rename from helm/templates/broker/service.yaml rename to helm/druid/templates/broker/service.yaml diff --git a/helm/templates/configmap.yaml b/helm/druid/templates/configmap.yaml similarity index 100% rename from helm/templates/configmap.yaml rename to helm/druid/templates/configmap.yaml diff --git a/helm/templates/coordinator/deployment.yaml b/helm/druid/templates/coordinator/deployment.yaml similarity index 100% rename from helm/templates/coordinator/deployment.yaml rename to helm/druid/templates/coordinator/deployment.yaml diff --git a/helm/templates/coordinator/ingress.yaml b/helm/druid/templates/coordinator/ingress.yaml similarity index 100% rename from helm/templates/coordinator/ingress.yaml rename to helm/druid/templates/coordinator/ingress.yaml diff --git a/helm/templates/coordinator/service.yaml b/helm/druid/templates/coordinator/service.yaml similarity index 100% rename from helm/templates/coordinator/service.yaml rename to helm/druid/templates/coordinator/service.yaml diff --git a/helm/templates/historical/ingress.yaml b/helm/druid/templates/historical/ingress.yaml similarity index 100% rename from helm/templates/historical/ingress.yaml rename to helm/druid/templates/historical/ingress.yaml diff --git a/helm/templates/historical/pdb.yaml b/helm/druid/templates/historical/pdb.yaml similarity index 100% rename from helm/templates/historical/pdb.yaml rename to helm/druid/templates/historical/pdb.yaml diff --git a/helm/templates/historical/service.yaml b/helm/druid/templates/historical/service.yaml similarity index 100% rename from helm/templates/historical/service.yaml rename to helm/druid/templates/historical/service.yaml diff --git a/helm/templates/historical/statefulset.yaml b/helm/druid/templates/historical/statefulset.yaml similarity index 100% rename from helm/templates/historical/statefulset.yaml rename to helm/druid/templates/historical/statefulset.yaml diff --git a/helm/templates/middleManager/hpa.yaml b/helm/druid/templates/middleManager/hpa.yaml similarity index 100% rename from helm/templates/middleManager/hpa.yaml rename to helm/druid/templates/middleManager/hpa.yaml diff --git a/helm/templates/middleManager/ingress.yaml b/helm/druid/templates/middleManager/ingress.yaml similarity index 100% rename from helm/templates/middleManager/ingress.yaml rename to helm/druid/templates/middleManager/ingress.yaml diff --git a/helm/templates/middleManager/pdb.yaml b/helm/druid/templates/middleManager/pdb.yaml similarity index 100% rename from helm/templates/middleManager/pdb.yaml rename to helm/druid/templates/middleManager/pdb.yaml diff --git a/helm/templates/middleManager/service.yaml b/helm/druid/templates/middleManager/service.yaml similarity index 100% rename from helm/templates/middleManager/service.yaml rename to helm/druid/templates/middleManager/service.yaml diff --git a/helm/templates/middleManager/statefulset.yaml b/helm/druid/templates/middleManager/statefulset.yaml similarity index 100% rename from helm/templates/middleManager/statefulset.yaml rename to helm/druid/templates/middleManager/statefulset.yaml diff --git a/helm/templates/overlord/deployment.yaml b/helm/druid/templates/overlord/deployment.yaml similarity index 100% rename from helm/templates/overlord/deployment.yaml rename to helm/druid/templates/overlord/deployment.yaml diff --git a/helm/templates/overlord/ingress.yaml b/helm/druid/templates/overlord/ingress.yaml similarity index 100% rename from helm/templates/overlord/ingress.yaml rename to helm/druid/templates/overlord/ingress.yaml diff --git a/helm/templates/overlord/service.yaml b/helm/druid/templates/overlord/service.yaml similarity index 100% rename from helm/templates/overlord/service.yaml rename to helm/druid/templates/overlord/service.yaml diff --git a/helm/templates/router/deployment.yaml b/helm/druid/templates/router/deployment.yaml similarity index 100% rename from helm/templates/router/deployment.yaml rename to helm/druid/templates/router/deployment.yaml diff --git a/helm/templates/router/ingress.yaml b/helm/druid/templates/router/ingress.yaml similarity index 100% rename from helm/templates/router/ingress.yaml rename to helm/druid/templates/router/ingress.yaml diff --git a/helm/templates/router/service.yaml b/helm/druid/templates/router/service.yaml similarity index 100% rename from helm/templates/router/service.yaml rename to helm/druid/templates/router/service.yaml diff --git a/helm/templates/secrets.yaml b/helm/druid/templates/secrets.yaml similarity index 100% rename from helm/templates/secrets.yaml rename to helm/druid/templates/secrets.yaml diff --git a/helm/values.yaml b/helm/druid/values.yaml similarity index 100% rename from helm/values.yaml rename to helm/druid/values.yaml diff --git a/helm/requirements.yaml b/helm/requirements.yaml deleted file mode 100644 index 3e3619f9a5f..00000000000 --- a/helm/requirements.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. - -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