From 3dd56cbf13cc7597ef528e0068993020e8139ce2 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 28 Jan 2025 16:27:15 +0100
Subject: [PATCH] fix: helm chart migration

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 .../helmcharts/openreplay/templates/job.yaml  | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/scripts/helmcharts/openreplay/templates/job.yaml b/scripts/helmcharts/openreplay/templates/job.yaml
index 3db1d7b33..e5fd10e39 100644
--- a/scripts/helmcharts/openreplay/templates/job.yaml
+++ b/scripts/helmcharts/openreplay/templates/job.yaml
@@ -431,6 +431,48 @@ spec:
         - name: shared
           mountPath: /opt/openreplay
       {{- end }}
+      - name: kafka
+        image: bitnami/kafka:2.6.0-debian-10-r30
+        env:
+          - name: OPENREPLAY_VERSION
+            valueFrom:
+              configMapKeyRef:
+                name: openreplay-version
+                key: version
+                optional: true
+          {{- range $key, $val := .Values.global.env }}
+          - 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
+            value: "{{ .Values.global.kafka.kafkaHost }}"
+          - name: KAFKA_PORT
+            value: "{{ .Values.global.kafka.kafkaPort }}"
+          - name: KAFKA_SSL
+            value: "{{ .Values.global.kafka.kafkaUseSsl }}"
+          - name: FORCE_MIGRATION
+            value: "{{ .Values.forceMigration }}"
+          - name: PREVIOUS_APP_VERSION
+            value: "{{ .Values.fromVersion }}"
+          - name: CHART_APP_VERSION
+            value: "{{ .Chart.AppVersion }}"
+        command: 
+        - /bin/bash
+        - /opt/migrations/dbops.sh
+        - "{{ .Release.IsUpgrade }}"
+        - kafka
+        volumeMounts:
+        - name: shared
+          mountPath: /opt/openreplay
+        - name: dbmigrationscript
+          mountPath: /opt/migrations/
+        {{- end}}
       - name: clickhouse
         image: clickhouse/clickhouse-server:22.12-alpine
         env:
@@ -474,48 +516,6 @@ spec:
           mountPath: /opt/openreplay
         - name: dbmigrationscript
           mountPath: /opt/migrations/
-      - name: kafka
-        image: bitnami/kafka:2.6.0-debian-10-r30
-        env:
-          - name: OPENREPLAY_VERSION
-            valueFrom:
-              configMapKeyRef:
-                name: openreplay-version
-                key: version
-                optional: true
-          {{- range $key, $val := .Values.global.env }}
-          - 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
-            value: "{{ .Values.global.kafka.kafkaHost }}"
-          - name: KAFKA_PORT
-            value: "{{ .Values.global.kafka.kafkaPort }}"
-          - name: KAFKA_SSL
-            value: "{{ .Values.global.kafka.kafkaUseSsl }}"
-          - name: FORCE_MIGRATION
-            value: "{{ .Values.forceMigration }}"
-          - name: PREVIOUS_APP_VERSION
-            value: "{{ .Values.fromVersion }}"
-          - name: CHART_APP_VERSION
-            value: "{{ .Chart.AppVersion }}"
-        command: 
-        - /bin/bash
-        - /opt/migrations/dbops.sh
-        - "{{ .Release.IsUpgrade }}"
-        - kafka
-        volumeMounts:
-        - name: shared
-          mountPath: /opt/openreplay
-        - name: dbmigrationscript
-          mountPath: /opt/migrations/
-        {{- end}}
       volumes:
       - name: dbmigrationscript
         configMap: