fix: allow updateStrategy.rollingUpdate.maxUnavailable to be passed i…

…n as an int or string
traefik · Aug 21, 2023 · 0dcc834 · 0dcc834
1 parent 607b808
commit 0dcc834
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/traefik/templates/daemonset.yaml b/traefik/templates/daemonset.yaml
@@ -9,9 +9,13 @@
   {{- if eq (default .Chart.AppVersion .Values.image.tag) "latest" }}
     {{- fail "\n\n ERROR: latest tag should not be used" }}
   {{- end }}
-  {{- if eq (.Values.updateStrategy.type) "RollingUpdate" }}
-    {{- if and (lt .Values.updateStrategy.rollingUpdate.maxUnavailable 1.0) (.Values.hostNetwork)  }}
-      {{- fail "maxUnavailable should be greater than 1 when using hostNetwork." }}
+  {{- with .Values.updateStrategy }}
+    {{- if eq (.type) "RollingUpdate" }}
+      {{- if not (contains "%" (toString .rollingUpdate.maxUnavailable)) }}
+        {{- if and ($.Values.hostNetwork) (lt (float64 .rollingUpdate.maxUnavailable) 1.0) }}
+          {{- fail "maxUnavailable should be greater than 1 when using hostNetwork." }}
+        {{- end }}
+      {{- end }}
     {{- end }}
   {{- end }}
 

diff --git a/traefik/tests/daemonset-config_test.yaml b/traefik/tests/daemonset-config_test.yaml
@@ -103,7 +103,7 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].lifecycle.postStart.httpGet.scheme
           value: HTTP
-  - it: should fail when hostNetwork and default maxUnavailable 0
+  - it: should fail when hostNetwork and default maxUnavailable 0 (int)
     set:
       deployment:
         kind: DaemonSet
@@ -115,6 +115,31 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: "maxUnavailable should be greater than 1 when using hostNetwork."
+  - it: should fail when hostNetwork and maxUnavailable 0 (string)
+    set:
+      deployment:
+        kind: DaemonSet
+      updateStrategy:
+        type: RollingUpdate
+        rollingUpdate:
+          maxUnavailable: "0"
+      hostNetwork: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "maxUnavailable should be greater than 1 when using hostNetwork."
+  - it: should not fail when hostNetwork and maxUnavailable is a percentage
+    set:
+      deployment:
+        kind: DaemonSet
+      updateStrategy:
+        type: RollingUpdate
+        rollingUpdate:
+          maxUnavailable: "10%"
+      hostNetwork: true
+    asserts:
+      - equal:
+          path: spec.updateStrategy.rollingUpdate.maxUnavailable
+          value: "10%"
   - it: should have an OnDelete updateStrategy when set
     set:
       deployment: