Merge branch 'main' into elasticsearch-cpu-production

wmde · Nov 15, 2023 · 207b39e · 207b39e
2 parents ee94d4a + 6e55898
commit 207b39e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 45 deletions.
diff --git a/k8s/helmfile/env/local/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/local/elasticsearch-1.values.yaml.gotmpl
@@ -42,17 +42,3 @@ data:
     initialDelaySeconds: 180
   readinessProbe:
     initialDelaySeconds: 90
-
-coordinating:
-  heapSize: 256m
-  resources:
-    requests:
-      cpu: "250m"
-      memory: "512Mi"
-    limits:
-      cpu: "500m"
-      memory: "512Mi"
-  livenessProbe:
-    initialDelaySeconds: 180
-  readinessProbe:
-    initialDelaySeconds: 90
diff --git a/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/production/elasticsearch-1.values.yaml.gotmpl
@@ -11,6 +11,7 @@ extraConfig:
   action.auto_create_index: false
 
 master:
+  replicaCount: 3
   heapSize: 4096m
   resources:
     requests:
@@ -50,18 +51,7 @@ data:
     initialDelaySeconds: 14400
 
 coordinating:
-  heapSize: 4096m
-  resources:
-    requests:
-      cpu: "1"
-      memory: "8Gi"
-    limits:
-      cpu: "2"
-      memory: "8Gi"
-  livenessProbe:
-    initialDelaySeconds: 14400
-  readinessProbe:
-    initialDelaySeconds: 14400
+  replicaCount: 0
 
 ingest:
   enabled: false

diff --git a/k8s/helmfile/env/staging/elasticsearch-1.values.yaml.gotmpl b/k8s/helmfile/env/staging/elasticsearch-1.values.yaml.gotmpl
@@ -10,10 +10,10 @@ master:
   heapSize: 512m
   resources:
     requests:
-      cpu: "1"
+      cpu: "250m"
       memory: "1Gi"
     limits:
-      cpu: "1"
+      cpu: "500m"
       memory: "1Gi"
   persistence:
     enabled: true
@@ -30,7 +30,7 @@ data:
   heapSize: 4096m
   resources:
     requests:
-      cpu: "1"
+      cpu: "500m"
       memory: "8Gi"
     limits:
       cpu: "1"
@@ -41,20 +41,6 @@ data:
     storageClass: "premium-rwo"
     size: 10Gi
   livenessProbe:
-    initialDelaySeconds: 600
-  readinessProbe:
-    initialDelaySeconds: 600
-
-coordinating:
-  heapSize: 512m
-  resources:
-    requests:
-      cpu: "0.5"
-      memory: "1Gi"
-    limits:
-      cpu: "0.5"
-      memory: "1Gi"
-  livenessProbe:
-    initialDelaySeconds: 600
+    initialDelaySeconds: 1800
   readinessProbe:
-    initialDelaySeconds: 600
+    initialDelaySeconds: 1800