[bitnami/kubeapps] Fix kubeapps existing secret (#9523)

* Fix existingSecret. Update upgrade help.

Signed-off-by: Michael Nelson <minelson@vmware.com>

* Update readme (old links to master).

Signed-off-by: Michael Nelson <minelson@vmware.com>

* Chart version bump

Signed-off-by: Michael Nelson <minelson@vmware.com>

bitnami/kubeapps/Chart.yaml

@@ -30,4 +30,4 @@ maintainers:
 name: kubeapps
 sources:
   - https://github.com/kubeapps/kubeapps
-version: 8.0.0
+version: 8.0.1

bitnami/kubeapps/README.md

@@ -7,7 +7,7 @@ Kubeapps is a web-based UI for launching and managing applications on Kubernetes
 [Overview of Kubeapps](https://kubeapps.com)
 
 
-                           
+
 ## TL;DR
 
 ```bash
@@ -20,7 +20,7 @@ helm install kubeapps --namespace kubeapps bitnami/kubeapps
 
 ## Introduction
 
-[![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/master.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/master)
+[![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/main.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/main)
 
 This chart bootstraps a [Kubeapps](https://kubeapps.com) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
@@ -58,7 +58,7 @@ The command deploys Kubeapps on the Kubernetes cluster in the `kubeapps` namespa
 
 > **Caveat**: Only one Kubeapps installation is supported per namespace
 
-Once you have installed Kubeapps follow the [Getting Started Guide](https://github.com/kubeapps/kubeapps/blob/master/docs/user/getting-started.md) for additional information on how to access and use Kubeapps.
+Once you have installed Kubeapps follow the [Getting Started Guide](https://github.com/kubeapps/kubeapps/blob/main/docs/user/getting-started.md) for additional information on how to access and use Kubeapps.
 
 ## Parameters
 
@@ -958,12 +958,17 @@ The following values have been renamed:
 - `assetsvc.service.port` renamed as `assetsvc.service.ports.http`.
 - `assetsvc.containerPort` renamed as `assetsvc.containerPorts.http`.
 - `authProxy.containerPort` renamed as `authProxy.containerPorts.proxy`.
+- `authProxy.additionalFlags` renamed as `authProxy.extraFlags`,
 - Pinniped Proxy service no longer uses `pinnipedProxy.containerPort`. Use `pinnipedProxy.service.ports.pinnipedProxy` to change the service port.
 - `pinnipedProxy.containerPort` renamed as `pinnipedProxy.containerPorts.pinnipedProxy`.
 - `postgresql.replication.enabled` has been removed. Use `postgresql.architecture` instead.
 - `postgresql.postgresqlDatabase` renamed as `postgresql.auth.database`.
 - `postgresql.postgresqlPassword` renamed as `postgresql.auth.password`.
+- `postgresql.existingSecret` renamed as `postgresql.auth.existingSecret`.
 - `redis.redisPassword` renamed as `redis.auth.password`.
+- `redis.existingSecret` renamed as `redis.auth.existingSecret`.
+
+Note also that if you have an existing Postgresql secret that is used for Kubeapps, you will need to update the key from `postgresql-password` to `postgres-password`.
 
 ### Nginx Ipv6 error
 
@@ -1168,4 +1173,4 @@ 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.
+limitations under the License.

bitnami/kubeapps/templates/_helpers.tpl

@@ -295,8 +295,8 @@ Returns the name of the globalRepos namespace
 Return the Postgresql secret name
 */}}
 {{- define "kubeapps.postgresql.secretName" -}}
-  {{- if .Values.postgresql.existingSecret }}
-      {{- printf "%s" .Values.postgresql.existingSecret -}}
+  {{- if .Values.postgresql.auth.existingSecret }}
+      {{- printf "%s" .Values.postgresql.auth.existingSecret -}}
   {{- else -}}
       {{- printf "%s" (include "kubeapps.postgresql.fullname" .) -}}
   {{- end -}}
@@ -306,8 +306,8 @@ Return the Postgresql secret name
 Return the Redis secret name
 */}}
 {{- define "kubeapps.redis.secretName" -}}
-  {{- if .Values.redis.existingSecret }}
-      {{- printf "%s" .Values.redis.existingSecret -}}
+  {{- if .Values.redis.auth.existingSecret }}
+      {{- printf "%s" .Values.redis.auth.existingSecret -}}
   {{- else -}}
       {{- printf "%s" (include "kubeapps.redis.fullname" .) -}}
   {{- end -}}