From f9ba190287fef8e2b52d64e55621303d45f205ad Mon Sep 17 00:00:00 2001
From: Kamil Rajtar <kamil.rajtar@gmail.com>
Date: Tue, 18 Aug 2026 10:21:24 +0200
Subject: [PATCH] fix: pass MINIO_ROOT_USER/MINIO_ROOT_PASSWORD to MinIO
 container

---
 helm/huly/templates/minio/deployment.yaml | 11 +++++++++++
 helm/huly/templates/secret.yaml           | 15 ++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/helm/huly/templates/minio/deployment.yaml b/helm/huly/templates/minio/deployment.yaml
index 02d78c0..63236f4 100644
--- a/helm/huly/templates/minio/deployment.yaml
+++ b/helm/huly/templates/minio/deployment.yaml
@@ -35,6 +35,17 @@ spec:
               containerPort: 9000
             - name: console
               containerPort: 9001
+          env:
+            - name: MINIO_ROOT_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "huly.secretName" . }}
+                  key: MINIO_ROOT_USER
+            - name: MINIO_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "huly.secretName" . }}
+                  key: MINIO_ROOT_PASSWORD
           readinessProbe:
             httpGet:
               path: /minio/health/ready
diff --git a/helm/huly/templates/secret.yaml b/helm/huly/templates/secret.yaml
index 1c8ba53..f6b7cd4 100644
--- a/helm/huly/templates/secret.yaml
+++ b/helm/huly/templates/secret.yaml
@@ -32,6 +32,17 @@
   {{- $redpandaPwd = randAlphaNum 24 -}}
 {{- end -}}
 
+{{- /* MINIO_ROOT_USER / MINIO_ROOT_PASSWORD — used by MinIO container and STORAGE_CONFIG */ -}}
+{{- $minioUser := "" -}}
+{{- $minioPwd := "" -}}
+{{- if and $hasExisting (hasKey $existing.data "MINIO_ROOT_USER") -}}
+  {{- $minioUser = index $existing.data "MINIO_ROOT_USER" | b64dec -}}
+  {{- $minioPwd = index $existing.data "MINIO_ROOT_PASSWORD" | b64dec -}}
+{{- else -}}
+  {{- $minioUser = randAlphaNum 20 -}}
+  {{- $minioPwd = randAlphaNum 40 -}}
+{{- end -}}
+
 {{- /* STORAGE_CONFIG — explicit values > storage.type config > existing secret > auto-generate */ -}}
 {{- $storageConfig := "" -}}
 {{- if .Values.secrets.storageConfig -}}
@@ -48,7 +59,7 @@
 {{- else if and $hasExisting (hasKey $existing.data "STORAGE_CONFIG") -}}
   {{- $storageConfig = index $existing.data "STORAGE_CONFIG" | b64dec -}}
 {{- else -}}
-  {{- $storageConfig = printf "minio|minio?accessKey=%s&secretKey=%s" (randAlphaNum 20) (randAlphaNum 40) -}}
+  {{- $storageConfig = printf "minio|minio?accessKey=%s&secretKey=%s" $minioUser $minioPwd -}}
 {{- end -}}
 
 {{- /* CR_DB_URL */ -}}
@@ -82,6 +93,8 @@ data:
   SERVER_SECRET: {{ $serverSecret | b64enc | quote }}
   COCKROACH_PASSWORD: {{ $cockroachPwd | b64enc | quote }}
   REDPANDA_SUPERUSER_PASSWORD: {{ $redpandaPwd | b64enc | quote }}
+  MINIO_ROOT_USER: {{ $minioUser | b64enc | quote }}
+  MINIO_ROOT_PASSWORD: {{ $minioPwd | b64enc | quote }}
   STORAGE_CONFIG: {{ $storageConfig | b64enc | quote }}
   CR_DB_URL: {{ $crDbUrl | b64enc | quote }}
   AIBOT_PASSWORD: {{ $aibotPwd | b64enc | quote }}