From c44d10c64c365eb997f776abebd2831de9e68142 Mon Sep 17 00:00:00 2001
From: vcarroy <vcarroy@cadoles.com>
Date: Fri, 25 Oct 2024 14:21:18 +0200
Subject: [PATCH 1/2] Remove dispatcher default config

---
 .../hydra-dispatcher/files/hydra/default.yaml   | 17 -----------------
 resources/hydra-dispatcher/kustomization.yaml   |  3 ---
 .../resources/hydra-dispatcher-deployment.yaml  |  5 -----
 3 files changed, 25 deletions(-)
 delete mode 100644 resources/hydra-dispatcher/files/hydra/default.yaml

diff --git a/resources/hydra-dispatcher/files/hydra/default.yaml b/resources/hydra-dispatcher/files/hydra/default.yaml
deleted file mode 100644
index d86c656..0000000
--- a/resources/hydra-dispatcher/files/hydra/default.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  env(HYDRA_DISPATCHER_WEBHOOK_ENABLED): false
-  env(HYDRA_DISPATCHER_WEBHOOK_API_URL): ""
-  env(HYDRA_DISPATCHER_WEBHOOK_API_KEY): ""
-  env(HYDRA_DISPATCHER_WEBHOOK_API_METHOD): POST
-  env(HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES): true
-
-hydra:
-  apps: []
-  webhook:
-    enabled: "%env(bool:HYDRA_DISPATCHER_WEBHOOK_ENABLED)%"
-    api_url: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_URL)%"
-    api_key: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_KEY)%"
-    api_method: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_METHOD)%"
-  firewall:
-    additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
-    rules: {}
diff --git a/resources/hydra-dispatcher/kustomization.yaml b/resources/hydra-dispatcher/kustomization.yaml
index 7ab4a1d..93d1827 100644
--- a/resources/hydra-dispatcher/kustomization.yaml
+++ b/resources/hydra-dispatcher/kustomization.yaml
@@ -26,9 +26,6 @@ configMapGenerator:
   - DEFAULT_LOCALE=fr
   - APP_LOCALES=fr,en
   - REDIS_DSN="redis://redis:6379"
-- name: hydra-dispatcher-apps
-  files:
-  - apps.yaml=./files/hydra/default.yaml
 - name: hydra-dispatcher-php-ini
   files:
   - ./files/03_base.ini
\ No newline at end of file
diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
index 5006247..0e78f40 100644
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
@@ -49,8 +49,6 @@ spec:
         - configMapRef:
             name: hydra-dispatcher-env
         volumeMounts:
-        - mountPath: /app/config/hydra
-          name: hydra-dispatcher-apps
         - name: hydra-dispatcher-php-ini
           mountPath: /etc/php81/conf.d/03_base.ini
           subPath: 03_base.ini
@@ -109,9 +107,6 @@ spec:
           runAsUser: 1000
       restartPolicy: Always
       volumes:
-      - name: hydra-dispatcher-apps
-        configMap:
-          name: hydra-dispatcher-apps
       - name: hydra-dispatcher-php-ini
         configMap:
           name: hydra-dispatcher-php-ini
-- 
2.17.1


From 01a7f5a8219a3f5f922929372d4e40173c781d01 Mon Sep 17 00:00:00 2001
From: vcarroy <vcarroy@cadoles.com>
Date: Fri, 25 Oct 2024 14:45:34 +0200
Subject: [PATCH 2/2] Remove sql default config

---
 components/hydra-sql/files/sql_login.yaml              |  7 -------
 components/hydra-sql/kustomization.yaml                |  3 ---
 .../hydra-sql/resources/hydra-sql-deployment.yaml      | 10 ----------
 3 files changed, 20 deletions(-)
 delete mode 100644 components/hydra-sql/files/sql_login.yaml

diff --git a/components/hydra-sql/files/sql_login.yaml b/components/hydra-sql/files/sql_login.yaml
deleted file mode 100644
index a69ef96..0000000
--- a/components/hydra-sql/files/sql_login.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-sql_login:
-  login_column_name: mail
-  password_column_name: password
-  salt_column_name: salt
-  table_name: user
-  data_to_fetch:
-  - mail
diff --git a/components/hydra-sql/kustomization.yaml b/components/hydra-sql/kustomization.yaml
index 0504eb2..5c32f7a 100644
--- a/components/hydra-sql/kustomization.yaml
+++ b/components/hydra-sql/kustomization.yaml
@@ -24,9 +24,6 @@ configMapGenerator:
   - DB_PASSWORD="makeMeASecret"
   - REDIS_DSN="redis://redis:6379"
   - PEPPER="MakeMeABigSecret"
-- name: sql-login-config
-  files:
-  - ./files/sql_login.yaml
 - name: hydra-sql-php-ini
   files:
   - ./files/03_base.ini
diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml
index c9ff8d8..90f56f3 100644
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml
@@ -60,9 +60,6 @@ spec:
         - name: OPCACHE_REVALIDATE_FREQ
           value: "0"
         volumeMounts:
-        - name: sql-login-config
-          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-          subPath: "sql_login.yaml"
         - name: hydra-sql-php-ini
           mountPath: /etc/php81/conf.d/03_base.ini
           subPath: 03_base.ini
@@ -107,14 +104,7 @@ spec:
         ports:
         - containerPort: 8080
           name: http
-        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
       - name: hydra-sql-php-ini
         configMap:
           name: hydra-sql-php-ini
-- 
2.17.1