From 27639e613640434a061fdde0b41e61e897d0ac86 Mon Sep 17 00:00:00 2001 From: david-leifker <114954101+david-leifker@users.noreply.github.com> Date: Wed, 28 Dec 2022 09:16:57 -0600 Subject: [PATCH] feat(mce-consumer): removing dependency on gms for mce consumer (#216) * feat(mce-consumer): removing dependency on gms for mce consumer envs --- charts/datahub/Chart.yaml | 4 +- .../subcharts/datahub-mce-consumer/Chart.yaml | 2 +- .../templates/deployment.yaml | 58 +++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml index 42012539d..8dd1baf1d 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.125 +version: 0.2.126 # 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.5 @@ -22,7 +22,7 @@ dependencies: repository: file://./subcharts/datahub-mae-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-mce-consumer - version: 0.2.121 + version: 0.2.122 repository: file://./subcharts/datahub-mce-consumer condition: global.datahub_standalone_consumers_enabled - name: datahub-ingestion-cron diff --git a/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml b/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml index 2202e3fee..ebb77b2ee 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/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.121 +version: 0.2.122 # 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.3 diff --git a/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml b/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml index f1bdf42f2..6726c69f5 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/templates/deployment.yaml @@ -101,10 +101,68 @@ spec: value: "{{ . }}" {{- end }} {{- end }} + # TODO: Remove DATAHUB_GMS_HOST/PORT after v0.9.6 - name: DATAHUB_GMS_HOST value: {{ printf "%s-%s" .Release.Name "datahub-gms" }} - name: DATAHUB_GMS_PORT value: "{{ .Values.global.datahub.gms.port }}" + - name: ENTITY_REGISTRY_CONFIG_PATH + value: /datahub/datahub-mce-consumer/resources/entity-registry.yml + - name: EBEAN_DATASOURCE_USERNAME + value: "{{ .Values.global.sql.datasource.username }}" + - name: EBEAN_DATASOURCE_PASSWORD + {{- if .Values.global.sql.datasource.password.value }} + value: {{ .Values.global.sql.datasource.password.value | quote }} + {{- else }} + valueFrom: + secretKeyRef: + name: "{{ .Values.global.sql.datasource.password.secretRef }}" + key: "{{ .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 }}" + - name: ELASTICSEARCH_HOST + value: "{{ .Values.global.elasticsearch.host }}" + - name: ELASTICSEARCH_PORT + value: "{{ .Values.global.elasticsearch.port }}" + - name: SKIP_ELASTICSEARCH_CHECK + value: "{{ .Values.global.elasticsearch.skipcheck }}" + {{- with .Values.global.elasticsearch.useSSL }} + - name: ELASTICSEARCH_USE_SSL + value: {{ . | quote }} + {{- end }} + {{- with .Values.global.elasticsearch.auth }} + - name: ELASTICSEARCH_USERNAME + value: {{ .username }} + - name: ELASTICSEARCH_PASSWORD + valueFrom: + secretKeyRef: + name: "{{ .password.secretRef }}" + key: "{{ .password.secretKey }}" + {{- end }} + {{- with .Values.global.elasticsearch.indexPrefix }} + - name: INDEX_PREFIX + value: {{ . }} + {{- end }} + - name: GRAPH_SERVICE_IMPL + value: {{ .Values.global.graph_service_impl }} + {{- if eq .Values.global.graph_service_impl "neo4j" }} + - name: NEO4J_HOST + value: "{{ .Values.global.neo4j.host }}" + - name: NEO4J_URI + value: "{{ .Values.global.neo4j.uri }}" + - name: NEO4J_USERNAME + value: "{{ .Values.global.neo4j.username }}" + - name: NEO4J_PASSWORD + valueFrom: + secretKeyRef: + name: "{{ .Values.global.neo4j.password.secretRef }}" + key: "{{ .Values.global.neo4j.password.secretKey }}" + {{- end }} {{- if .Values.global.datahub.metadata_service_authentication.enabled }} - name: METADATA_SERVICE_AUTH_ENABLED value: "true"