Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanHolstien authored Oct 5, 2023
2 parents e828569 + ae3db71 commit b4016a1
Show file tree
Hide file tree
Showing 28 changed files with 258 additions and 195 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
```

Expand Down Expand Up @@ -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
```

Expand Down
14 changes: 7 additions & 7 deletions charts/datahub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ 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.181
version: 0.3.1
# 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.10.5
appVersion: 0.11.0
dependencies:
- name: datahub-gms
version: 0.2.150
version: 0.2.151
repository: file://./subcharts/datahub-gms
condition: datahub-gms.enabled
- name: datahub-frontend
version: 0.2.139
version: 0.2.142
repository: file://./subcharts/datahub-frontend
condition: datahub-frontend.enabled
- name: datahub-mae-consumer
version: 0.2.146
version: 0.2.147
repository: file://./subcharts/datahub-mae-consumer
condition: global.datahub_standalone_consumers_enabled
- name: datahub-mce-consumer
version: 0.2.149
version: 0.2.150
repository: file://./subcharts/datahub-mce-consumer
condition: global.datahub_standalone_consumers_enabled
- name: datahub-ingestion-cron
version: 0.2.134
version: 0.2.137
repository: file://./subcharts/datahub-ingestion-cron
condition: datahub-ingestion-cron.enabled
- name: acryl-datahub-actions
Expand Down
18 changes: 9 additions & 9 deletions charts/datahub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
|-----|------|---------|-------------|
| datahub-frontend.enabled | bool | `true` | Enable Datahub Front-end |
| datahub-frontend.image.repository | string | `"linkedin/datahub-frontend-react"` | Image repository for datahub-frontend |
| datahub-frontend.image.tag | string | `"v0.10.4"` | Image tag for datahub-frontend |
| datahub-frontend.image.tag | string | `"v0.11.0"` | Image tag for datahub-frontend |
| datahub-frontend.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-frontend |
| datahub-gms.enabled | bool | `true` | Enable GMS |
| datahub-gms.image.repository | string | `"linkedin/datahub-gms"` | Image repository for datahub-gms |
| datahub-gms.image.tag | string | `"v0.10.4"` | Image tag for datahub-gms |
| datahub-gms.image.tag | string | `"v0.11.0"` | Image tag for datahub-gms |
| datahub-gms.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-gms |
| datahub-mae-consumer.image.repository | string | `"linkedin/datahub-mae-consumer"` | Image repository for datahub-mae-consumer |
| datahub-mae-consumer.image.tag | string | `"v0.10.4"` | Image tag for datahub-mae-consumer |
| datahub-mae-consumer.image.tag | string | `"v0.11.0"` | Image tag for datahub-mae-consumer |
| datahub-mae-consumer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-mae-consumer |
| datahub-mce-consumer.image.repository | string | `"linkedin/datahub-mce-consumer"` | Image repository for datahub-mce-consumer |
| datahub-mce-consumer.image.tag | string | `"v0.10.4"` | Image tag for datahub-mce-consumer |
| datahub-mce-consumer.image.tag | string | `"v0.11.0"` | Image tag for datahub-mce-consumer |
| datahub-mce-consumer.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for datahub-mce-consumer |
| datahub-ingestion-cron.enabled | bool | `false` | Enable cronjob for periodic ingestion |
| datahubUpgrade.podSecurityContext | object | `{}` | Pod security context for datahubUpgrade jobs |
Expand All @@ -44,7 +44,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| datahubUpgrade.restoreIndices.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| elasticsearchSetupJob.enabled | bool | `true` | Enable setup job for elasicsearch |
| elasticsearchSetupJob.image.repository | string | `"linkedin/datahub-elasticsearch-setup"` | Image repository for elasticsearchSetupJob |
| elasticsearchSetupJob.image.tag | string | `"v0.10.4"` | Image repository for elasticsearchSetupJob |
| elasticsearchSetupJob.image.tag | string | `"v0.11.0"` | Image repository for elasticsearchSetupJob |
| elasticsearchSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for elasticsearchSetupJob |
| elasticsearchSetupJob.resources | object | '{}' | Kube Resource definitions for elasticsearchSetupJob |
| elasticsearchSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for elasticsearchSetupJob |
Expand All @@ -53,7 +53,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| elasticsearchSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| kafkaSetupJob.enabled | bool | `true` | Enable setup job for kafka |
| kafkaSetupJob.image.repository | string | `"linkedin/datahub-kafka-setup"` | Image repository for kafkaSetupJob |
| kafkaSetupJob.image.tag | string | `"v0.10.4"` | Image repository for kafkaSetupJob |
| kafkaSetupJob.image.tag | string | `"v0.11.0"` | Image repository for kafkaSetupJob |
| kafkaSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for kafkaSetupJob|
| kafkaSetupJob.resources | object | '{}' | Kube Resource definitions for kafkaSetupJob |
| kafkaSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for kafkaSetupJob |
Expand All @@ -62,7 +62,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| kafkaSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| mysqlSetupJob.enabled | bool | `false` | Enable setup job for mysql |
| mysqlSetupJob.image.repository | string | `"acryldata/datahub-mysql-setup"` | Image repository for mysqlSetupJob |
| mysqlSetupJob.image.tag | string | `"v0.10.4"` | Image repository for mysqlSetupJob |
| mysqlSetupJob.image.tag | string | `"v0.11.0"` | Image repository for mysqlSetupJob |
| mysqlSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for mysqlSetupJob|
| mysqlSetupJob.resources | object | '{}' | Kube Resource definitions for mysqlSetupJob |
| mysqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob |
Expand All @@ -71,7 +71,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| mysqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| postgresqlSetupJob.enabled | bool | `false` | Enable setup job for postgresql |
| postgresqlSetupJob.image.repository | string | `"acryldata/datahub-postgres-setup"` | Image repository for postgresqlSetupJob |
| postgresqlSetupJob.image.tag | string | `"v0.10.4"` | Image repository for postgresqlSetupJob |
| postgresqlSetupJob.image.tag | string | `"v0.11.0"` | Image repository for postgresqlSetupJob |
| postgresqlSetupJob.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for postgresqlSetupJob|
| postgresqlSetupJob.resources | object | '{}' | Kube Resource definitions for postgresqlSetupJob |
| postgresqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob |
Expand Down Expand Up @@ -164,7 +164,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| global.datahub.managed_ingestion.enabled | bool | `true` | Whether or not UI-based ingestion experience is enabled. |
| global.datahub.encryptionKey.secretRef | string | `datahub-encryption-secrets` | The reference to a secret containing an alpha-numeric encryption key, which is used to encrypt Secrets on DataHub. If a secret reference is not provided, a random one will be generated for you in a Kubernetes secret named `datahub-encryption-secrets`. |
| global.datahub.encryptionKey.secretKey | string | `encryption_key_secret` | The key of a secret containing an alpha-numeric encryption key, which is used to encrypt Secrets on DataHub. If a secret reference is not provided, a random one will be generated for you in a Kubernetes secret value named `encryption_key_secret` within a secret named `datahub-encryption-secrets`. |
| global.datahub.managed_ingestion.defaultCliVersion | string | `` |0.10.0 This is the version of the DataHub CLI to use for UI ingestion, by default. |
| global.datahub.managed_ingestion.defaultCliVersion | string | `` |0.11.0 This is the version of the DataHub CLI to use for UI ingestion, by default. |
| global.datahub.encryptionKey.provisionSecret.enabled | bool | `true` | Whether an encryption key secret should be provisioned on the first deployment for you. Set this to false if you are overriding global.datahub.encryptionKey.secretRef. |
| global.datahub.encryptionKey.provisionSecret.autoGenerate | bool | `true` | Whether an encryption key secret should be provisioned for you **with a random seed** on the first deployment for you. Set this to false and use `global.datahub.encryptionKey.provisionSecret.secretValues.encryptionKey` if you would like to specify the secret values directly. |
| global.datahub.encryptionKey.provisionSecret.secretValues.encryptionKey | string | `` | The encryption key value to be used if specified directly. |
Expand Down
22 changes: 11 additions & 11 deletions charts/datahub/quickstart-values-with-neo4j.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ datahub-gms:
enabled: true
image:
repository: linkedin/datahub-gms
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version


datahub-frontend:
enabled: true
image:
repository: linkedin/datahub-frontend-react
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version

# Set up ingress to expose react front-end
ingress:
Expand Down Expand Up @@ -40,35 +40,35 @@ elasticsearchSetupJob:
enabled: true
image:
repository: linkedin/datahub-elasticsearch-setup
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version


kafkaSetupJob:
enabled: true
image:
repository: linkedin/datahub-kafka-setup
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version


mysqlSetupJob:
enabled: true
image:
repository: acryldata/datahub-mysql-setup
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version


datahubUpgrade:
enabled: true
image:
repository: acryldata/datahub-upgrade
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version


datahub-ingestion-cron:
enabled: false
image:
repository: acryldata/datahub-ingestion
# tag: "v0.10.0 # defaults to .global.datahub.version
# tag: "v0.11.0 # defaults to .global.datahub.version


global:
Expand All @@ -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
Expand All @@ -107,7 +107,7 @@ global:
secretKey: mysql-root-password

datahub:
version: v0.10.5
version: v0.11.0
gms:
port: "8080"
mae_consumer:
Expand All @@ -116,4 +116,4 @@ global:

managed_ingestion:
enabled: true
defaultCliVersion: "0.10.5.4"
defaultCliVersion: "0.11.0"
4 changes: 2 additions & 2 deletions charts/datahub/subcharts/datahub-frontend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.139
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.10.0
appVersion: v0.11.0
Loading

0 comments on commit b4016a1

Please sign in to comment.