diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 3cc75f53f..cc62d2d58 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.137 +version: 0.2.139 # 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.9.6.1 @@ -14,7 +14,7 @@ dependencies: repository: file://./subcharts/datahub-gms condition: datahub-gms.enabled - name: datahub-frontend - version: 0.2.131 + version: 0.2.132 repository: file://./subcharts/datahub-frontend condition: datahub-frontend.enabled - name: datahub-mae-consumer diff --git a/charts/datahub/README.md b/charts/datahub/README.md index 50cb548bc..a749aec77 100644 --- a/charts/datahub/README.md +++ b/charts/datahub/README.md @@ -22,7 +22,7 @@ helm install datahub datahub/datahub --values <> |-----|------|---------|-------------| | 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 | `".1"` | Image tag for datahub-frontend | +| datahub-frontend.image.tag | string | `"v0.9.6.1"` | 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 | diff --git a/charts/datahub/subcharts/datahub-frontend/Chart.yaml b/charts/datahub/subcharts/datahub-frontend/Chart.yaml index ef8cb2675..e0a9aa426 100644 --- 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.131 +version: 0.2.132 # 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.9.6.1 diff --git a/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml b/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml index c1d39dfc3..e02394fe8 100644 --- a/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-frontend/templates/deployment.yaml @@ -179,7 +179,7 @@ spec: - name: AUTH_OIDC_DISCOVERY_URI value: https://accounts.google.com/.well-known/openid-configuration - name: AUTH_OIDC_SCOPE - value: "openid profile email" + value: {{ .scope | default "openid profile email" }} - name: AUTH_OIDC_USER_NAME_CLAIM value: email - name: AUTH_OIDC_USER_NAME_CLAIM_REGEX @@ -188,12 +188,12 @@ spec: - name: AUTH_OIDC_DISCOVERY_URI value: https://{{ .oktaDomain }}/.well-known/openid-configuration - name: AUTH_OIDC_SCOPE - value: "openid profile email groups" + value: {{ .scope | default "openid profile email groups" }} {{- else if eq .provider "azure" }} - name: AUTH_OIDC_DISCOVERY_URI value: https://login.microsoftonline.com/{{ .azureTenantId }}/v2.0/.well-known/openid-configuration - name: AUTH_OIDC_SCOPE - value: "openid profile email" + value: {{ .scope | default "openid profile email" }} {{- else }} {{- fail (printf "unsupported .oidcAuthentication.provider value '%s'" .provider) }} {{- end }} diff --git a/charts/datahub/subcharts/datahub-frontend/values.yaml b/charts/datahub/subcharts/datahub-frontend/values.yaml index a85122c26..a45b354cd 100644 --- a/charts/datahub/subcharts/datahub-frontend/values.yaml +++ b/charts/datahub/subcharts/datahub-frontend/values.yaml @@ -72,6 +72,7 @@ ingress: oidcAuthentication: enabled: false # provider: google/okta/azure <- choose only one + # clientId: your-client-id # clientSecret: your-client-secret # only needed if you would like to store the client secret in secret @@ -81,8 +82,10 @@ oidcAuthentication: # only needed if provider is `okta` # oktaDomain: your-okta-domain.com - # only neede if provider is `azure` + # only needed if provider is `azure` # azureTenantId: your-azure-tenant-id + # if needed, it should set meaningful defaults from provider + # scope: "openid profile email" # Extra environment variables # This will be appended to the current 'env:' key. You can use any of the kubernetes env diff --git a/charts/datahub/templates/datahub-upgrade/datahub-restore-indices-job-template.yml b/charts/datahub/templates/datahub-upgrade/datahub-restore-indices-job-template.yml index bb9fae651..a6c9e5c16 100644 --- a/charts/datahub/templates/datahub-upgrade/datahub-restore-indices-job-template.yml +++ b/charts/datahub/templates/datahub-upgrade/datahub-restore-indices-job-template.yml @@ -72,6 +72,24 @@ spec: - "-a" - "batchDelayMs={{ .Values.datahubUpgrade.batchDelayMs }}" env: + - name: EBEAN_DATASOURCE_USERNAME + value: {{ (.Values.sql).datasource.username | default .Values.global.sql.datasource.username | quote }} + - name: EBEAN_DATASOURCE_PASSWORD + {{- $passwordValue := (.Values.sql).datasource.password.value | default .Values.global.sql.datasource.password.value }} + {{- if $passwordValue }} + value: {{ $passwordValue | quote }} + {{- else }} + valueFrom: + secretKeyRef: + name: "{{ (.Values.sql).datasource.password.secretRef | default .Values.global.sql.datasource.password.secretRef }}" + key: "{{ (.Values.sql).datasource.password.secretKey | default .Values.global.sql.datasource.password.secretKey }}" + {{- end }} + - name: EBEAN_DATASOURCE_HOST + value: "{{ .Values.global.sql.datasource.host }}" + - name: EBEAN_DATASOURCE_URL + value: "{{ .Values.global.sql.datasource.url }}" + - name: EBEAN_DATASOURCE_DRIVER + value: "{{ .Values.global.sql.datasource.driver }}" {{- include "datahub.upgrade.env" . | nindent 16}} {{- with .Values.datahubUpgrade.extraEnvs }} {{- toYaml . | nindent 16 }} diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml index 0602ec441..0876ae647 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -26,10 +26,10 @@ datahub-frontend: # tag: "v0.9.6.1" # # defaults to .global.datahub.version resources: limits: - memory: 512Mi + memory: 1400Mi requests: cpu: 100m - memory: 256Mi + memory: 512Mi # Set up ingress to expose react front-end ingress: enabled: false