Fix update strategy of gerrit-master StatefulSet
The update strategy for the StatefulSet running the gerrit-master
was not correctly defined. This worked for a while, but failed, when
using helm > v3.0.
Change-Id: I1b31e48cb848abcf656c77136d6d68986b6e2c4b
diff --git a/helm-charts/gerrit-master/README.md b/helm-charts/gerrit-master/README.md
index 3dfe685..702d17f 100644
--- a/helm-charts/gerrit-master/README.md
+++ b/helm-charts/gerrit-master/README.md
@@ -149,8 +149,7 @@
| `gerritMaster.images.gerritInit` | Image name of the Gerrit init container image | `k8s-gerrit/gerrit-init` |
| `gerritMaster.images.gerritMaster` | Image name of the Gerrit master container image | `k8s-gerrit/gerrit-master` |
| `gerritMaster.replicas` | Number of replica pods to deploy | `1` |
-| `gerritMaster.maxSurge` | Max. percentage or number of pods allowed to be scheduled above the desired number | `25%` |
-| `gerritMaster.maxUnavailable` | Max. percentage or number of pods allowed to be unavailable at a time | `100%` |
+| `gerritMaster.updatePartition` | Number of pods to update simultaneously | `1` |
| `gerritMaster.resources` | Configure the amount of resources the pod requests/is allowed | `requests.cpu: 1` |
| | | `requests.memory: 5Gi` |
| | | `limits.cpu: 1` |
diff --git a/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml b/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
index bfae1f6..dd8575f 100644
--- a/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
+++ b/helm-charts/gerrit-master/templates/gerrit-master.stateful-set.yaml
@@ -10,10 +10,9 @@
spec:
serviceName: {{ .Release.Name }}-gerrit-master-service
replicas: {{ .Values.gerritMaster.replicas | default 1 }}
- strategy:
+ updateStrategy:
rollingUpdate:
- maxSurge: {{ .Values.gerritMaster.maxSurge }}
- maxUnavailable: {{ .Values.gerritMaster.maxUnavailable }}
+ partition: {{ .Values.gerritMaster.updatePartition }}
selector:
matchLabels:
app: gerrit-master
diff --git a/helm-charts/gerrit-master/values.yaml b/helm-charts/gerrit-master/values.yaml
index 1637d42..ccdabf9 100644
--- a/helm-charts/gerrit-master/values.yaml
+++ b/helm-charts/gerrit-master/values.yaml
@@ -74,10 +74,7 @@
gerritMaster: k8sgerrit/gerrit-master
replicas: 1
- maxSurge: 25%
- # For just one replica, 100 % unavailability has to be allowed for updates to
- # work.
- maxUnavailable: 100%
+ updatePartition: 1
# The memory limit has to be higher than the configures heap-size for Java!
resources:
