diff --git a/scripts/helmcharts/openreplay-cli b/scripts/helmcharts/openreplay-cli index a470051b8..4a1b473d7 100755 --- a/scripts/helmcharts/openreplay-cli +++ b/scripts/helmcharts/openreplay-cli @@ -14,7 +14,7 @@ tmp_dir=$(mktemp -d) [[ -d $OR_DIR ]] || { sudo mkdir $OR_DIR } -export PATH=$PATH:/var/lib/openreplay +export PATH=/var/lib/openreplay:$PATH tools=( zyedidia/eget diff --git a/scripts/helmcharts/openreplay/templates/job.yaml b/scripts/helmcharts/openreplay/templates/job.yaml index 3e0494d7f..bd9fe474a 100644 --- a/scripts/helmcharts/openreplay/templates/job.yaml +++ b/scripts/helmcharts/openreplay/templates/job.yaml @@ -39,6 +39,10 @@ spec: - name: {{ $key }} value: '{{ $val }}' {{- end }} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} - name: ENTERPRISE_EDITION_LICENSE value: "{{ .Values.global.enterpriseEditionLicense }}" command: @@ -111,6 +115,10 @@ spec: {{- else }} value: '{{ .Values.global.postgresql.postgresqlPassword }}' {{- end}} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} {{- range $key, $val := .Values.global.env }} - name: {{ $key }} value: '{{ $val }}' @@ -134,6 +142,10 @@ spec: - name: {{ $key }} value: '{{ $val }}' {{- end }} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} - name: FORCE_MIGRATION value: "{{ .Values.forceMigration }}" - name: UPGRADE_FRONTENT @@ -168,6 +180,10 @@ spec: - name: {{ $key }} value: '{{ $val }}' {{- end }} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} - name: FORCE_MIGRATION value: "{{ .Values.forceMigration }}" - name: PGHOST @@ -197,6 +213,10 @@ spec: - name: {{ $key }} value: '{{ $val }}' {{- end }} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} - name: AWS_ACCESS_KEY_ID value: "{{ .Values.global.s3.accessKey }}" - name: AWS_SECRET_ACCESS_KEY @@ -245,6 +265,10 @@ spec: - name: {{ $key }} value: '{{ $val }}' {{- end }} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} - name: FORCE_MIGRATION value: "{{ .Values.forceMigration }}" - name: PREVIOUS_APP_VERSION @@ -276,6 +300,10 @@ spec: - name: {{ $key }} value: '{{ $val }}' {{- end }} + {{- range $key, $val := .Values.migration.env }} + - name: {{ $key }} + value: '{{ $val }}' + {{- end }} - name: RETENTION_TIME value: "{{ .Values.global.kafka.retentionTime }}" - name: KAFKA_HOST