fix(component): oidc adding behavior to secret generator

fix(component): adding behavior to secret generator
Merge pull request 'feat(postgres): adding max_conns hydra parameter support for cnpg component' (#47 ) from feat-hydra-pooler into unstable
2024-10-09 11:49:39 +02:00 · 2024-10-09 11:37:52 +02:00 · 2024-10-09 10:00:02 +02:00 · 2024-10-04 10:56:54 +02:00 · 2024-09-24 15:19:58 +02:00 · 2024-09-24 15:19:58 +02:00
10 changed files with 42 additions and 41 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
+    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/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'
--- 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.7.25-develop.1026.5bfd899
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.9.24-develop.1300.fe4d683
        imagePullPolicy: Always
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
@ -68,7 +68,7 @@ spec:
          subPath: 03_base.ini

      - name: hydra-sql-caddy
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.7.25-develop.1026.5bfd899
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.9.24-develop.1300.fe4d683
        imagePullPolicy: Always
        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
        readinessProbe:
--- 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.7.25-develop.1034.21d6822
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
          exec:
@ -60,7 +60,7 @@ spec:
          runAsGroup: 1000
          runAsUser: 1000
      - name: hydra-dispatcher-caddy
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.7.25-develop.1034.21d6822
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
        imagePullPolicy: Always
        args:
          [
@ -114,4 +114,4 @@ spec:
          name: hydra-dispatcher-apps
      - name: hydra-dispatcher-php-ini
        configMap:
-          name: hydra-dispatcher-php-ini
+          name: hydra-dispatcher-php-ini
--- 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
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
pcaseiro	78e5b30e1d	Merge pull request 'sprint-15' (#45 ) from sprint-15 into unstable Reviewed-on: #45	2024-09-24 14:02:36 +02:00
Matthieu Lamalle	1ea76c2153	chore(hydra-dispatcher) : improve header cache	2024-09-24 13:44:40 +02:00
Matthieu Lamalle	af76c99d91	chore(hydra-sql) : improve sql handler	2024-09-24 13:43:59 +02:00