From 64590758b2ced7d24d707ed0ba77f9ee18e4ef1e Mon Sep 17 00:00:00 2001
From: cleverhu <shouping.hu@daocloud.io>
Date: Wed, 26 Oct 2022 17:50:20 +0800
Subject: [PATCH] [bitnami/matomo] optimize annos (#13122)

Signed-off-by: cleverhu <shouping.hu@daocloud.io>

Signed-off-by: cleverhu <shouping.hu@daocloud.io>
---
 bitnami/matomo/Chart.yaml                | 2 +-
 bitnami/matomo/templates/deployment.yaml | 2 ++
 bitnami/matomo/templates/svc.yaml        | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bitnami/matomo/Chart.yaml b/bitnami/matomo/Chart.yaml
index cd9f77d3a..6183cb26f 100644
--- a/bitnami/matomo/Chart.yaml
+++ b/bitnami/matomo/Chart.yaml
@@ -30,4 +30,4 @@ name: matomo
 sources:
   - https://github.com/bitnami/containers/tree/main/bitnami/matomo
   - https://www.matomo.org/
-version: 0.2.11
+version: 0.2.12
diff --git a/bitnami/matomo/templates/deployment.yaml b/bitnami/matomo/templates/deployment.yaml
index c8c5700bc..ff730e705 100644
--- a/bitnami/matomo/templates/deployment.yaml
+++ b/bitnami/matomo/templates/deployment.yaml
@@ -26,6 +26,7 @@ spec:
         {{- if .Values.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
         {{- end }}
+      {{- if or .Values.podAnnotations .Values.metrics.podAnnotations }}
       annotations:
         {{- if .Values.podAnnotations }}
         {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
@@ -33,6 +34,7 @@ spec:
         {{- if .Values.metrics.podAnnotations }}
         {{- include "common.tplvalues.render" (dict "value" .Values.metrics.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
+      {{- end }}
     spec:
       {{- include "matomo.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.podSecurityContext.enabled }}
diff --git a/bitnami/matomo/templates/svc.yaml b/bitnami/matomo/templates/svc.yaml
index d90626c10..efc702c8f 100644
--- a/bitnami/matomo/templates/svc.yaml
+++ b/bitnami/matomo/templates/svc.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
+  {{- if or .Values.commonAnnotations .Values.service.annotations }}
   annotations:
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
@@ -14,6 +15,7 @@ metadata:
     {{- if .Values.service.annotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }}
     {{- end }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   {{- if .Values.service.sessionAffinity }}