Merge pull request #28 from tspiri26/low_359_statefulset

Low 359 statefulset
cinaq · Jun 4, 2024 · b6b8b66 · b6b8b66
2 parents 0f10e8a + e5dabeb
commit b6b8b66
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 170 deletions.
diff --git a/charts/app-mendix/Chart.yaml b/charts/app-mendix/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: app-mendix
-version: 2.3.0
+version: 3.0.0
 description: Mendix Application Chart.
 icon: https://cinaq.github.io/helm-charts/icons/mendix-logo.png
 maintainers:

diff --git a/charts/app-mendix/templates/autoscale.yaml b/charts/app-mendix/templates/autoscale.yaml
@@ -9,8 +9,8 @@ metadata:
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
-    kind: Deployment
-    name: {{ template "app-mendix.fullname" . }}-slave
+    kind: StatefulSet
+    name: {{ template "app-mendix.fullname" . }}
   minReplicas: {{ .Values.autoscale.minSlaveReplicas }}
   maxReplicas: {{ .Values.autoscale.maxSlaveReplicas }}
   targetCPUUtilizationPercentage: {{ .Values.autoscale.targetCPUUtilizationPercentage }}

diff --git a/charts/app-mendix/templates/deployment-slave.yaml b/charts/app-mendix/templates/deployment-slave.yaml
diff --git a/...p-mendix/templates/deployment-leader.yaml → charts/app-mendix/templates/statefulset.yaml b/...p-mendix/templates/deployment-leader.yaml → charts/app-mendix/templates/statefulset.yaml
@@ -1,21 +1,19 @@
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
-  name: {{ template "app-mendix.fullname" . }}-leader
+  name: {{ template "app-mendix.fullname" . }}
   labels:
     {{- include "app-mendix.labels" . | nindent 4 }}
 spec:
-{{- if (ge (int .Values.replicaCount) 1) }}
-  replicas: 1
-{{- else }}
-  replicas: 0
-{{- end }}
+  replicas: {{ default 1 .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "app-mendix.selectorLabels" . | nindent 6 }}
-  strategy:
-    type: Recreate
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: {{ template "app-mendix.fullname" . }}
+  minReadySeconds: 10 
   template:
     metadata:
       labels:
@@ -41,8 +39,6 @@ spec:
           env:
             - name: NON_MENDIX_PUBLIC_CLOUD
               value: "true"
-            - name: CF_INSTANCE_INDEX
-              value: "0"
             - name: MXRUNTIME_Metrics_Registries
               value: '[{"type": "prometheus", "settings": {"step": "5m"}}]'
             - name: RUNTIME_LOGIN_METRICS_ENABLED

diff --git a/charts/app-mendix/values.yaml b/charts/app-mendix/values.yaml
@@ -1,7 +1,4 @@
-# initial replica, if:
-# less than 1    => no leader or slaves
-# equal 1        => 1 leader no slaves
-# larger than 1  => 1 leader, rest slaves
+# replicaCount: 2 | 1 leader, 1 slave
 replicaCount: 1
 
 image:
@@ -98,13 +95,6 @@ autoscale:
   maxSlaveReplicas: 3
   targetCPUUtilizationPercentage: 70
 
-strategy:
-  enabled: false
-  type: RollingUpdate
-  rollingUpdate:
-    maxSurge: 1
-    maxUnavailable: 0
-
 readinessProbe:
   enabled: true
   type: httpGet