From 159f6b02674228d5dc84a1c9d4d8b79194995358 Mon Sep 17 00:00:00 2001
From: Akash Jain <15995028+akash-jain-10@users.noreply.github.com>
Date: Fri, 10 Nov 2023 15:18:59 +0530
Subject: [PATCH] feat: Migrate to OpenSearch 2.7 as Chart's default search
 dependency (#194)

* feat: Add OS Deps; update mysql charts dep version

* fix(docs): Update README.md
---
 charts/deps/Chart.lock          | 14 +++++++-------
 charts/deps/Chart.yaml          | 12 ++++++------
 charts/deps/values.yaml         | 28 ++++++++++++++--------------
 charts/openmetadata/README.md   |  4 ++--
 charts/openmetadata/values.yaml |  4 ++--
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/charts/deps/Chart.lock b/charts/deps/Chart.lock
index eab4b4c3..69d7c7d1 100644
--- a/charts/deps/Chart.lock
+++ b/charts/deps/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: mysql
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 9.7.1
-- name: elasticsearch
-  repository: https://helm.elastic.co
-  version: 8.5.1
+  repository: https://charts.bitnami.com/bitnami
+  version: 9.7.2
 - name: airflow
   repository: https://airflow-helm.github.io/charts
   version: 8.8.0
-digest: sha256:c4a68ed6f7480bda021d99bb39daf90ed686edeae3605389158b2fc5b9d05f7c
-generated: "2023-10-26T15:20:32.348887+05:30"
+- name: opensearch
+  repository: https://opensearch-project.github.io/helm-charts/
+  version: 2.12.1
+digest: sha256:ef5c9862e7107bdf2ba81ffb30b9da74b6072dec41800a80723eb08bcdac6022
+generated: "2023-11-07T16:06:28.907894+05:30"
diff --git a/charts/deps/Chart.yaml b/charts/deps/Chart.yaml
index 2f1fd3b8..a5860515 100644
--- a/charts/deps/Chart.yaml
+++ b/charts/deps/Chart.yaml
@@ -60,14 +60,14 @@ icon: https://open-metadata.org/images/favicon.png
 # Add Dependencies of other charts
 dependencies:
 - name: mysql
-  version: "9.7.1"
-  repository: "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
+  version: "9.7.2"
+  repository: "https://charts.bitnami.com/bitnami"
   condition: mysql.enabled
-- name: elasticsearch
-  version: "8.5.1"
-  repository: "https://helm.elastic.co"
-  condition: elasticsearch.enabled
 - name: airflow
   version: "8.8.0"
   repository: "https://airflow-helm.github.io/charts"
   condition: airflow.enabled
+- name: opensearch
+  version: "2.12.1"
+  repository: "https://opensearch-project.github.io/helm-charts/"
+  condition: opensearch.enabled
diff --git a/charts/deps/values.yaml b/charts/deps/values.yaml
index c00c96b2..d8b715db 100644
--- a/charts/deps/values.yaml
+++ b/charts/deps/values.yaml
@@ -30,22 +30,22 @@ mysql:
       GRANT ALL PRIVILEGES ON airflow_db.* TO 'airflow_user'@'%' WITH GRANT OPTION;
       commit;
 
-# ElasticSearch configurations for helm dependency
-# you can find more details about this here https://artifacthub.io/packages/helm/elastic/elasticsearch
-elasticsearch:
+# OpenSearch Helm Dependency
+# you can find more details about this here https://artifacthub.io/packages/helm/opensearch-project-helm-charts/opensearch/2.12.2
+opensearch:
   enabled: true
-  replicas: 1
-  minimumMasterNodes: 1
-  fullnameOverride: "elasticsearch"
-  imagePullPolicy: "Always"
-  esJavaOpts: "-Xmx1024m -Xms1024m"
+  clusterName: opensearch
+  fullnameOverride: opensearch
+  nodeGroup: ""
+  imagePullPolicy: Always
+  opensearchJavaOpts: "-Xmx1g -Xms1g"
+  persistence:
+    size: 30Gi
   protocol: http
-  createCert: false
-  esConfig:
-    elasticsearch.yml: |
-      xpack.security.enabled: false
-  maxUnavailable: 0
-  clusterHealthCheckParams: "wait_for_status=yellow&timeout=20s"
+  config:
+    opensearch.yml: |
+      plugins.security.disabled: true
+  singleNode: true
   resources:
     requests:
       cpu: "100m"
diff --git a/charts/openmetadata/README.md b/charts/openmetadata/README.md
index d5947474..b53bebad 100644
--- a/charts/openmetadata/README.md
+++ b/charts/openmetadata/README.md
@@ -117,10 +117,10 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | openmetadata.config.elasticsearch.auth.username | string | `elasticsearch` | ELASTICSEARCH_USER |
 | openmetadata.config.elasticsearch.auth.password.secretRef | string | `elasticsearch-secrets` | ELASTICSEARCH_PASSWORD |
 | openmetadata.config.elasticsearch.auth.password.secretKey | string | `openmetadata-elasticsearch-password` | ELASTICSEARCH_PASSWORD |
-| openmetadata.config.elasticsearch.host | string | `elasticsearch` | ELASTICSEARCH_HOST |
+| openmetadata.config.elasticsearch.host | string | `opensearch` | ELASTICSEARCH_HOST |
 | openmetadata.config.elasticsearch.keepAliveTimeoutSecs | int | `600` | ELASTICSEARCH_KEEP_ALIVE_TIMEOUT_SECS |
 | openmetadata.config.elasticsearch.port | int | 9200 | ELASTICSEARCH_PORT |
-| openmetadata.config.elasticsearch.searchType | string | `elasticsearch` | SEARCH_TYPE |
+| openmetadata.config.elasticsearch.searchType | string | `opensearch` | SEARCH_TYPE |
 | openmetadata.config.elasticsearch.scheme | string | `http` | ELASTICSEARCH_SCHEME |
 | openmetadata.config.elasticsearch.searchIndexMappingLanguage | string | `EN`| ELASTICSEARCH_INDEX_MAPPING_LANG |
 | openmetadata.config.elasticsearch.trustStore.enabled | bool | `false` | |
diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml
index a93b5502..8591c489 100644
--- a/charts/openmetadata/values.yaml
+++ b/charts/openmetadata/values.yaml
@@ -23,8 +23,8 @@ openmetadata:
       port: 8585
       adminPort: 8586
     elasticsearch:
-      host: elasticsearch
-      searchType: elasticsearch
+      host: opensearch
+      searchType: opensearch
       port: 9200
       scheme: http
       connectionTimeoutSecs: 5