From 636af2ff697a1ca4cd73ec4de51271643ea8e2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Bono?= <andresbono@vmware.com>
Date: Tue, 14 Jul 2020 18:33:06 +0200
Subject: [PATCH] [bitnami/drupal] Fix matchLabels and extraDeploy (#3115)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andrés Bono <andresbono@vmware.com>
---
 bitnami/drupal/Chart.yaml                |  2 +-
 bitnami/drupal/templates/_helpers.tpl    | 13 -------------
 bitnami/drupal/templates/deployment.yaml |  2 +-
 bitnami/drupal/templates/extra-list.yaml |  2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/bitnami/drupal/Chart.yaml b/bitnami/drupal/Chart.yaml
index 28d805f8b..8a3a6ce85 100644
--- a/bitnami/drupal/Chart.yaml
+++ b/bitnami/drupal/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: drupal
-version: 8.0.1
+version: 8.0.2
 appVersion: 9.0.2
 description: One of the most versatile open source content management systems.
 keywords:
diff --git a/bitnami/drupal/templates/_helpers.tpl b/bitnami/drupal/templates/_helpers.tpl
index d6044b2a5..23c2703c8 100644
--- a/bitnami/drupal/templates/_helpers.tpl
+++ b/bitnami/drupal/templates/_helpers.tpl
@@ -63,16 +63,3 @@ Return the appropriate apiVersion for deployment.
 {{- include "common.warnings.rollingTag" .Values.image -}}
 {{- include "common.warnings.rollingTag" .Values.metrics.image -}}
 {{- end -}}
-
-{{/*
-Renders a value that contains template.
-Usage:
-{{ include "drupal.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }}
-*/}}
-{{- define "drupal.tplValue" -}}
-    {{- if typeIs "string" .value }}
-        {{- tpl .value .context }}
-    {{- else }}
-        {{- tpl (.value | toYaml) .context }}
-    {{- end }}
-{{- end -}}
diff --git a/bitnami/drupal/templates/deployment.yaml b/bitnami/drupal/templates/deployment.yaml
index f956e3004..c3ec040d8 100644
--- a/bitnami/drupal/templates/deployment.yaml
+++ b/bitnami/drupal/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
-      labels: {{- include "common.labels.matchLabels" . | nindent 8 }}
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
         {{- if .Values.commonLabels }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
         {{- end }}
diff --git a/bitnami/drupal/templates/extra-list.yaml b/bitnami/drupal/templates/extra-list.yaml
index 15ea09ff6..184da188e 100644
--- a/bitnami/drupal/templates/extra-list.yaml
+++ b/bitnami/drupal/templates/extra-list.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.extraDeploy }}
 apiVersion: v1
 kind: List
-items: {{- include "drupal.tplValue" (dict "value" .Values.extraDeploy "context" $) | nindent 2 }}
+items: {{- include "common.tplvalues.render" (dict "value" .Values.extraDeploy "context" $) | nindent 2 }}
 {{- end }}