Skip to content

Commit

Permalink
Merge branch 'master' into feature/neo4j-update
Browse files Browse the repository at this point in the history
  • Loading branch information
david-leifker authored Oct 4, 2023
2 parents d0936e0 + e725085 commit c09d47d
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 60 deletions.
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.186
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.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.140
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.135
version: 0.2.136
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
18 changes: 9 additions & 9 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 Down Expand Up @@ -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.140
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
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
4 changes: 2 additions & 2 deletions charts/datahub/subcharts/datahub-gms/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.150
version: 0.2.151
# 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
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/datahub-gms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ Current chart version is `0.2.0`
| global.datahub.managed_ingestion.enabled | bool | `true` | Whether or not UI-based ingestion experience is enabled. |
| global.datahub.encryptionKey.secretRef | string | `nil` | The reference to a secret containing an alpha-numeric encryption key, which is used to encrypt Secrets on DataHub. Required if managed_ingestion_enabled is 'true'. |
| global.datahub.encryptionKey.secretKey | string | `nil` | The key of a secret containing an alpha-numeric encryption key, which is used to encrypt Secrets on DataHub. Required if managed_ingestion_enabled is 'true'. |
| global.datahub.managed_ingestion.defaultCliVersion | string | `0.10.0` | This is the version of the DataHub CLI to use for UI ingestion, by default. You do not need to explicitly provide this. By default the underlying datahub-gms container will provide a latest version compatible with the server. |
| global.datahub.managed_ingestion.defaultCliVersion | string | `0.11.0` | This is the version of the DataHub CLI to use for UI ingestion, by default. You do not need to explicitly provide this. By default the underlying datahub-gms container will provide a latest version compatible with the server. |
| global.datahub.enable_retention | bool | `false` | Whether or not to enable retention on local DB |
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
- name: SEARCH_SERVICE_CACHE_IMPLEMENTATION
value: "hazelcast"
- name: SEARCH_SERVICE_HAZELCAST_SERVICE_NAME
value: {{ printf "%s-%s" .Release.Name "hazelcast-service" }}
value: {{ printf "%s-%s-%s" .Release.Name (regexReplaceAll "\\W+" .Values.global.datahub.version "-") "hazelcast-svc" | trunc 63 | trimSuffix "-" }}
{{- end}}
{{- if .Values.global.datahub.systemUpdate.enabled }}
- name: DATAHUB_UPGRADE_HISTORY_KAFKA_CONSUMER_GROUP_ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ printf "%s-%s" .Release.Name "hazelcast-service" }}
name: {{ printf "%s-%s-%s" .Release.Name (regexReplaceAll "\\W+" .Values.global.datahub.version "-") "hazelcast-svc" | trunc 63 | trimSuffix "-" }}
spec:
clusterIP: None
ports:
Expand Down
4 changes: 2 additions & 2 deletions charts/datahub/subcharts/datahub-ingestion-cron/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.135
version: 0.2.136
# 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
6 changes: 0 additions & 6 deletions charts/datahub/subcharts/datahub-ingestion-cron/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ crons: {}
##
#tolerations: []

## Add extra sidecar containers to deployment pod
#extraSidecars:
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

global:
datahub:
version: head
4 changes: 2 additions & 2 deletions charts/datahub/subcharts/datahub-mae-consumer/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.146
version: 0.2.147
# 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
4 changes: 2 additions & 2 deletions charts/datahub/subcharts/datahub-mce-consumer/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.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.10.0
appVersion: v0.11.0
Loading

0 comments on commit c09d47d

Please sign in to comment.