From 6bd96320d52141cdf2feb4f60c22e30a040d22c3 Mon Sep 17 00:00:00 2001
From: George Barbarosie <george.barbarosie@tripsolutions.co.uk>
Date: Wed, 29 Jan 2025 10:14:40 +0000
Subject: [PATCH] etrip chart 0.7.5 - use kvrocks instead of redis; save all
 php sessions in redis (webservices too)

---
 charts/etrip/Chart.yaml              | 4 ++--
 charts/etrip/templates/configmap.yml | 2 +-
 charts/etrip/templates/redis.yml     | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/charts/etrip/Chart.yaml b/charts/etrip/Chart.yaml
index 119f30b..833423c 100644
--- a/charts/etrip/Chart.yaml
+++ b/charts/etrip/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 name: etrip
 description: eTrip PHP Helm chart
 type: application
-version: 0.7.4
-appVersion: 6.5.35
+version: 0.7.5
+appVersion: 6.5.41
diff --git a/charts/etrip/templates/configmap.yml b/charts/etrip/templates/configmap.yml
index afa97d5..7c2ca58 100644
--- a/charts/etrip/templates/configmap.yml
+++ b/charts/etrip/templates/configmap.yml
@@ -286,7 +286,7 @@ data:
     ping.path = /ping
     request_terminate_timeout = 300
     clear_env = no
-    {{- if and $.Values.etrip.use_redis (not (eq $key "ws") ) (not (eq $key "ws_prio") ) }}
+    {{- if $.Values.etrip.use_redis }}
     php_value[session.save_handler] = redis
     php_value[session.save_path] = "tcp://{{ $.Release.Name }}-redis:6379?auth=${REDIS_SECRET}"
     {{- end }}
diff --git a/charts/etrip/templates/redis.yml b/charts/etrip/templates/redis.yml
index 912ae2f..4bca82e 100644
--- a/charts/etrip/templates/redis.yml
+++ b/charts/etrip/templates/redis.yml
@@ -29,10 +29,8 @@ spec:
         command:
         - /bin/sh
         - -c
-        - |
-          echo "requirepass ${REDIS_PASSWORD}" > /etc/redis.conf
-          redis-server /etc/redis.conf
-        image: redis:alpine
+        - kvrocks --bind 0.0.0.0 --requirepass $REDIS_PASSWORD
+        image: apache/kvrocks:latest
         env:
         - name: REDIS_PASSWORD
           valueFrom:
@@ -40,7 +38,7 @@ spec:
               name: {{ .Release.Name }}-secrets
               key: session
         ports:
-        - containerPort: 6379
+        - containerPort: 6666
           name: redis
           protocol: TCP
         resources: