From 82803bec668088096ede89b4eb4ea43babb247f3 Mon Sep 17 00:00:00 2001
From: cleverhu <shouping.hu@daocloud.io>
Date: Wed, 26 Oct 2022 16:13:54 +0800
Subject: [PATCH] optimize annos (#13125)

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

Signed-off-by: cleverhu <shouping.hu@daocloud.io>
---
 bitnami/node-exporter/Chart.yaml                    | 2 +-
 bitnami/node-exporter/templates/service.yaml        | 2 ++
 bitnami/node-exporter/templates/serviceaccount.yaml | 2 ++
 bitnami/node-exporter/templates/servicemonitor.yaml | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bitnami/node-exporter/Chart.yaml b/bitnami/node-exporter/Chart.yaml
index acc421e39..c50814c9a 100644
--- a/bitnami/node-exporter/Chart.yaml
+++ b/bitnami/node-exporter/Chart.yaml
@@ -24,4 +24,4 @@ sources:
   - https://github.com/bitnami/containers/tree/main/bitnami/node-exporter
   - https://github.com/prometheus/node_exporter
   - https://prometheus.io/
-version: 3.2.1
+version: 3.2.2
diff --git a/bitnami/node-exporter/templates/service.yaml b/bitnami/node-exporter/templates/service.yaml
index a381d9c63..987f67130 100644
--- a/bitnami/node-exporter/templates/service.yaml
+++ b/bitnami/node-exporter/templates/service.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
+  {{- if or .Values.service.addPrometheusScrapeAnnotation .Values.service.annotations .Values.commonAnnotations }}
   annotations:
     {{- if .Values.service.addPrometheusScrapeAnnotation }}
     prometheus.io/scrape: "true"
@@ -13,6 +14,7 @@ metadata:
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
diff --git a/bitnami/node-exporter/templates/serviceaccount.yaml b/bitnami/node-exporter/templates/serviceaccount.yaml
index 9bec25b99..28f16ff11 100644
--- a/bitnami/node-exporter/templates/serviceaccount.yaml
+++ b/bitnami/node-exporter/templates/serviceaccount.yaml
@@ -8,6 +8,7 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
+  {{- if or .Values.commonAnnotations .Values.serviceAccount.annotations }}
   annotations:
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
@@ -15,5 +16,6 @@ metadata:
     {{- if .Values.serviceAccount.annotations }}
     {{- include "common.tplvalues.render" (dict "value" .Values.serviceAccount.annotations "context" $) | nindent 4 }}
     {{- end }}
+  {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- end }}
diff --git a/bitnami/node-exporter/templates/servicemonitor.yaml b/bitnami/node-exporter/templates/servicemonitor.yaml
index 04ec2d4cc..80d728daf 100644
--- a/bitnami/node-exporter/templates/servicemonitor.yaml
+++ b/bitnami/node-exporter/templates/servicemonitor.yaml
@@ -11,10 +11,10 @@ metadata:
     {{- if .Values.serviceMonitor.labels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.serviceMonitor.labels "context" $ ) | nindent 4 }}
     {{- end }}
+  {{- if .Values.commonAnnotations }}
   annotations:
-    {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-    {{- end }}
+  {{- end }}
 spec:
   {{- if .Values.serviceMonitor.jobLabel }}
   jobLabel: {{ .Values.serviceMonitor.jobLabel }}