Remove Skipper ConfigMap and Secrets when Skipper is disabled (#25281)

This change was made to fix a discovered issue from the values
documentation mentioning that `externalDatabase.existingPasswordSecret`
and `externalDatabase.existingPasswordKey` is deprecated in favor of
using `existingSecret` and `existingSecretPasswordKey` within `dataflow`
and `skipper`. When changing to the expected way but having skipper
disabled, the skipper `externaldb-secret.yaml` is still included and
fails to base64 encode the password since it is empty. The best solution
was not to include the file at all. I applied the same logic to skippers
`configmap.yaml` since it is not used when enabled.

Signed-off-by: Anthony Lofton <anthony.lofton@jbhunt.com>
This commit is contained in:
Anthony Lofton
2024-04-22 06:44:12 -05:00
committed by GitHub
parent 158919fa5c
commit 50b96b0964
3 changed files with 3 additions and 3 deletions

View File

@@ -53,4 +53,4 @@ maintainers:
name: spring-cloud-dataflow
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/spring-cloud-dataflow
version: 28.0.0
version: 28.0.1

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if (include "scdf.skipper.createConfigmap" .) }}
{{- if and (include "scdf.skipper.createConfigmap" .) (.Values.skipper.enabled) }}
apiVersion: v1
kind: ConfigMap
metadata:

View File

@@ -4,7 +4,7 @@ SPDX-License-Identifier: APACHE-2.0
*/}}
{{- $secretName := coalesce .Values.externalDatabase.skipper.existingSecret .Values.externalDatabase.existingPasswordSecret -}}
{{- if and (not .Values.mariadb.enabled) (not $secretName) }}
{{- if and (not .Values.mariadb.enabled) (not $secretName) (.Values.skipper.enabled) }}
apiVersion: v1
kind: Secret
metadata: