updateStrategy-and-bdp-fix (#6)

shcherbak · web-flow · commit 2df5294bbbd4 · 2024-08-22T16:42:36.000+03:00
diff --git a/charts/synapse/Chart.yaml b/charts/synapse/Chart.yaml
@@ -1,3 +1,3 @@
 ---
 name: synapse
-version: 0.4.4
+version: 0.4.5
diff --git a/charts/synapse/templates/admin-deployment.yaml b/charts/synapse/templates/admin-deployment.yaml
@@ -7,6 +7,10 @@ metadata:
     app: admin
 spec:
   replicas: {{ .Values.admin.replicas }}
+  {{- if .Values.admin.updateStrategy }}
+  strategy:
+    {{ toYaml .Values.admin.updateStrategy | nindent 6 }}
+  {{- end }}
   selector:
     matchLabels:
       app: admin
diff --git a/charts/synapse/templates/envoy-deployment.yaml b/charts/synapse/templates/envoy-deployment.yaml
@@ -9,11 +9,10 @@ spec:
   selector:
     matchLabels:
       {{- include "synapse-client-reader-envoy.selectorLabels" . | nindent 6 }}
+  {{- if .Values.envoyProxy.updateStrategy }}
   strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
+    {{ toYaml .Values.envoyProxy.updateStrategy | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/synapse/templates/envoy-pdb.yaml b/charts/synapse/templates/envoy-pdb.yaml
@@ -4,10 +4,9 @@ kind: PodDisruptionBudget
 metadata:
   name: synapse-client-reader-envoy
 spec:
-  {{- if .Values.envoyProxy.podDisruptionBudget.minAvailable }}
+  {{- if and .Values.envoyProxy.podDisruptionBudget.minAvailable (not (hasKey .Values.envoyProxy.podDisruptionBudget "maxUnavailable")) }}
   minAvailable: {{ .Values.envoyProxy.podDisruptionBudget.minAvailable }}
-  {{- end }}
-  {{- if .Values.envoyProxy.podDisruptionBudget.maxUnavailable }}
+  {{- else if .Values.envoyProxy.podDisruptionBudget.maxUnavailable }}
   maxUnavailable: {{ .Values.envoyProxy.podDisruptionBudget.maxUnavailable }}
   {{- end }}
   selector:
diff --git a/charts/synapse/templates/matrix-authentication-deployment.yaml b/charts/synapse/templates/matrix-authentication-deployment.yaml
@@ -12,11 +12,10 @@ spec:
   selector:
     matchLabels:
       {{- include "matrix-authentication.selectorLabels" . | nindent 6 }}
+  {{- if .Values.matrixAuthentication.updateStrategy }}
   strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
+    {{ toYaml .Values.matrixAuthentication.updateStrategy | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/synapse/templates/matrix-authentication-pdb.yaml b/charts/synapse/templates/matrix-authentication-pdb.yaml
@@ -5,10 +5,9 @@ kind: PodDisruptionBudget
 metadata:
   name: matrix-authentication
 spec:
-  {{- if .Values.matrixAuthentication.podDisruptionBudget.minAvailable }}
+  {{- if and .Values.matrixAuthentication.podDisruptionBudget.minAvailable (not (hasKey .Values.matrixAuthentication.podDisruptionBudget "maxUnavailable")) }}
   minAvailable: {{ .Values.matrixAuthentication.podDisruptionBudget.minAvailable }}
-  {{- end }}
-  {{- if .Values.matrixAuthentication.podDisruptionBudget.maxUnavailable }}
+  {{- else if .Values.matrixAuthentication.podDisruptionBudget.maxUnavailable }}
   maxUnavailable: {{ .Values.matrixAuthentication.podDisruptionBudget.maxUnavailable }}
   {{- end }}
   selector:
diff --git a/charts/synapse/templates/pgbouncer-deployment-pdb.yaml b/charts/synapse/templates/pgbouncer-deployment-pdb.yaml
@@ -4,10 +4,9 @@ kind: PodDisruptionBudget
 metadata:
   name: synapse-pgbouncer
 spec:
-  {{- if .Values.synapse.pgbouncer.podDisruptionBudget.minAvailable }}
+  {{- if and .Values.synapse.pgbouncer.podDisruptionBudget.minAvailable (not (hasKey .Values.synapse.pgbouncer.podDisruptionBudget "maxUnavailable")) }}
   minAvailable: {{ .Values.synapse.pgbouncer.podDisruptionBudget.minAvailable }}
-  {{- end }}
-  {{- if .Values.synapse.pgbouncer.podDisruptionBudget.maxUnavailable }}
+  {{- else if .Values.synapse.pgbouncer.podDisruptionBudget.maxUnavailable }}
   maxUnavailable: {{ .Values.synapse.pgbouncer.podDisruptionBudget.maxUnavailable }}
   {{- end }}
   selector:
diff --git a/charts/synapse/templates/pgbouncer-deployment.yaml b/charts/synapse/templates/pgbouncer-deployment.yaml
@@ -10,11 +10,10 @@ spec:
   selector:
     matchLabels:
       app: synapse-pgbouncer
+  {{- if .Values.synapse.pgbouncer.updateStrategy }}
   strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
+    {{ toYaml .Values.synapse.pgbouncer.updateStrategy | nindent 4 }}
+  {{- end }}
   template:
     metadata:
       labels:
diff --git a/charts/synapse/templates/sliding-sync-proxy-deployment.yaml b/charts/synapse/templates/sliding-sync-proxy-deployment.yaml
@@ -10,6 +10,10 @@ spec:
   {{- if not .Values.slidingSyncProxy.autoscaling.enabled }}
   replicas: {{ .Values.slidingSyncProxy.replicaCount }}
   {{- end }}
+  {{- if .Values.slidingSyncProxy.updateStrategy }}
+  strategy:
+    {{ toYaml .Values.slidingSyncProxy.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "sliding-sync-proxy.selectorLabels" . | nindent 6 }}
diff --git a/charts/synapse/templates/synapse-workers-deployment.yaml b/charts/synapse/templates/synapse-workers-deployment.yaml
@@ -11,14 +11,13 @@ spec:
   {{- if not $options.autoscaling.enabled }}
   replicas: {{ $options.replicas }}
   {{- end }}
+  {{- if $.Values.synapse.updateStrategy }}
+  strategy:
+    {{ toYaml $.Values.synapse.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "synapse-workers.selectorLabels" $name | nindent 6 }}
-  strategy:
-    rollingUpdate:
-      maxSurge: 50%
-      maxUnavailable: 50%
-    type: RollingUpdate
   template:
     metadata:
       annotations:
diff --git a/charts/synapse/templates/well-known-deployment.yaml b/charts/synapse/templates/well-known-deployment.yaml
@@ -7,6 +7,10 @@ metadata:
     app: well-known
 spec:
   replicas: 1
+  {{- if .Values.wellKnown.updateStrategy }}
+  strategy:
+    {{ toYaml .Values.wellKnown.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       app: well-known
diff --git a/charts/synapse/values.yaml b/charts/synapse/values.yaml
@@ -17,6 +17,11 @@ synapse:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 25%
   # this workers can scale in runtime
   resourcesDefaults:
     requests:
@@ -107,8 +112,10 @@ synapse:
     replicas: 2
     podDisruptionBudget:
       ebabled: true
-      #minAvailable: 1
-      maxUnavailable: 1
+      # Define either 'minAvailable' or 'maxUnavailable', never both.
+      minAvailable: 1
+      # -- Maximum unavailable pods set in PodDisruptionBudget. If set, 'minAvailable' is ignored.
+      # maxUnavailable: 1
     authType: "md5"
     maxClientConn: "8192"
     poolSize: "20"
@@ -117,6 +124,11 @@ synapse:
     nodeSelector: {}
     tolerations: []
     affinity: {}
+    updateStrategy:
+      type: RollingUpdate
+      rollingUpdate:
+        maxUnavailable: 1
+        maxSurge: 25%
     priorityClassName: ''
     topologySpreadConstraints: []
 
@@ -295,6 +307,7 @@ admin:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  updateStrategy: {}
 
 slidingSyncProxy:
   enabled: true
@@ -310,6 +323,11 @@ slidingSyncProxy:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 25%
   image:
     repository: ghcr.io/matrix-org/sliding-sync
     tag: v0.99.19
@@ -341,8 +359,10 @@ envoyProxy:
   replicaCount: 2
   podDisruptionBudget:
     ebabled: true
-    #minAvailable: 1
-    maxUnavailable: 1
+    # Define either 'minAvailable' or 'maxUnavailable', never both.
+    minAvailable: 1
+    # -- Maximum unavailable pods set in PodDisruptionBudget. If set, 'minAvailable' is ignored.
+    # maxUnavailable: 1
   image:
     repository: envoyproxy/envoy
     tag: v1.27.7
@@ -358,6 +378,11 @@ envoyProxy:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 25%
   priorityClassName: ''
   topologySpreadConstraints: []
   # example
@@ -378,7 +403,10 @@ matrixAuthentication:
   podDisruptionBudget:
     ebabled: true
     #minAvailable: 1
-    maxUnavailable: 1
+    # Define either 'minAvailable' or 'maxUnavailable', never both.
+    minAvailable: 1
+    # -- Maximum unavailable pods set in PodDisruptionBudget. If set, 'minAvailable' is ignored.
+    # maxUnavailable: 1
   image:
     repository: ghcr.io/matrix-org/matrix-authentication-service
     tag: 0.9.0
@@ -394,6 +422,11 @@ matrixAuthentication:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 25%
   priorityClassName: ''
   topologySpreadConstraints: []
   autoscaling:
@@ -493,6 +526,7 @@ wellKnown:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  updateStrategy: {}
   resources:
     requests:
       cpu: 20m
