Merge pull request #125 from dasmeta/DMVP-6036-canary-alerts-fix

DMVP-6036: have fix in canary alert examples and conditions
dasmeta · Nov 19, 2024 · f10076c · f10076c
2 parents 298aa94 + 70ea983
commit f10076c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.8
+version: 0.2.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.8"
+appVersion: "0.2.9"
diff --git a/charts/base/README.md b/charts/base/README.md
@@ -640,18 +640,18 @@ rolloutStrategy:
         thresholdRange:
           max: 500
         interval: 1m
-      # - name: request-success-rate-custom
+      # - name: request-success-rate-nginx-custom
       #   interval: 1m
       #   templateRef:
-      #     name: request-success-rate-custom
+      #     name: request-success-rate-nginx-custom
       #     namespace: ingress-nginx
       #   # minimum req success rate (non 5xx responses) percentage (0-100)
       #   thresholdRange:
       #     min: 99
-      # - name: request-duration-custom
+      # - name: request-duration-nginx-custom
       #   interval: 1m
       #   templateRef:
-      #     name: request-duration-custom
+      #     name: request-duration-nginx-custom
       #     namespace: ingress-nginx
       #   # maximum req duration P99, milliseconds
       #   thresholdRange:

diff --git a/charts/base/templates/rollout-strategy.yaml b/charts/base/templates/rollout-strategy.yaml
@@ -56,7 +56,7 @@ spec:
     webhooks:
       {{- toYaml .Values.rolloutStrategy.configs.webhooks | nindent 6 }}
     {{- end }}
-    {{- if .Values.rolloutStrategy.configs.webhooks }}
+    {{- if .Values.rolloutStrategy.configs.alerts }}
     # custom notification/alerts (optional)
     alerts:
       {{- toYaml .Values.rolloutStrategy.configs.alerts | nindent 6 }}

diff --git a/charts/base/values.yaml b/charts/base/values.yaml
@@ -273,18 +273,18 @@ rolloutStrategy:
   #       thresholdRange:
   #         max: 500
   #       interval: 1m
-  #     # - name: request-success-rate-custom
+  #     # - name: request-success-rate-nginx-custom
   #     #   interval: 1m
   #     #   templateRef:
-  #     #     name: request-success-rate-custom
+  #     #     name: request-success-rate-nginx-custom
   #     #     namespace: ingress-nginx
   #     #   # minimum req success rate (non 5xx responses) percentage (0-100)
   #     #   thresholdRange:
   #     #     min: 99
-  #     # - name: request-duration-custom
+  #     # - name: request-duration-nginx-custom
   #     #   interval: 1m
   #     #   templateRef:
-  #     #     name: request-duration-custom
+  #     #     name: request-duration-nginx-custom
   #     #     namespace: ingress-nginx
   #     #   # maximum req duration P99, milliseconds
   #     #   thresholdRange:

diff --git a/charts/flagger-metrics-and-alerts/Chart.yaml b/charts/flagger-metrics-and-alerts/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.0"
+appVersion: "0.1.1"
diff --git a/charts/flagger-metrics-and-alerts/templates/flagger-canary-nginx-custom.metric-template.yaml b/charts/flagger-metrics-and-alerts/templates/flagger-canary-nginx-custom.metric-template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: request-success-rate-nginx-custom
 spec:
   provider:
-    {{- toYaml .Values.provider | nindent 4 }}
+    {{- toYaml .Values.metricTemplatesDefaultProvider | nindent 4 }}
   query: |
     sum(
       rate(
@@ -35,7 +35,7 @@ metadata:
   name: request-duration-nginx-custom
 spec:
   provider:
-    {{- toYaml .Values.provider | nindent 4 }}
+    {{- toYaml .Values.metricTemplatesDefaultProvider | nindent 4 }}
   query: |
     sum(
       rate(