From 67bc8a160c8db20f9aeee7e112b5e7365c566b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=BA=E9=98=B3?= <qingwli@cisco.com>
Date: Fri, 24 Jun 2022 15:29:26 +0800
Subject: [PATCH] [Fix-10400]Fix K8s deployment bitnami version error (#10567)

* Fix k8s bitnami bug

* add comments

(cherry picked from commit 0b377f72b1c5e84a18986fd9008c83987ed87295)
---
 deploy/kubernetes/dolphinscheduler/Chart.yaml      | 14 ++++++++++----
 .../dolphinscheduler/templates/_helpers.tpl        |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml
index 9807c16f04..f848deca28 100644
--- a/deploy/kubernetes/dolphinscheduler/Chart.yaml
+++ b/deploy/kubernetes/dolphinscheduler/Chart.yaml
@@ -43,10 +43,16 @@ appVersion: 3.0.0-beta-2
 
 dependencies:
 - name: postgresql
-  version: 11.6.6
-  repository: https://charts.bitnami.com/bitnami
+  version: 10.3.18
+  # Due to a change in the Bitnami repo, https://charts.bitnami.com/bitnami was truncated only
+  # containing entries for the latest 6 months (from January 2022 on).
+  # This URL: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+  # contains the full 'index.yaml'.
+  # See detail here: https://github.com/bitnami/charts/issues/10833
+  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   condition: postgresql.enabled
 - name: zookeeper
-  version: 9.2.5
-  repository: https://charts.bitnami.com/bitnami
+  version: 6.5.3
+  # Same as above.
+  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   condition: zookeeper.enabled
diff --git a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
index 3d06502ad1..8507f4669c 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
@@ -143,7 +143,7 @@ Create a database environment variables.
     secretKeyRef:
       {{- if .Values.postgresql.enabled }}
       name: {{ template "dolphinscheduler.postgresql.fullname" . }}
-      key: postgres-password
+      key: postgresql-password
       {{- else }}
       name: {{ include "dolphinscheduler.fullname" . }}-externaldb
       key: database-password