[bitnami/etcd] Disable metrics even if podAnnotations are provided (#4146)

This commit is contained in:
Thomas Perronin
2020-11-04 11:24:46 +01:00
committed by GitHub
parent 61fde01a6c
commit 91ca0df4a6
2 changed files with 3 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: etcd
version: 4.12.1
version: 4.12.2
appVersion: 3.4.13
description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines
keywords:

View File

@@ -20,12 +20,12 @@ spec:
template:
metadata:
labels: {{- include "etcd.labels" . | nindent 8 }}
{{- if or .Values.podAnnotations .Values.metrics.enabled }}
{{- if or .Values.podAnnotations (and .Values.metrics.enabled .Values.metrics.podAnnotations (not .Values.metrics.serviceMonitor.enabled)) }}
annotations:
{{- if .Values.podAnnotations }}
{{- include "etcd.tplValue" ( dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.metrics.podAnnotations }}
{{- if and .Values.metrics.enabled .Values.metrics.podAnnotations (not .Values.metrics.serviceMonitor.enabled) }}
{{- include "etcd.tplValue" ( dict "value" .Values.metrics.podAnnotations "context" $) | nindent 8 }}
{{- end }}
{{- end }}