Helm: Support minAvailable on connect injector PDB

charts/consul/templates/connect-injector-disruptionbudget.yaml

@@ -17,7 +17,11 @@ metadata:
     release: {{ .Release.Name }}
     component: connect-injector
 spec:
+  {{- if .Values.connectInject.disruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.connectInject.disruptionBudget.minAvailable }}
+  {{- else }}
   maxUnavailable: {{ template "consul.pdb.connectInject.maxUnavailable" . }}
+  {{- end }}
   selector:
     matchLabels:
       app: {{ template "consul.name" . }}

charts/consul/test/unit/connect-injector-disruptionbudget.bats

@@ -159,3 +159,35 @@ load _helpers
 # no flag to *remove* an API version so some Helm versions will always have
 # policy/v1 support and will always use that API version.
 
+
+#--------------------------------------------------------------------
+# minAvailable
+
+@test "connect-injector/DisruptionBudget: correct minAvailable when set" {
+  cd `chart_dir`
+  local tpl=$(helm template \
+      -s templates/connect-injector-disruptionbudget.yaml  \
+      --set 'connectInject.replicas=1' \
+      --set 'global.enabled=true' \
+      --set 'connectInject.enabled=true' \
+      --set 'connectInject.disruptionBudget.enabled=true' \
+      --set 'connectInject.disruptionBudget.minAvailable=1' \
+      . | tee /dev/stderr)
+  [ $(echo "$tpl" | yq '.spec.minAvailable') = "1" ]
+  [ $(echo "$tpl" | yq '.spec.maxUnavailable') = "null" ]
+}
+
+@test "connect-injector/DisruptionBudget: correct minAvailable when set with maxUnavailable" {
+  cd `chart_dir`
+  local tpl=$(helm template \
+      -s templates/connect-injector-disruptionbudget.yaml  \
+      --set 'connectInject.replicas=1' \
+      --set 'global.enabled=true' \
+      --set 'connectInject.enabled=true' \
+      --set 'connectInject.disruptionBudget.enabled=true' \
+      --set 'connectInject.disruptionBudget.minAvailable=1' \
+      --set 'connectInject.disruptionBudget.maxUnavailable=2' \
+      . | tee /dev/stderr)
+  [ $(echo "$tpl" | yq '.spec.minAvailable') = "1" ]
+  [ $(echo "$tpl" | yq '.spec.maxUnavailable') = "null" ]
+}

charts/consul/values.yaml

@@ -1937,6 +1937,11 @@ connectInject:
     # @type: integer
     maxUnavailable: null
 
+    # The minimum number of available pods.
+    # Takes precedence over maxUnavailable if set.
+    # @type: integer
+    minAvailable: null
+
   # Configures consul-cni plugin for Consul Service mesh services
   cni:
     # If true, then all traffic redirection setup will use the consul-cni plugin.