diff --git a/README.md b/README.md index 722640da4..862012c17 100644 --- a/README.md +++ b/README.md @@ -32,15 +32,12 @@ The main components are powered by 4 external dependencies: - Kafka - Local DB (MySQL, Postgres, MariaDB) - Search Index (Elasticsearch) -- Graph Index (Supports either Neo4j or Elasticsearch) +- Graph Index (Supports either Elasticsearch or Neo4j) The dependencies must be deployed before deploying Datahub. We created a separate [chart](https://github.com/acryldata/datahub-helm/tree/master/charts/prerequisites) for deploying the dependencies with example configuration. They could also be deployed -separately on-prem or leveraged as managed services. To remove your dependency on Neo4j, -set enabled to false in the `datahub-kubernetes/prerequisites/values.yaml` file. -Then, override the `graph_service_impl` field in `datahub-kubernetes/datahub/values.yaml` to -have the value `elasticsearch` instead of `neo4j`. +separately on-prem or leveraged as managed services. ## Quickstart Assuming kubectl context points to the correct kubernetes cluster, first create kubernetes secrets that contain MySQL and Neo4j passwords. diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 0dd5810b8..4dd4fa5be 100644 --- a/charts/datahub/Chart.yaml +++ b/charts/datahub/Chart.yaml @@ -3,13 +3,13 @@ name: datahub 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 -version: 0.3.13 +version: 0.3.14 # 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.11.0 dependencies: - name: datahub-gms - version: 0.2.155 + version: 0.2.156 repository: file://./subcharts/datahub-gms condition: datahub-gms.enabled - name: datahub-frontend @@ -17,7 +17,7 @@ dependencies: repository: file://./subcharts/datahub-frontend condition: datahub-frontend.enabled - name: datahub-mae-consumer - version: 0.2.149 + version: 0.2.150 repository: file://./subcharts/datahub-mae-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-mce-consumer diff --git a/charts/datahub/README.md b/charts/datahub/README.md index fdf310f3c..546ad43f0 100644 --- a/charts/datahub/README.md +++ b/charts/datahub/README.md @@ -116,7 +116,7 @@ helm install datahub datahub/datahub --values <> | global.sql.datasource.password.secretRef | string | `"mysql-secrets"` | Secret that contains the MySQL password | | global.sql.datasource.password.secretKey | string | `"mysql-password"` | Secret key that contains the MySQL password | | global.sql.datasource.password.value | string | `"mysql-password"` | Alternative to using the secret above, uses raw string value instead | -| global.graph_service_impl | string | `neo4j` | One of `neo4j` or `elasticsearch`. Determines which backend to use for the GMS graph service. Elastic is recommended for a simplified deployment. Neo4j will be the default for now to maintain backwards compatibility | +| global.graph_service_impl | string | `elasticsearch` | One of `elasticsearch` or `neo4j`. Determines which backend to use for the GMS graph service. Elasticsearch is recommended for a simplified deployment. | ## Optional Chart Values diff --git a/charts/datahub/subcharts/datahub-gms/Chart.yaml b/charts/datahub/subcharts/datahub-gms/Chart.yaml index 2dc7bc404..40bfc7d5a 100644 --- a/charts/datahub/subcharts/datahub-gms/Chart.yaml +++ b/charts/datahub/subcharts/datahub-gms/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for LinkedIn DataHub's datahub-gms component 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.2.155 +version: 0.2.156 # 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: v0.11.0 diff --git a/charts/datahub/subcharts/datahub-gms/README.md b/charts/datahub/subcharts/datahub-gms/README.md index ec9be7139..7aeb6b3be 100644 --- a/charts/datahub/subcharts/datahub-gms/README.md +++ b/charts/datahub/subcharts/datahub-gms/README.md @@ -38,7 +38,7 @@ Current chart version is `0.2.0` | global.sql.datasource.username | string | `"datahub"` | | | global.sql.datasource.password.secretRef | string | `"mysql-secrets"` | | | global.sql.datasource.password.secretKey | string | `"mysql-password"` | | -| global.graph_service_impl | string | `neo4j` | One of `neo4j` or `elasticsearch`. Determines which backend to use for the GMS graph service. Elastic is recommended for a simplified deployment. Neo4j will be the default for now to maintain backwards compatibility | +| global.graph_service_impl | string | `elasticsearch` | One of `elasticsearch` or `neo4j`. Determines which backend to use for the GMS graph service. Elasticsearch is recommended for a simplified deployment. | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"linkedin/datahub-gms"` | | | image.tag | string | `"head"` | | diff --git a/charts/datahub/subcharts/datahub-gms/values.yaml b/charts/datahub/subcharts/datahub-gms/values.yaml index 66e725a86..cd2945145 100644 --- a/charts/datahub/subcharts/datahub-gms/values.yaml +++ b/charts/datahub/subcharts/datahub-gms/values.yaml @@ -135,7 +135,7 @@ readinessProbe: # helm install datahub-gms datahub-gms/ global: datahub_analytics_enabled: true - graph_service_impl: neo4j + graph_service_impl: elasticsearch elasticsearch: host: "elasticsearch" diff --git a/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml b/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml index f38313d0e..0e34e9092 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes 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.2.149 +version: 0.2.150 # 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: v0.11.0 diff --git a/charts/datahub/subcharts/datahub-mae-consumer/README.md b/charts/datahub/subcharts/datahub-mae-consumer/README.md index ff770fc96..fbae00c03 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/README.md +++ b/charts/datahub/subcharts/datahub-mae-consumer/README.md @@ -33,7 +33,7 @@ Current chart version is `0.2.0` | global.hostAliases[0].hostnames[2] | string | `"elasticsearch"` | | | global.hostAliases[0].hostnames[3] | string | `"neo4j"` | | | global.hostAliases[0].ip | string | `"192.168.0.104"` | | -| global.graph_service_impl | string | `neo4j` | One of `neo4j` or `elasticsearch`. Determines which backend to use for the GMS graph service. Elastic is recommended for a simplified deployment. Neo4j will be the default for now to maintain backwards compatibility | +| global.graph_service_impl | string | `elasticsearch` | One of `elasticsearch` or `neo4j`. Determines which backend to use for the GMS graph service. Elasticsearch is recommended for a simplified deployment. | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"linkedin/datahub-mae-consumer"` | | | image.tag | string | `"head"` | | diff --git a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml index 7ba853af5..aadbea8cf 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml @@ -169,7 +169,7 @@ readinessProbe: failureThreshold: 8 global: - graph_service_impl: neo4j + graph_service_impl: elasticsearch datahub_analytics_enabled: true elasticsearch: diff --git a/charts/prerequisites/Chart.yaml b/charts/prerequisites/Chart.yaml index e8e5b6cf3..b4c9c1eba 100644 --- a/charts/prerequisites/Chart.yaml +++ b/charts/prerequisites/Chart.yaml @@ -4,7 +4,7 @@ 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.4 +version: 0.1.5 dependencies: - name: elasticsearch version: 7.17.3 diff --git a/charts/prerequisites/values.yaml b/charts/prerequisites/values.yaml index 63fd3aa47..5b81a754e 100644 --- a/charts/prerequisites/values.yaml +++ b/charts/prerequisites/values.yaml @@ -38,7 +38,7 @@ elasticsearch: # see https://neo4j.com/docs/operations-manual/current/kubernetes/ for more information # source: https://github.com/neo4j/helm-charts neo4j: - enabled: true + enabled: false nameOverride: neo4j neo4j: name: neo4j