From 5adbdbdceeabd8e90572e61489e9e769c978dbeb Mon Sep 17 00:00:00 2001
From: sarmstrong <stuart.armstrong@wilix.org>
Date: Fri, 5 Dec 2025 09:56:49 +0300
Subject: [PATCH] .

---
 .../templates/configmap-initdb.yaml           |  6 ++--
 yonote-chart-service/templates/mcJob.yaml     | 35 -------------------
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/yonote-chart-service/templates/configmap-initdb.yaml b/yonote-chart-service/templates/configmap-initdb.yaml
index 05049e9..071fc8a 100644
--- a/yonote-chart-service/templates/configmap-initdb.yaml
+++ b/yonote-chart-service/templates/configmap-initdb.yaml
@@ -8,7 +8,7 @@ data:
     set -e
 
     psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-    CREATE DATABASE keycloak;
-    CREATE USER keycloaku WITH PASSWORD 'password1';
-    GRANT ALL PRIVILEGES ON DATABASE keycloak TO keycloaku;
+    CREATE DATABASE {{ .Values.keycloak.database.database }};
+    CREATE USER {{ .Values.keycloak.database.username }} WITH PASSWORD '{{ .Values.keycloak.database.password }}';
+    GRANT ALL PRIVILEGES ON DATABASE keycloak TO {{ .Values.keycloak.database.username }};
     EOSQL
diff --git a/yonote-chart-service/templates/mcJob.yaml b/yonote-chart-service/templates/mcJob.yaml
index b079ab3..7f5fbf4 100644
--- a/yonote-chart-service/templates/mcJob.yaml
+++ b/yonote-chart-service/templates/mcJob.yaml
@@ -23,38 +23,6 @@ spec:
               done
               echo "MinIO is ready and alias is set."
 
-              # Создание пользователя
-              #if ! mc admin user add myminio {{ .Values.minio.customUser }} {{ .Values.minio.customAccessKey }}; then
-              #  echo "User {{ .Values.minio.customUser }} already exists or failed to create."
-              #else
-              #  echo "User {{ .Values.minio.customUser }} created successfully."
-              #fi
-
-              # Назначение политики для нового пользователя
-              cat <<EOF > /tmp/minio-user-policy.json
-              {
-                "Version": "2012-10-17",
-                "Statement": [
-                  {
-                    "Sid": "VisualEditor",
-                    "Effect": "Allow",
-                    "Action": [
-                      "s3:DeleteObject",
-                      "s3:GetObject",
-                      "s3:PutObject"
-                    ],
-                    "Resource": [
-                      "arn:aws:s3:::yonote-bucket/*"
-                    ]
-                  }
-                ]
-              }
-              EOF
-              echo "User policy JSON file created."
-
-              mc admin policy create myminio yonote-policy /tmp/minio-user-policy.json
-              echo "User policy created and applied."
-
               # Создание бакета
               if ! mc ls myminio/yonote-bucket; then
                 mc mb myminio/yonote-bucket
@@ -104,9 +72,6 @@ spec:
               mc anonymous set-json /tmp/minio-bucket-policy.json myminio/yonote-bucket
               echo "Bucket policy applied."
 
-              mc admin policy attach myminio yonote-policy --user={{ .Values.minio.customUser }}
-              echo "Policy attached to user {{ .Values.minio.customUser }}."
-
           resources:
             requests:
               memory: "128Mi"