[bitnami/apache] Fix issue rendering metrics.*.additionalLabels (#9362)

* [bitnami/apache] Fix issue rendering metrics.*.additionalLabels

Signed-off-by: Carlos Rodriguez Hernandez <carlosrh@vmware.com>

* Use labels instead of additionalLabels

Signed-off-by: Carlos Rodriguez Hernandez <carlosrh@vmware.com>

* [bitnami/apache] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2022-03-10 09:42:23 +01:00
committed by GitHub
parent 9dbb420948
commit 2c473a9253
6 changed files with 19 additions and 15 deletions

View File

@@ -13,7 +13,9 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.additionalLabels "context" $ ) | nindent 4 }}
{{- if .Values.metrics.prometheusRule.labels }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.prometheusRule.labels "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}