Remove sql default config

Remove dispatcher default config
feat: add xdebug to dispatcher and sql
2024-10-25 14:45:34 +02:00 · 2024-10-25 14:29:26 +02:00 · 2024-10-11 10:07:02 +02:00 · 2024-10-10 10:35:09 +02:00 · 2024-10-10 10:31:16 +02:00 · 2024-10-09 11:49:39 +02:00
15 changed files with 84 additions and 104 deletions
--- a/components/hydra-cnpg-database/kustomization.yaml
+++ b/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
--- a/components/hydra-cnpg-database/patches/hydra-deployment.yaml
+++ b/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)"
--- a/components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml
+++ b/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"
--- a/components/hydra-cnpg-database/patches/hydra-migrate-job.yaml
+++ b/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"
--- a/components/hydra-cnpg-database/resources/hydra-cnpg-cluster.yaml
+++ b/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
--- a/components/hydra-oidc/kustomization.yaml
+++ b/components/hydra-oidc/kustomization.yaml
@ -11,6 +11,7 @@ generatorOptions:

 configMapGenerator:
 - name: hydra-oidc-env
+  behavior: create
  literals:
  - APP_ENV=prod
  - APP_DEBUG=false
--- a/components/hydra-sql/files/50_xdebug.ini
+++ b/components/hydra-sql/files/50_xdebug.ini
@ -0,0 +1,8 @@
+# Prevent execution timeout due to the large amount of data to process during profling sessions
+max_execution_time=300
+# Extension
+zend_extension=xdebug.so
+# Xdebug configuration
+xdebug.mode=${XDEBUG_MODE}
+xdebug.client_host=${XDEBUG_CLIENT_HOST}
+xdebug.start_with_request=${XDEBUG_START_WITH_REQUEST}
--- a/components/hydra-sql/files/sql_login.yaml
+++ b/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
--- a/components/hydra-sql/kustomization.yaml
+++ b/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,13 @@ configMapGenerator:
  - DB_PASSWORD="makeMeASecret"
  - REDIS_DSN="redis://redis:6379"
  - PEPPER="MakeMeABigSecret"
- name: sql-login-config
-  files:
-  - ./files/sql_login.yaml
+  - OPCACHE_VALIDATE_TIMESTAMP="0"
+  - OPCACHE_REVALIDATE_FREQ="0"
+  - XDEBUG_MODE=off
 - name: hydra-sql-php-ini
  files:
  - ./files/03_base.ini
+- name: xdebug-sql-config
+  behavior: create
+  files:
+  - ./files/50_xdebug.ini
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/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.10-develop.1026.8e56433
        imagePullPolicy: Always
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
@ -55,20 +55,15 @@ spec:
          value: 128m
        - name: PHP_FPM_LOG_LEVEL
          value: warning
-        - name: OPCACHE_VALIDATE_TIMESTAMP
-          value: "0"
-        - 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: xdebug-sql-config
+          mountPath: /etc/php81/conf.d/50_xdebug.ini
+          subPath: 50_xdebug.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.10-develop.1026.8e56433
        imagePullPolicy: Always
        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
        readinessProbe:
@ -107,16 +102,11 @@ 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
-
+      - name: xdebug-sql-config
+        configMap:
+          name: xdebug-sql-config
      restartPolicy: Always
--- a/resources/hydra-dispatcher/files/50_xdebug.ini
+++ b/resources/hydra-dispatcher/files/50_xdebug.ini
@ -0,0 +1,8 @@
+# Prevent execution timeout due to the large amount of data to process during profling sessions
+max_execution_time=300
+# Extension
+zend_extension=xdebug.so
+# Xdebug configuration
+xdebug.mode=${XDEBUG_MODE}
+xdebug.client_host=${XDEBUG_CLIENT_HOST}
+xdebug.start_with_request=${XDEBUG_START_WITH_REQUEST}
--- a/resources/hydra-dispatcher/files/hydra/default.yaml
+++ b/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: {}
--- a/resources/hydra-dispatcher/kustomization.yaml
+++ b/resources/hydra-dispatcher/kustomization.yaml
@ -26,9 +26,13 @@ configMapGenerator:
  - DEFAULT_LOCALE=fr
  - APP_LOCALES=fr,en
  - REDIS_DSN="redis://redis:6379"
- name: hydra-dispatcher-apps
-  files:
-  - apps.yaml=./files/hydra/default.yaml
+  - OPCACHE_VALIDATE_TIMESTAMP="0"
+  - OPCACHE_REVALIDATE_FREQ="0"
+  - XDEBUG_MODE=off
 - name: hydra-dispatcher-php-ini
  files:
  - ./files/03_base.ini
+- name: xdebug-dispatcher-config
+  behavior: create
+  files:
+  - ./files/50_xdebug.ini
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: hydra-dispatcher-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb2
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
          exec:
@ -41,19 +41,16 @@ spec:
          value: 128m
        - name: PHP_FPM_MEMORY_LIMIT
          value: 128m
-        - name: OPCACHE_VALIDATE_TIMESTAMP
-          value: "0"
-        - name: OPCACHE_REVALIDATE_FREQ
-          value: "0"
        envFrom:
        - 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
+        - name: xdebug-dispatcher-config
+          mountPath: /etc/php81/conf.d/50_xdebug.ini
+          subPath: 50_xdebug.ini
        resources: {}
        securityContext:
          runAsNonRoot: true
@ -62,15 +59,7 @@ spec:
      - name: hydra-dispatcher-caddy
        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
        imagePullPolicy: Always
-        args:
-          [
-            "/usr/sbin/caddy",
-            "run",
-            "--adapter",
-            "caddyfile",
-            "--config",
-            "/etc/caddy/Caddyfile",
-          ]
+        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
        readinessProbe:
          httpGet:
            path: /health
@ -109,9 +98,9 @@ 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
+      - name: xdebug-dispatcher-config
+        configMap:
+          name: xdebug-dispatcher-config
--- a/resources/hydra/kustomization.yaml
+++ b/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:
Author	SHA1	Message	Date
vcarroy	577cf4755e	Remove sql default config	2024-10-25 14:45:34 +02:00
vcarroy	b396755705	Remove dispatcher default config	2024-10-25 14:29:26 +02:00
vcarroy	0a847ed53d	feat: add xdebug to dispatcher and sql	2024-10-11 10:07:02 +02:00
pcaseiro	de24eb0026	Merge pull request 'chore(hydra-sql): correction requete password et fetchdata et ajout paquet xdebug' (#49 ) from hydra-sql-fix into unstable Reviewed-on: #49 Reviewed-by: pcaseiro <pcaseiro@cadoles.com>	2024-10-10 10:35:09 +02:00
Matthieu Lamalle	40ec4440a7	chore(hydra-sql): correction requete password et fetchdata et ajout paquet xdebug	2024-10-10 10:31:16 +02:00
Philippe Caseiro	4ec580fb7d	fix(component): oidc adding behavior to secret generator	2024-10-09 11:49:39 +02:00
Philippe Caseiro	1cf7569678	fix(component): adding behavior to secret generator	2024-10-09 11:37:52 +02:00
vfebvre	a0ff37edf6	Merge pull request 'feat(postgres): adding max_conns hydra parameter support for cnpg component' (#47 ) from feat-hydra-pooler into unstable Reviewed-on: #47 Reviewed-by: Laurent Gourvenec <lgourvenec@cadoles.com> Reviewed-by: vfebvre <vfebvre@cadoles.com>	2024-10-09 10:00:02 +02:00
Philippe Caseiro	a5c9c733f6	feat(postgres): adding hydra max_conns parameter support Mandatory for large scale deployements	2024-10-04 10:56:54 +02:00
pcaseiro	a5cecb385c	Merge pull request 'fix(hydra-dispatcher): typo on ref' (#46 ) from sprint-15 into unstable Reviewed-on: #46	2024-09-24 15:19:58 +02:00
Matthieu Lamalle	15ad23049f	fix(hydra-dispatcher): typo on ref	2024-09-24 15:19:58 +02:00