J release changes

[ric-plt/ric-dep.git] / helm / infrastructure / subcharts / kong / charts / postgresql / templates / prometheusrule.yaml

diff --git a/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml b/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 44f1242..24be710
--- a/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml
+++ b/helm/infrastructure/subcharts/kong/charts/postgresql/templates/prometheusrule.yaml
@@ -2,22 +2,21 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ template "postgresql.fullname" . }}
-{{- with .Values.metrics.prometheusRule.namespace }}
-  namespace: {{ . }}
-{{- end }}
-  labels:
-    app: {{ template "postgresql.name" . }}
-    chart: {{ template "postgresql.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-{{- with .Values.metrics.prometheusRule.additionalLabels }}
-{{ toYaml . | indent 4 }}
-{{- end }}
+  name: {{ include "common.names.fullname" . }}
+  namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+    {{- 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 }}
 spec:
-{{- with .Values.metrics.prometheusRule.rules }}
   groups:
-    - name: {{ template "postgresql.name" $ }}
-      rules: {{ tpl (toYaml .) $ | nindent 8 }}
-{{- end }}
+    - name: {{ include "common.names.fullname" . }}
+      rules: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.rules "context" $ ) | nindent 8 }}
 {{- end }}