From 6e6fa86cf30cd6da74aade5d06ddedb44ed3145d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20L=C3=BCdin?= <13187726+Masterchen09@users.noreply.github.com> Date: Tue, 18 Jun 2024 08:32:46 +0200 Subject: [PATCH] feat(prerequisites): add optional OpenSearch chart with default configuration (#476) --- charts/datahub/Chart.yaml | 2 +- charts/datahub/values.yaml | 6 +++++ charts/prerequisites/Chart.yaml | 6 ++++- charts/prerequisites/values.yaml | 45 +++++++++++++++++++++++++++++--- 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 906e31e00..11b987d28 100644 --- a/charts/datahub/Chart.yaml +++ b/charts/datahub/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for LinkedIn DataHub type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.4.16 +version: 0.4.17 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: 0.13.2 diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml index 760033491..35f6fd3e8 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -148,6 +148,10 @@ elasticsearchSetupJob: helm.sh/hook-weight: "-5" helm.sh/hook-delete-policy: before-hook-creation podAnnotations: {} + # If you want to use OpenSearch instead of ElasticSearch add the USE_AWS_ELASTICSEARCH environment variable below + # extraEnvs: + # - name: USE_AWS_ELASTICSEARCH + # value: "true" # Add extra sidecar containers to job pod extraSidecars: [] # - name: my-image-name @@ -412,6 +416,8 @@ global: elasticsearch: host: "elasticsearch-master" + # If you want to use OpenSearch instead of ElasticSearch use different hostname below + # host: "opensearch-cluster-master" port: "9200" skipcheck: "false" insecure: "false" diff --git a/charts/prerequisites/Chart.yaml b/charts/prerequisites/Chart.yaml index 4048c2235..d183af3ec 100644 --- a/charts/prerequisites/Chart.yaml +++ b/charts/prerequisites/Chart.yaml @@ -4,12 +4,16 @@ description: A Helm chart for packages that Datahub depends on type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.1.10 +version: 0.1.11 dependencies: - name: elasticsearch version: 7.17.3 repository: https://helm.elastic.co condition: elasticsearch.enabled + - name: opensearch + version: 2.18.0 + repository: https://opensearch-project.github.io/helm-charts + condition: opensearch.enabled # This chart deploys an enterprise or community version of neo4j - name: neo4j version: 5.11.0 diff --git a/charts/prerequisites/values.yaml b/charts/prerequisites/values.yaml index d42a14b56..a56a4ca7e 100644 --- a/charts/prerequisites/values.yaml +++ b/charts/prerequisites/values.yaml @@ -12,13 +12,13 @@ elasticsearch: # a master node when deploying on a single node Minikube / Kind / etc cluster. antiAffinity: "soft" - # # If you are running a multi-replica cluster, comment this out + # If you are running a multi-replica cluster, comment this out clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s" - # # Shrink default JVM heap. + # Shrink default JVM heap. esJavaOpts: "-Xmx512m -Xms512m" - # # Allocate smaller chunks of memory per pod. + # Allocate smaller chunks of memory per pod. resources: requests: cpu: "100m" @@ -27,7 +27,7 @@ elasticsearch: cpu: "1000m" memory: "1024M" - # # Request smaller persistent volumes. + # Request smaller persistent volumes. # volumeClaimTemplate: # accessModes: ["ReadWriteOnce"] # storageClassName: "standard" @@ -35,6 +35,43 @@ elasticsearch: # requests: # storage: 100M +opensearch: + enabled: false + + # If you're running in production, set this to false, replicas to 3 and uncomment antiAffinity below + # Or alternatively if you're running production, bring your own OpenSearch + singleNode: true + # replicas: 3 + # antiAffinity: "hard" + + # By default security is enabled for OpenSearch, disable it here. + config: + opensearch.yml: | + plugins: + security: + disabled: true + + extraEnvs: + - name: DISABLE_INSTALL_DEMO_CONFIG + value: "true" + + image: + tag: "2.11.0" + + # opensearchJavaOpts: "-Xmx512M -Xms512M" + + # resources: + # requests: + # cpu: "1000m" + # memory: "100Mi" + + # Request smaller persistent volumes. + # persistence: + # storageClass: "standard" + # accessModes: + # - ReadWriteOnce + # size: 100M + # Official neo4j chart, supports both community and enterprise editions # see https://neo4j.com/docs/operations-manual/current/kubernetes/ for more information # source: https://github.com/neo4j/helm-charts