Merge branch 'master' into master

acryldata · Oct 20, 2023 · d0a222d · d0a222d
2 parents 36037cb + 4a19805
commit d0a222d
Show file tree

Hide file tree

Showing 16 changed files with 211 additions and 170 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -31,8 +31,7 @@ jobs:
       - name: Add Helm repos
         run: |
           helm repo add elasticsearch https://helm.elastic.co
-          helm repo add neo4j https://neo4j-contrib.github.io/neo4j-helm
-          helm repo add neo4j-community https://equinor.github.io/helm-charts/charts
+          helm repo add neo4j https://helm.neo4j.com/neo4j
           helm repo add mysql https://charts.bitnami.com/bitnami
           helm repo add cp-helm-charts https://confluentinc.github.io/cp-helm-charts
           helm repo add kafka https://charts.bitnami.com/bitnami

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ Assuming kubectl context points to the correct kubernetes cluster, first create
 
 ```(shell)
 kubectl create secret generic mysql-secrets --from-literal=mysql-root-password=datahub
-kubectl create secret generic neo4j-secrets --from-literal=neo4j-password=datahub
+kubectl create secret generic neo4j-secrets --from-literal=neo4j-password=datahub --from-literal=NEO4J_AUTH=neo4j/datahub
 ```
 
 The above commands sets the passwords to "datahub" as an example. Change to any password of choice. 
@@ -79,7 +79,7 @@ elasticsearch-master-0                             1/1     Running     0
 prerequisites-cp-schema-registry-cf79bfccf-kvjtv   2/2     Running     1          63m
 prerequisites-kafka-0                              1/1     Running     2          62m
 prerequisites-mysql-0                              1/1     Running     1          62m
-prerequisites-neo4j-community-0                    1/1     Running     0          52m
+prerequisites-neo4j-0                              1/1     Running     0          52m
 prerequisites-zookeeper-0                          1/1     Running     0          62m
 ```
 
@@ -109,7 +109,7 @@ elasticsearch-master-0                             1/1     Running     0
 prerequisites-cp-schema-registry-cf79bfccf-kvjtv   2/2     Running     1          99m
 prerequisites-kafka-0                              1/1     Running     2          97m
 prerequisites-mysql-0                              1/1     Running     1          97m
-prerequisites-neo4j-community-0                    1/1     Running     0          88m
+prerequisites-neo4j-0                              1/1     Running     0          88m
 prerequisites-zookeeper-0                          1/1     Running     0          97m
 ```
 

diff --git 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.2.189
+version: 0.3.3
 # 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
@@ -14,7 +14,7 @@ dependencies:
     repository: file://./subcharts/datahub-gms
     condition: datahub-gms.enabled
   - name: datahub-frontend
-    version: 0.2.141
+    version: 0.2.142
     repository: file://./subcharts/datahub-frontend
     condition: datahub-frontend.enabled
   - name: datahub-mae-consumer
@@ -26,7 +26,7 @@ dependencies:
     repository: file://./subcharts/datahub-mce-consumer
     condition: global.datahub_standalone_consumers_enabled
   - name: datahub-ingestion-cron
-    version: 0.2.136
+    version: 0.2.137
     repository: file://./subcharts/datahub-ingestion-cron
     condition: datahub-ingestion-cron.enabled
   - name: acryl-datahub-actions

diff --git a/charts/datahub/README.md b/charts/datahub/README.md
diff --git a/charts/datahub/quickstart-values-with-neo4j.yaml b/charts/datahub/quickstart-values-with-neo4j.yaml
@@ -87,8 +87,8 @@ global:
       url: "http://prerequisites-cp-schema-registry:8081"
 
   neo4j:
-    host: "prerequisites-neo4j-community:7474"
-    uri: "bolt://prerequisites-neo4j-community"
+    host: "prerequisites-neo4j:7474"
+    uri: "bolt://prerequisites-neo4j"
     username: "neo4j"
     password:
       secretRef: neo4j-secrets

diff --git a/charts/datahub/subcharts/datahub-frontend/Chart.yaml b/charts/datahub/subcharts/datahub-frontend/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.141
+version: 0.2.142
 # 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-frontend/templates/secrets.yaml b/charts/datahub/subcharts/datahub-frontend/templates/secrets.yaml
@@ -7,5 +7,5 @@ metadata:
     {{- include "datahub-frontend.labels" . | nindent 4 }}
 type: Opaque
 data:
-  datahub.gms.secret: {{ randAlphaNum 10 | b64enc | quote }}
+  datahub.gms.secret: {{ randAscii 32 | b64enc | quote }}
 {{- end -}}
diff --git a/charts/datahub/subcharts/datahub-ingestion-cron/Chart.yaml b/charts/datahub/subcharts/datahub-ingestion-cron/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.136
+version: 0.2.137
 # 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