From 012ee05ab95c28e7db6b3a772e1f1efc7e7f71b8 Mon Sep 17 00:00:00 2001
From: ol <ol@teuto.net>
Date: Mon, 29 Jan 2024 17:21:05 +0100
Subject: [PATCH] Avoid conflicts with bitnami common

---
 templates/_tplvalues.tpl         | 4 ++--
 templates/beat/deployment.yaml   | 2 +-
 templates/flower/deployment.yaml | 2 +-
 templates/web/deployment.yaml    | 2 +-
 templates/worker/deployment.yaml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/_tplvalues.tpl b/templates/_tplvalues.tpl
index 50f1c91..713f943 100644
--- a/templates/_tplvalues.tpl
+++ b/templates/_tplvalues.tpl
@@ -1,9 +1,9 @@
 {{/*
 Renders a value that contains template.
 Usage:
-{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+{{ include "django.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
 */}}
-{{- define "common.tplvalues.render" -}}
+{{- define "django.tplvalues.render" -}}
     {{- if typeIs "string" .value }}
         {{- tpl .value .context }}
     {{- else }}
diff --git a/templates/beat/deployment.yaml b/templates/beat/deployment.yaml
index 75cce84..4948aa8 100644
--- a/templates/beat/deployment.yaml
+++ b/templates/beat/deployment.yaml
@@ -20,7 +20,7 @@ spec:
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
         {{- if .Values.beat.podAnnotations }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.beat.podAnnotations "context" $ ) | nindent 8 }}
+        {{- include "django.tplvalues.render" ( dict "value" .Values.beat.podAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
diff --git a/templates/flower/deployment.yaml b/templates/flower/deployment.yaml
index ff2f0f5..5c38f78 100644
--- a/templates/flower/deployment.yaml
+++ b/templates/flower/deployment.yaml
@@ -18,7 +18,7 @@ spec:
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         {{- if .Values.flower.podAnnotations }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
+        {{- include "django.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
diff --git a/templates/web/deployment.yaml b/templates/web/deployment.yaml
index 9a232bf..e52f8c4 100644
--- a/templates/web/deployment.yaml
+++ b/templates/web/deployment.yaml
@@ -20,7 +20,7 @@ spec:
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
         {{- if .Values.web.podAnnotations }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.web.podAnnotations "context" $ ) | nindent 8 }}
+        {{- include "django.tplvalues.render" ( dict "value" .Values.web.podAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}
diff --git a/templates/worker/deployment.yaml b/templates/worker/deployment.yaml
index 35fe4d4..64d9ed2 100644
--- a/templates/worker/deployment.yaml
+++ b/templates/worker/deployment.yaml
@@ -19,7 +19,7 @@ spec:
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         tag: "{{ .Values.image.tag }}"
         {{- if .Values.worker.podAnnotations }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.worker.podAnnotations "context" $ ) | nindent 8 }}
+        {{- include "django.tplvalues.render" ( dict "value" .Values.worker.podAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
       labels:
         {{- include "django.selectorLabels" . | nindent 8 }}