diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7343b932c..2c96e44c7 100644 --- 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 index 49027c0cb..722640da4 100644 --- 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 index 5954c3240..03577c468 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.2.189 +version: 0.3.0 # 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 diff --git a/charts/datahub/quickstart-values-with-neo4j.yaml b/charts/datahub/quickstart-values-with-neo4j.yaml index 2d96a889c..e37768374 100644 --- 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/values.yaml b/charts/datahub/values.yaml index d0394cb68..e9f285a6a 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -506,8 +506,8 @@ global: # registry: datahub 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/prerequisites/Chart.yaml b/charts/prerequisites/Chart.yaml index 86b95a471..c9378a561 100644 --- a/charts/prerequisites/Chart.yaml +++ b/charts/prerequisites/Chart.yaml @@ -4,22 +4,17 @@ 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.0.18 +version: 0.1.1 dependencies: - name: elasticsearch version: 7.17.3 repository: https://helm.elastic.co condition: elasticsearch.enabled - # This chart deploys an enterprise version of neo4j that requires commercial license + # This chart deploys an enterprise or community version of neo4j - name: neo4j - version: 4.2.2-1 - repository: https://neo4j-contrib.github.io/neo4j-helm/ + version: 5.11.0 + repository: https://helm.neo4j.com/neo4j condition: neo4j.enabled - # This chart deploys a community version of neo4j - - name: neo4j-community - version: 1.2.5 - repository: https://equinor.github.io/helm-charts/charts/ - condition: neo4j-community.enabled - name: mysql version: 9.1.8 repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami diff --git a/charts/prerequisites/values.yaml b/charts/prerequisites/values.yaml index 620e1e897..beeee6a4b 100644 --- a/charts/prerequisites/values.yaml +++ b/charts/prerequisites/values.yaml @@ -34,24 +34,40 @@ elasticsearch: # requests: # storage: 100M -# Official neo4j chart uses the Neo4j Enterprise Edition which requires a license +# 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 neo4j: - enabled: false # set this to true, if you have a license for the enterprise edition - acceptLicenseAgreement: "yes" - defaultDatabase: "graph.db" - neo4jPassword: "datahub" - # For better security, add password to neo4j-secrets k8s secret and uncomment below - # existingPasswordSecret: neo4j-secrets - core: - standalone: true + enabled: true + nameOverride: neo4j + neo4j: + name: neo4j + edition: "community" + acceptLicenseAgreement: "yes" + defaultDatabase: "graph.db" + password: "datahub" + # For better security, add password to neo4j-secrets k8s secret with neo4j-username neo4j-passwordn and NEO4J_AUTH and uncomment below + # NEO4J_AUTH: should be composed like so: {Username}/{Password} + # passwordFromSecret: neo4j-secrets + + # Set security context for pod + securityContext: + runAsNonRoot: true + runAsUser: 7474 + runAsGroup: 7474 + fsGroup: 7474 + fsGroupChangePolicy: "Always" + + # Disallow privilegeEscalation on container level + containerSecurityContext: + allowPrivilegeEscalation: false -# Deploys neo4j community version. Only supports single node -neo4j-community: - enabled: false # set this to true, if you want to run neo4j community edition - acceptLicenseAgreement: "yes" - defaultDatabase: "graph.db" - # For better security, add neo4j-secrets k8s secret with neo4j-password and uncomment below - existingPasswordSecret: neo4j-secrets + # Create a volume for neo4j, SSD storage is recommended + volumes: {} + # data: + # mode: "dynamic" + # dynamic: + # storageClassName: managed-csi-premium mysql: enabled: true