Remove sql default config

Reviewed-on: #50

components/hydra-cnpg-database/kustomization.yaml

@@ -7,28 +7,6 @@ configurations:
 resources:
 - ./resources/hydra-cnpg-cluster.yaml
 
-secretGenerator:
-- name: hydra-postgres-admin
-  type: Secret
-  literals:
-  - username=postgres
-  - password=NotSoSecret
-- name: hydra-postgres-user
-  type: Secret
-  literals:
-  - username=hydra
-  - password=NotSoSecret
-
-
-vars:
-- name: HYDRA_DATABASE_SERVICE_NAME
-  objref:
-    name: hydra-postgres
-    kind: Cluster
-    apiVersion: postgresql.cnpg.io/v1
-  fieldref:
-    fieldpath: metadata.name
-
 patches:
 - target:
     group: apps

components/hydra-cnpg-database/patches/hydra-deployment.yaml

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: username
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
@@ -12,10 +12,18 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: password
+- op: add
+  path: "/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_SERVICE_NAME
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-app
+        key: host
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
   value:
     name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)"

components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: username
 - op: add
   path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
@@ -12,10 +12,18 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: password
+- op: add
+  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_SERVICE_NAME
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-app
+        key: host
 - op: add
   path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
   value:
     name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"

components/hydra-cnpg-database/patches/hydra-migrate-job.yaml

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: username
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
@@ -12,10 +12,18 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: password
+- op: add
+  path: "/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_SERVICE_NAME
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-app
+        key: host
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
   value:
     name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"

components/hydra-cnpg-database/resources/hydra-cnpg-cluster.yaml

@@ -5,13 +5,9 @@ metadata:
 spec:
   instances: 3
   primaryUpdateStrategy: unsupervised
-  superuserSecret:
-    name: hydra-postgres-admin
   bootstrap:
     initdb:
       database: hydra
       owner: hydra
-      secret:
-        name: hydra-postgres-user
   storage:
     size: 2Gi

components/hydra-oidc/kustomization.yaml

@@ -11,6 +11,7 @@ generatorOptions:
 
 configMapGenerator:
 - name: hydra-oidc-env
+  behavior: create
   literals:
   - APP_ENV=prod
   - APP_DEBUG=false

components/hydra-sql/files/sql_login.yaml

@@ -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

components/hydra-sql/kustomization.yaml

@@ -11,6 +11,7 @@ generatorOptions:
 
 configMapGenerator:
 - name: hydra-sql-env
+  behavior: create
   literals:
   - ISSUER_URL="http://localhost:8000"
   - BASE_URL='http://localhost:8080'
@@ -23,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

components/hydra-sql/resources/hydra-sql-deployment.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
       - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.9.24-develop.1300.fe4d683
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.14-develop.1040.7032787
         imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
@@ -60,15 +60,12 @@ 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
 
       - name: hydra-sql-caddy
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.9.24-develop.1300.fe4d683
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.10.14-develop.1040.7032787
         imagePullPolicy: Always
         args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
         readinessProbe:
@@ -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

resources/hydra-dispatcher/files/hydra/default.yaml

@@ -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: {}

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

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

resources/hydra/kustomization.yaml

@@ -30,6 +30,7 @@ configMapGenerator:
   - URLS_CONSENT=http://hydra-consent-app/consent
   - URLS_LOGOUT=http://hydra-logout-app/logout
   - HYDRA_SERVE_ALL_ARGS=--dev
+  - HYDRA_DATABASE_MAX_CONN="10"
   - LOG_LEVEL=info
 
 vars: