From 20ca1b711f68d915770ff639fbe32292896e9454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Nov=C3=A1k?= <tom.nov96@gmail.com>
Date: Tue, 14 Mar 2023 15:55:59 +0100
Subject: [PATCH] fix: remove duplicated EBEAN env vars on datahub-upgrade jobs
 (#269) (#270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Novák <tomas.novak@bcas.cz>
Co-authored-by: david-leifker <114954101+david-leifker@users.noreply.github.com>
---
 charts/datahub/Chart.yaml                     |  2 +-
 .../datahub-system-update-job.yml             | 69 -------------------
 2 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
index 9319f330d..fb57479d6 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.159
+version: 0.2.160
 # 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.0
diff --git a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
index ec2d253c6..40e3eb046 100644
--- a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
+++ b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
@@ -66,23 +66,11 @@ spec:
             - "-u"
             - "SystemUpdate"
           env:
-            {{- with .Values.global.kafka.topics }}
-            - name: DATAHUB_UPGRADE_HISTORY_TOPIC_NAME
-              value: {{ .datahub_upgrade_history_topic_name }}
-            {{- end }}
             - name: DATAHUB_REVISION
               value: {{ .Release.Revision | quote }}
             {{- include "datahub.upgrade.env" . | nindent 12}}
             - name: DATAHUB_ANALYTICS_ENABLED
               value: {{ .Values.global.datahub_analytics_enabled | quote }}
-            - name: ENTITY_REGISTRY_CONFIG_PATH
-              value: /datahub/datahub-gms/resources/entity-registry.yml
-            - name: KAFKA_BOOTSTRAP_SERVER
-              value: "{{ .Values.global.kafka.bootstrap.server }}"
-            {{- with .Values.global.kafka.schemaregistry.url }}
-            - name: KAFKA_SCHEMAREGISTRY_URL
-              value: "{{ . }}"
-            {{- end }}
             {{- with .Values.global.kafka.schemaregistry.type }}
             - name: SCHEMA_REGISTRY_TYPE
               value: "{{ . }}"
@@ -95,33 +83,6 @@ spec:
               value: "{{ . }}"
             {{- end }}
             {{- end }}
-            - 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
-              {{- if .password.value }}
-              value: {{ .password.value | quote }}
-              {{- else }}
-              valueFrom:
-                secretKeyRef:
-                  name: "{{ .password.secretRef }}"
-                  key: "{{ .password.secretKey }}"
-              {{- end }}
-            {{- end }}
-            {{- with .Values.global.elasticsearch.indexPrefix }}
-            - name: INDEX_PREFIX
-              value: {{ . }}
-            {{- end }}
             - name: ELASTICSEARCH_BUILD_INDICES_CLONE_INDICES
               value: {{ .Values.global.elasticsearch.index.upgrade.cloneIndices | quote }}
             {{- with .Values.global.elasticsearch.index.enableMappingsReindex }}
@@ -148,36 +109,6 @@ spec:
             - name: ELASTICSEARCH_BUILD_INDICES_ALLOW_DOC_COUNT_MISMATCH
               value: {{ . | quote }}
             {{- 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.springKafkaConfigurationOverrides }}
-            {{- range $configName, $configValue := .Values.global.springKafkaConfigurationOverrides }}
-            - name: SPRING_KAFKA_PROPERTIES_{{ $configName | replace "." "_" | upper }}
-              value: {{ $configValue | quote }}
-            {{- end }}
-            {{- end }}
-            {{- if .Values.global.credentialsAndCertsSecrets }}
-            {{- range $envVarName, $envVarValue := .Values.global.credentialsAndCertsSecrets.secureEnv }}
-            - name: SPRING_KAFKA_PROPERTIES_{{ $envVarName | replace "." "_" | upper }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $.Values.global.credentialsAndCertsSecrets.name }}
-                  key: {{ $envVarValue }}
-            {{- end }}
-            {{- end }}
           {{- with .Values.datahubSystemUpdate.extraEnvs }}
             {{- toYaml . | nindent 12 }}
           {{- end }}