canary: add dynamicStableScale

Signed-off-by: Victor Login <batazor111@gmail.com>
shortlink-org · Jan 7, 2023 · 2f16419 · 2f16419
1 parent 6acc79b
commit 2f16419
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ops/Helm/shortlink-api/charts/shortlink-common-0.2.18.tgz b/ops/Helm/shortlink-api/charts/shortlink-common-0.2.18.tgz
diff --git a/ops/Helm/shortlink-api/values.yaml b/ops/Helm/shortlink-api/values.yaml
@@ -79,9 +79,7 @@ deploy:
     type: Canary
     canary:
       steps:
-        - setWeight: 20
-        - pause: {}
-        - setWeight: 40
+        - setWeight: 30
         - pause: { duration: 10 }
         - setWeight: 60
         - pause: { duration: 10 }

diff --git a/ops/Helm/shortlink-common/templates/deployment/_deployment_strategy.yaml b/ops/Helm/shortlink-common/templates/deployment/_deployment_strategy.yaml
@@ -11,17 +11,19 @@ strategy:
   canary:
     stableService: {{ include "helpers.fullname" . }}
     canaryService: {{ include "helpers.fullname" . }}-preview
-{{/*    dynamicStableScale: true*/}}
-    {{- toYaml .Values.deploy.strategy.canary | nindent 2 }}
+    {{- if eq .Values.ingress.enabled true }}
+    dynamicStableScale: {{ .Values.deploy.strategy.canary.dynamicStableScale | default true }}
+    {{- end }}
     trafficRouting:
-    {{ if eq .Values.ingress.enabled true }}
-      {{ if eq .Values.ingress.type "nginx" }}
+    {{- if eq .Values.ingress.enabled true }}
+      {{- if eq .Values.ingress.type "nginx" }}
       nginx:
         # Reference to an Ingress which has a rule pointing to the stable service (e.g. rollouts-demo-stable)
         # This ingress will be cloned with a new name, in order to achieve NGINX traffic splitting.
         stableIngress: {{ include "helpers.fullname" . }}
-      {{ end }}
-    {{ end }}
+      {{- end }}
+    {{- end }}
+    {{- toYaml .Values.deploy.strategy.canary | nindent 4 }}
 {{- else }}
   type: RollingUpdate
   rollingUpdate: