From d672b31dba4520ba9cef19d053423adc220fa884 Mon Sep 17 00:00:00 2001
From: Andrew Kostka <andrew.kostka@wikimedia.de>
Date: Fri, 17 Nov 2023 11:57:07 +0100
Subject: [PATCH] chore(elasticsearch): remove 6.8.22 configs and helmfile
 entry (#1259)

* chore(elasticsearch): remove 6.8.22 cluster on production

* chore(elasticsearch): remove 6.8.22 configs and helmfile entry
---
 .../local/elasticsearch.values.yaml.gotmpl    | 28 -------------
 .../elasticsearch.values.yaml.gotmpl          | 42 -------------------
 .../staging/elasticsearch.values.yaml.gotmpl  | 26 ------------
 k8s/helmfile/helmfile.yaml                    |  7 ----
 4 files changed, 103 deletions(-)
 delete mode 100644 k8s/helmfile/env/local/elasticsearch.values.yaml.gotmpl
 delete mode 100644 k8s/helmfile/env/production/elasticsearch.values.yaml.gotmpl
 delete mode 100644 k8s/helmfile/env/staging/elasticsearch.values.yaml.gotmpl

diff --git a/k8s/helmfile/env/local/elasticsearch.values.yaml.gotmpl b/k8s/helmfile/env/local/elasticsearch.values.yaml.gotmpl
deleted file mode 100644
index 3807e8cb9..000000000
--- a/k8s/helmfile/env/local/elasticsearch.values.yaml.gotmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-imageTag: "6.8.23-wmde.6"
-
-esJavaOpts: "-Xms1g -Xmx1g"
-
-labels:
-  sidecar.istio.io/inject: "true"
-
-podAnnotations:
-  traffic.sidecar.istio.io/includeInboundPorts: "*"
-  traffic.sidecar.istio.io/excludeOutboundPorts: "9300"
-  traffic.sidecar.istio.io/excludeInboundPorts: "9300"
-# hard affinity won't work locally as there is just a single
-# node running minikube
-antiAffinity: soft
-
-resources:
-  requests:
-    cpu: "500m"
-    memory: "1Gi"
-  limits:
-    cpu: "1000m"
-    memory: "1.5Gi"
-
-volumeClaimTemplate:
-  storageClassName: "standard"
-  resources:
-    requests:
-      storage: 2Gi
diff --git a/k8s/helmfile/env/production/elasticsearch.values.yaml.gotmpl b/k8s/helmfile/env/production/elasticsearch.values.yaml.gotmpl
deleted file mode 100644
index bed953536..000000000
--- a/k8s/helmfile/env/production/elasticsearch.values.yaml.gotmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-labels:
-  sidecar.istio.io/inject: "false"
-
-image: "wikibase/elasticsearch"
-imagePullPolicy: Always
-imageTag: "6.8.23-wmde.6"
-
-esJavaOpts: "-Xms32g -Xmx32g"
-
-resources:
-  requests:
-    cpu: "10"
-    memory: "64Gi"
-  limits:
-    cpu: "10"
-    memory: "64Gi"
-
-volumeClaimTemplate:
-  accessModes: [ "ReadWriteOnce" ]
-  storageClassName: "premium-rwo"
-  resources:
-    requests:
-      storage: 50Gi
-
-replicas: 3
-minimumMasterNodes: 2
-
-antiAffinity: hard
-
-esConfig:
-  elasticsearch.yml: |
-    # T309396
-    xpack.ml.enabled: false
-    xpack.monitoring.collection.enabled: false
-    xpack.watcher.enabled: false
-    xpack.security.enabled: false
-    xpack.graph.enabled: false
-    xpack.logstash.enabled: false
-    xpack.ccr.enabled: false
-
-    # T309378
-    action.auto_create_index: false
diff --git a/k8s/helmfile/env/staging/elasticsearch.values.yaml.gotmpl b/k8s/helmfile/env/staging/elasticsearch.values.yaml.gotmpl
deleted file mode 100644
index 827dc9003..000000000
--- a/k8s/helmfile/env/staging/elasticsearch.values.yaml.gotmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-labels:
-  sidecar.istio.io/inject: "true"
-
-podAnnotations:
-  traffic.sidecar.istio.io/includeInboundPorts: "*"
-  traffic.sidecar.istio.io/excludeOutboundPorts: "9300"
-  traffic.sidecar.istio.io/excludeInboundPorts: "9300"
-
-imageTag: "6.8.23-wmde.6"
-
-esJavaOpts: "-Xms2g -Xmx2g"
-
-resources:
-  requests:
-    cpu: "500m"
-    memory: "4Gi"
-  limits:
-    cpu: "2000m"
-    memory: "4Gi"
-
-volumeClaimTemplate:
-  accessModes: [ "ReadWriteOnce" ]
-  storageClassName: "premium-rwo"
-  resources:
-    requests:
-      storage: 10.1Gi
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
index 21575db9b..a5a3ede5e 100644
--- a/k8s/helmfile/helmfile.yaml
+++ b/k8s/helmfile/helmfile.yaml
@@ -113,13 +113,6 @@ releases:
     version: 10.5.0
     <<: *default_release
 
-  - name: elasticsearch
-    namespace: default
-    chart: wbstack/elasticsearch-legacy
-    version: 6.8.22-wmde2
-    installed: false
-    <<: *default_release
-
   - name: elasticsearch-1
     namespace: default
     chart: bitnami/elasticsearch