From 422691d11c5640c85f73393ee1c6b3c10c83007d Mon Sep 17 00:00:00 2001
From: Philip Haupt <“der.mad.mob@gmail.com”>
Date: Tue, 14 Oct 2025 19:39:49 +0200
Subject: [PATCH] fix requirepass

---
 valkey/config.yaml        |  7 -------
 valkey/kustomization.yaml |  1 -
 valkey/main.yaml          | 26 ++++++++++++++++++++------
 valkey/src/values.yaml    |  8 ++++----
 4 files changed, 24 insertions(+), 18 deletions(-)
 delete mode 100644 valkey/config.yaml

diff --git a/valkey/config.yaml b/valkey/config.yaml
deleted file mode 100644
index 84e5094..0000000
--- a/valkey/config.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: valkey-config
-data:
-  extra.conf: |
-    include /run/secrets/valkey/requirepass
\ No newline at end of file
diff --git a/valkey/kustomization.yaml b/valkey/kustomization.yaml
index 51025d0..b1d20b0 100644
--- a/valkey/kustomization.yaml
+++ b/valkey/kustomization.yaml
@@ -4,4 +4,3 @@ kind: Kustomization
 
 resources:
   - main.yaml
-  - config.yaml
diff --git a/valkey/main.yaml b/valkey/main.yaml
index 436a1f6..746e748 100644
--- a/valkey/main.yaml
+++ b/valkey/main.yaml
@@ -11,6 +11,20 @@ metadata:
   name: valkey
 ---
 apiVersion: v1
+data:
+  valkey.conf: |
+    include /run/secrets/valkey/requirepass
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/instance: valkey
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: valkey
+    app.kubernetes.io/version: 8.1.3
+    helm.sh/chart: valkey-0.7.4
+  name: valkey-config
+---
+apiVersion: v1
 data:
   init.sh: "#!/bin/bash\nset -euo pipefail\n\n# Default config paths\nVALKEY_CONFIG=${VALKEY_CONFIG_PATH:-/data/conf/valkey.conf}\n\nLOGFILE=\"/data/init.log\"\nDATA_DIR=\"/data/conf\"\n\n#
     Logging function\nlog() {\n  echo \"$(date) $1\" | tee -a \"$LOGFILE\"\n}\n\n#
@@ -137,8 +151,6 @@ spec:
           name: valkey-data
         - mountPath: /run/secrets/valkey
           name: valkey-pass-valkey
-        - mountPath: /extravalkeyconfigs
-          name: valkey-config-valkey
       initContainers:
       - command:
         - /scripts/init.sh
@@ -157,6 +169,9 @@ spec:
           name: valkey-data
         - mountPath: /scripts
           name: scripts
+        - mountPath: /usr/local/etc/valkey/valkey.conf
+          name: valkey-config
+          subPath: valkey.conf
       securityContext:
         fsGroup: 1000
         runAsGroup: 1000
@@ -167,14 +182,13 @@ spec:
           defaultMode: 365
           name: valkey-init-scripts
         name: scripts
+      - configMap:
+          name: valkey-config
+        name: valkey-config
       - name: valkey-pass-valkey
         secret:
           defaultMode: 288
           secretName: valkey-pass
-      - configMap:
-          defaultMode: 288
-          name: valkey-config
-        name: valkey-config-valkey
       - name: valkey-data
         persistentVolumeClaim:
           claimName: valkey
diff --git a/valkey/src/values.yaml b/valkey/src/values.yaml
index 08d822b..8fc2079 100644
--- a/valkey/src/values.yaml
+++ b/valkey/src/values.yaml
@@ -111,9 +111,9 @@ extraValkeySecrets:
     mountPath: /run/secrets/valkey
 
 # Mount additional configMaps into the Valkey container
-extraValkeyConfigs:
-  - name: valkey-config
-    mountPath: /extravalkeyconfigs
+#extraValkeyConfigs:
+#  - name: valkey-config
+#    mountPath: /extravalkeyconfigs/
 
 # Mount extra secrets as volume to init container (deprecated, use extraValkeySecrets)
 extraSecretValkeyConfigs: false
@@ -122,7 +122,7 @@ extraSecretValkeyConfigs: false
 extraStorage: []
 
 # Content for valkey.conf (will be mounted via ConfigMap)
-valkeyConfig: ""
+valkeyConfig: include /run/secrets/valkey/requirepass
 
 auth:
   # Enable ACL-based authentication