Merge pull request #65 from empathyco/chore/alerts

fix: fix templates
empathyco · Jul 3, 2024 · 164ad96 · 164ad96
2 parents 41880ad + 9e175c9
commit 164ad96
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/charts/motive-cache/Chart.yaml b/charts/motive-cache/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes
 
 type: application
 
-version: 0.1.4
+version: 0.1.5
 
 appVersion: "1.0.0"
diff --git a/charts/motive-cache/README.md b/charts/motive-cache/README.md
@@ -1,6 +1,6 @@
 # motive-cache
 
-![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

diff --git a/charts/motive-cache/templates/_helpers.tpl b/charts/motive-cache/templates/_helpers.tpl
@@ -72,7 +72,7 @@ affinity:
           matchLabels:
             {{- include "motive-cache.selectorLabels" $ | nindent 12 }}
         topologyKey: {{ $.Values.podAntiAffinityTopologyKey }}
-        {{- if (semverCompare ">=1.29.0-0" $.Capabilities.KubeVersion.Version) -}}
+        {{- if (semverCompare ">=1.29.0-0" $.Capabilities.KubeVersion.Version) }}
         matchLabelKeys:
           - pod-template-hash
         {{- end -}}
@@ -85,7 +85,7 @@ affinity:
             matchLabels:
               {{- include "motive-cache.selectorLabels" $ | nindent 14 }}
           topologyKey: {{ $.Values.podAntiAffinityTopologyKey }}
-          {{- if (semverCompare ">=1.29.0-0" $.Capabilities.KubeVersion.Version) -}}
+          {{- if (semverCompare ">=1.29.0-0" $.Capabilities.KubeVersion.Version) }}
           matchLabelKeys:
             - pod-template-hash
           {{- end -}}

diff --git a/charts/motive-service/Chart.yaml b/charts/motive-service/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes
 
 type: application
 
-version: 2.0.11
+version: 2.0.12
 
 appVersion: "1.0.0"
diff --git a/charts/motive-service/README.md b/charts/motive-service/README.md
@@ -1,6 +1,6 @@
 # motive-service
 
-![Version: 2.0.11](https://img.shields.io/badge/Version-2.0.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 2.0.12](https://img.shields.io/badge/Version-2.0.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

diff --git a/charts/motive-service/templates/prometheus-rule-recording.yaml b/charts/motive-service/templates/prometheus-rule-recording.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") -}}
-{{- if or (.Values.metrics.prometheusRule.defaultAlerts.kafka.enabled) (.Values.metrics.prometheusRule.extraRecordingRules) -}}
+{{- if or (and .Values.metrics.prometheusRule.defaultAlerts.kafka.enabled .Values.metrics.prometheusRule.defaultAlerts.kafka.deadLetter.enabled) (.Values.metrics.prometheusRule.extraRecordingRules) -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata: