From 5ca1c28b3321bec36c2f9c5ab55e97ab18e1bec8 Mon Sep 17 00:00:00 2001 From: Mohammadreza Khani Date: Fri, 18 Jul 2025 18:12:21 +0330 Subject: [PATCH] fix(helm): wrong savepoint path config when storage-type is filesystem --- helm/chart/Chart.yaml | 2 +- helm/chart/templates/flink/config.yaml | 4 +++- .../templates/flink/job-manager-deploy.yaml | 4 +++- .../flink/task-manager-statefulset.yaml | 4 +++- helm/chart/templates/operator/statefulset.yaml | 10 +++++++--- helm/flink-kube-operator-1.2.3.tgz | Bin 0 -> 6916 bytes helm/index.yaml | 12 +++++++++++- 7 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 helm/flink-kube-operator-1.2.3.tgz diff --git a/helm/chart/Chart.yaml b/helm/chart/Chart.yaml index 3d9cf4f..2644d97 100644 --- a/helm/chart/Chart.yaml +++ b/helm/chart/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: flink-kube-operator description: Helm chart for flink kube operator type: application -version: 1.2.2 +version: 1.2.3 appVersion: "0.1.1" diff --git a/helm/chart/templates/flink/config.yaml b/helm/chart/templates/flink/config.yaml index df1e8d6..ca72088 100644 --- a/helm/chart/templates/flink/config.yaml +++ b/helm/chart/templates/flink/config.yaml @@ -28,14 +28,16 @@ state.backend.rocksdb.localdir: /opt/flink/rocksdb high-availability.storageDir: /opt/flink/ha {{- if eq .Values.flink.state.savepoint.storageType "filesystem" }} - state.savepoints.dir: file:///opt/flink/checkpoints/ + state.savepoints.dir: file:///opt/flink/savepoints/ {{- else if eq .Values.flink.state.savepoint.storageType "s3" }} state.savepoints.dir: s3://flink/savepoints/ {{- end }} state.backend.incremental: {{ .Values.flink.state.incremental }} rest.profiling.enabled: true + {{- if or (eq .Values.flink.state.checkpoint.storageType "s3") (eq .Values.flink.state.savepoint.storageType "s3") }} s3.endpoint: http://{{ .Release.Name }}-minio:9000 s3.path.style.access: true + {{- end }} {{- toYaml .Values.flink.properties | default "" | nindent 4 }} {{- end }} diff --git a/helm/chart/templates/flink/job-manager-deploy.yaml b/helm/chart/templates/flink/job-manager-deploy.yaml index f8d1bf0..5fcb51d 100644 --- a/helm/chart/templates/flink/job-manager-deploy.yaml +++ b/helm/chart/templates/flink/job-manager-deploy.yaml @@ -49,6 +49,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP + {{- if or (eq .Values.flink.state.checkpoint.storageType "s3") (eq .Values.flink.state.savepoint.storageType "s3") }} - name: S3_ENDPOINT value: "http://minio-service:9000" - name: AWS_ACCESS_KEY_ID @@ -61,6 +62,7 @@ spec: secretKeyRef: name: {{ .Release.Name }}-flink-secrets key: minio_secret_key + {{- end }} volumeMounts: - name: flink-ha mountPath: {{ .Values.flink.state.ha.dir }} @@ -70,7 +72,7 @@ spec: {{- end }} {{- if eq .Values.flink.state.savepoint.storageType "filesystem" }} - name: flink-savepoint - mountPath: /opt/flink/savepoint + mountPath: /opt/flink/savepoints {{- end }} volumes: - name: flink-ha diff --git a/helm/chart/templates/flink/task-manager-statefulset.yaml b/helm/chart/templates/flink/task-manager-statefulset.yaml index e404c27..cad2862 100644 --- a/helm/chart/templates/flink/task-manager-statefulset.yaml +++ b/helm/chart/templates/flink/task-manager-statefulset.yaml @@ -31,6 +31,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP + {{- if or (eq .Values.flink.state.checkpoint.storageType "s3") (eq .Values.flink.state.savepoint.storageType "s3") }} - name: S3_ENDPOINT value: "http://minio-service:9000" - name: AWS_ACCESS_KEY_ID @@ -43,6 +44,7 @@ spec: secretKeyRef: name: {{ .Release.Name }}-flink-secrets key: minio_secret_key + {{- end }} volumeMounts: - name: rocksdb-storage mountPath: /opt/flink/rocksdb @@ -52,7 +54,7 @@ spec: {{- end }} {{- if eq .Values.flink.state.savepoint.storageType "filesystem" }} - name: flink-savepoint - mountPath: /opt/flink/savepoint + mountPath: /opt/flink/savepoints {{- end }} resources: {{- toYaml .Values.flink.taskManager.resources | nindent 10 }} diff --git a/helm/chart/templates/operator/statefulset.yaml b/helm/chart/templates/operator/statefulset.yaml index c50f097..9ea5a66 100644 --- a/helm/chart/templates/operator/statefulset.yaml +++ b/helm/chart/templates/operator/statefulset.yaml @@ -46,10 +46,11 @@ spec: env: - name: FLINK_API_URL value: {{ .Release.Name }}-flink-job-manager:8081 - - name: SAVEPOINT_PATH - value: s3://flink/savepoints/ - name: NAMESPACE value: "{{ .Release.Namespace }}" + {{- if eq .Values.flink.state.savepoint.storageType "s3" }} + - name: SAVEPOINT_PATH + value: s3://flink/savepoints/ - name: S3_ENDPOINT value: "http://{{ .Release.Name }}-minio:9000" - name: AWS_ACCESS_KEY_ID @@ -62,5 +63,8 @@ spec: secretKeyRef: name: {{ .Release.Name }}-minio key: root-password - + {{- else }} + - name: SAVEPOINT_PATH + value: /opt/flink/savepoints/ + {{- end }} diff --git a/helm/flink-kube-operator-1.2.3.tgz b/helm/flink-kube-operator-1.2.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..eb93caaa8b6882fa8db8bd40cc70602fc0009900 GIT binary patch literal 6916 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 KBXUImr~m+{m9*mk literal 0 HcmV?d00001 diff --git a/helm/index.yaml b/helm/index.yaml index ea53c6c..d7ffd1c 100644 --- a/helm/index.yaml +++ b/helm/index.yaml @@ -1,6 +1,16 @@ apiVersion: v1 entries: flink-kube-operator: + - apiVersion: v2 + appVersion: 0.1.1 + created: "2025-07-18T18:09:46.27166563+03:30" + description: Helm chart for flink kube operator + digest: 597f2c07884bb5411dcc6e1a9cdf7672977858efe30273a46fb6525eb6013091 + name: flink-kube-operator + type: application + urls: + - flink-kube-operator-1.2.3.tgz + version: 1.2.3 - apiVersion: v2 appVersion: 0.1.1 created: "2025-05-17T14:34:55.317942453+03:30" @@ -227,4 +237,4 @@ entries: urls: - flink-kube-operator-0.1.0.tgz version: 0.1.0 -generated: "2025-05-17T14:34:55.317942453+03:30" +generated: "2025-07-18T18:09:46.244672127+03:30"