From 16af9dbe855c769b2cebbd63ddab933134b8a173 Mon Sep 17 00:00:00 2001
From: Scott Davidson <sdavidson327@gmail.com>
Date: Tue, 22 Jul 2025 15:21:12 +0100
Subject: [PATCH 1/3] Switch to OpenSearch as default vector DB

---
 helm-azimuth/values.yaml | 2 +-
 helm/values.yaml         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/helm-azimuth/values.yaml b/helm-azimuth/values.yaml
index 8f94163164a..1a0033e784b 100644
--- a/helm-azimuth/values.yaml
+++ b/helm-azimuth/values.yaml
@@ -11,4 +11,4 @@ zenithClient:
 ragflow:
   env:
     RAGFLOW_IMAGE: infiniflow/ragflow:v0.19.1
-    DOC_ENGINE: infinity
+    DOC_ENGINE: opensearch
diff --git a/helm/values.yaml b/helm/values.yaml
index 81d062d4623..b0d311c6ebb 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -192,8 +192,6 @@ redis:
     resources:
   service:
     type: ClusterIP
-  persistence:
-    enabled: false
 
 
 # This block is for setting up web service ingress. For more information, see:

From 9a04408f00d52acae79dce8b4f37539076fdfaa3 Mon Sep 17 00:00:00 2001
From: Scott Davidson <sdavidson327@gmail.com>
Date: Wed, 23 Jul 2025 11:36:57 +0100
Subject: [PATCH 2/3] Fix OpenSearch liveness probe

Previous probe received an HTTP 401 from the OpenSearch API which
was treated as a failure.
---
 helm/templates/opensearch.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/helm/templates/opensearch.yaml b/helm/templates/opensearch.yaml
index 889a634b7ed..cb721e097d0 100644
--- a/helm/templates/opensearch.yaml
+++ b/helm/templates/opensearch.yaml
@@ -85,13 +85,14 @@ spec:
           runAsUser: 1000
           allowPrivilegeEscalation: false
         livenessProbe:
-          httpGet:
-            path: /
-            port: 9201
+          exec:
+            command:
+              - sh
+              - -c
+              - curl -u admin:$OPENSEARCH_PASSWORD localhost:9201
           initialDelaySeconds: 30
           periodSeconds: 10
-          timeoutSeconds: 10
-          failureThreshold: 120
+          failureThreshold: 6
       volumes:
         - name: opensearch-data
           persistentVolumeClaim:

From b08b444804619e70c6a11b5d712c7aa002d52e3a Mon Sep 17 00:00:00 2001
From: Scott Davidson <sdavidson327@gmail.com>
Date: Wed, 23 Jul 2025 14:45:59 +0100
Subject: [PATCH 3/3] Ensure Redis volumeClaimTemplate labels are deterministic

Previous version created labels which were dependent on the
specific Helm chart version such as:
```
volumeClaimTemplates:
- metadata:
    name: redis-data
    labels:
      helm.sh/chart: ragflow-0.2.3-dev.0.opensearch-test.4
      app.kubernetes.io/name: ragflow
      app.kubernetes.io/instance: test-1
      app.kubernetes.io/version: "9a04408"
      app.kubernetes.io/managed-by: Helm
      app.kubernetes.io/component: redis
```
which causes `helm upgrade` commands to fail with
```
Upgrade "test-1" failed: cannot patch "test-1-ragflow-redis" with
kind StatefulSet: StatefulSet.apps "test-1-ragflow-redis" is
invalid: spec: Forbidden: updates to statefulset spec for fields
other than 'replicas', 'ordinals', 'template', 'updateStrategy',
'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are
forbidden
```
because the labels changed on upgrade.

This fix uses a reduced set of labels to prevent upgrade failures.
---
 helm/templates/redis.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/templates/redis.yaml b/helm/templates/redis.yaml
index 53e7a678121..8c94982e35e 100644
--- a/helm/templates/redis.yaml
+++ b/helm/templates/redis.yaml
@@ -68,7 +68,7 @@ spec:
     - metadata:
         name: redis-data
         labels:
-          {{- include "ragflow.labels" . | nindent 10 }}
+          {{- include "ragflow.selectorLabels" . | nindent 10 }}
           app.kubernetes.io/component: redis
       spec:
         accessModes:
@@ -109,4 +109,4 @@ spec:
   selector:
     matchLabels:
       {{- include "ragflow.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: redis
\ No newline at end of file
+      app.kubernetes.io/component: redis