From 5b5b7081097e704152ebed1b479dda7962c037c5 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Mon, 19 Jun 2023 11:57:37 +0200 Subject: [PATCH] REWORD adding sql-login.yaml configMape --- components/hydra-sql/kustomization.yaml | 5 ++++- .../hydra-sql/resources/hydra-sql-deployment.yaml | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/components/hydra-sql/kustomization.yaml b/components/hydra-sql/kustomization.yaml index f97b42c..f305b11 100644 --- a/components/hydra-sql/kustomization.yaml +++ b/components/hydra-sql/kustomization.yaml @@ -10,7 +10,7 @@ configMapGenerator: literals: - ISSUER_URL="http://localhost:8000" - BASE_URL='http://localhost:8080' - - HYDRA_ADMIN_BASE_URL='http://hydra:4445' + - HYDRA_ADMIN_BASE_URL='http://hydra:4445/admin' - APP_LOCALES="fr,en" - HASH_ALGO_LEGACY="sha256, bcrypt" - SECURITY_PATTERN="password,salt,pepper" @@ -18,3 +18,6 @@ configMapGenerator: - DB_USER="makeMeASecret" - DB_PASSWORD="makeMeASecret" - PEPPER="MakeMeABigSecret" +- name: sql-login-config + files: + - ./files/sql_login.yaml diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml index f3e5927..fa270a7 100644 --- a/components/hydra-sql/resources/hydra-sql-deployment.yaml +++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml @@ -35,6 +35,10 @@ spec: value: 128m - name: PHP_FPM_LOG_LEVEL value: warning + volumeMounts: + - name: sql-login-config + mountPath: "/app/config/sql_login_configuration/sql_login.yaml" + subPath: "sql_login.yaml" - name: hydra-sql-nginx image: reg.cadoles.com/rmasson/hydra-sql-kube:0.0.3-dev-issue-14-20230615 imagePullPolicy: Always @@ -55,4 +59,13 @@ spec: value: "^/index\\.php(/|$)" ports: - containerPort: 8080 + volumeMounts: + - name: sql-login-config + mountPath: "/app/config/sql_login_configuration/sql_login.yaml" + subPath: "sql_login.yaml" + volumes: + - name: sql-login-config + configMap: + name: sql-login-config + restartPolicy: Always