Compare commits

...

38 Commits

Author SHA1 Message Date
vfebvre 99056b875e Merge pull request 'chore: update hydra-sql image ref to fix email search case' (#52) from fix-case-email into unstable
Reviewed-on: #52
2024-11-06 14:27:25 +01:00
Matthieu Lamalle ee0349e9df chore: update hydra-sql image ref to fix email search case 2024-11-06 11:18:49 +01:00
pcaseiro 3a255707d1 Merge pull request 'chore(hydra-sql) : update image ref to fix error handle' (#50) from hydra-sql-fix-error into unstable
Reviewed-on: #50
2024-10-14 11:37:26 +02:00
Matthieu Lamalle ce1f650a86 chore(hydra-sql) : update image ref to fix error handle 2024-10-14 10:49:12 +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
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
pcaseiro 3635f547a1 Merge pull request 'Ajout d'opcache sur les app symfony' (#43) from opcache into unstable
Reviewed-on: #43
Reviewed-by: pcaseiro <pcaseiro@cadoles.com>
2024-08-07 09:49:26 +02:00
Valentin Carroy 65fccdc3ce Add opcache to symfony apps 2024-08-07 09:49:26 +02:00
pcaseiro 0b3504e631 Merge pull request 'update symfony-container ref, add rewrite subject hydra-sql' (#42) from rewrite-subject into unstable
Reviewed-on: #42
2024-08-07 08:47:47 +02:00
Matthieu Lamalle 36a8e117e8 update symfony-container ref, add rewrite subject hydra-sql 2024-07-25 10:35:53 +02:00
Philippe Caseiro 176b5a6696 fix(hydra-sql): addin RollingUpdate stratgy config 2024-06-10 11:13:02 +02:00
pcaseiro efa00fc6a3 Merge pull request 'chore(hydra-sql): update image ref sprint-10' (#41) from sprint-10 into unstable
Reviewed-on: #41
2024-06-10 11:04:57 +02:00
Matthieu Lamalle f52b3117b5 chore(hydra-sql): update image ref sprint-10 2024-06-10 10:59:31 +02:00
pcaseiro 35c46316d3 Merge pull request 'sprint-9: update hydra-sql ref image' (#40) from sprint-9 into unstable
Reviewed-on: #40
Reviewed-by: pcaseiro <pcaseiro@cadoles.com>
2024-05-23 08:21:23 +02:00
Matthieu Lamalle 456e92ca0e sprint-8: update hydra-sql ref image 2024-05-22 15:42:15 +02:00
pcaseiro e1432cb633 Merge pull request 'fix(php-fpm): set php-fpm81 for hydra-sql and hydra-dispatcher' (#39) from sprint-8 into unstable
Reviewed-on: #39
Reviewed-by: pcaseiro <pcaseiro@cadoles.com>
2024-04-29 16:08:44 +02:00
Matthieu Lamalle 513797be35 fix(php-fpm): set php-fpm81 for hydra-sql and hydra-dispatcher 2024-04-29 16:08:44 +02:00
Philippe Caseiro f38ba80de6 Merge branch 'sprint-8' into unstable 2024-04-29 13:53:01 +02:00
pcaseiro 1db87e2d08 Merge branch 'unstable' into sprint-8 2024-04-29 13:51:36 +02:00
Matthieu Lamalle a7578445b4 fix(php-fpm): set php-fpm82 for hydra-sql and hydra-dispatcher 2024-04-29 13:47:58 +02:00
pcaseiro 119b09ac61 Merge pull request 'chore(dispatcher sql): update images refs' (#38) from sprint-8 into unstable
Reviewed-on: #38
Reviewed-by: pcaseiro <pcaseiro@cadoles.com>
2024-04-29 13:32:17 +02:00
Matthieu Lamalle 32ccca7616 typo 2024-04-29 12:11:53 +02:00
Matthieu Lamalle c174ddb734 chore(dispatcher sql): update images refs 2024-04-29 12:11:01 +02:00
pcaseiro 191024bb17 Merge pull request 'Intégration des images Caddy' (#37) from develop into unstable
Reviewed-on: #37
2024-04-04 17:49:04 +02:00
Philippe Caseiro 054f84baef clean(lint): fix indentation 2024-04-04 17:49:04 +02:00
cmsassot a88a8240aa feat(deploiement): use port name 2024-04-04 17:49:04 +02:00
cmsassot 5ea7789cc2 feat(hydra-sql): non root deployment with caddy 2024-04-04 17:49:04 +02:00
cmsassot 212de51a84 feat(hydra-oidc): non root deployment with caddy 2024-04-04 17:49:04 +02:00
cmsassot 9020c73512 feat(hydra-dispatcher): non root deployment with caddy 2024-04-04 17:49:04 +02:00
17 changed files with 222 additions and 104 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -18,39 +18,51 @@ spec:
spec:
containers:
- name: hydra-oidc-php-fpm
image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
exec:
command:
- sh
- -c
- test -f /etc/php81/php-fpm.d/www.conf
- sh
- -c
- test -f /etc/php81/php-fpm.d/www.conf
livenessProbe:
exec:
command:
- php
- bin/console
- -V
- php
- bin/console
- -V
initialDelaySeconds: 10
periodSeconds: 30
env:
- name: PHP_FPM_LISTEN
value: 127.0.0.1:9000
- name: PHP_MEMORY_LIMIT
value: 128m
- name: PHP_FPM_MEMORY_LIMIT
value: 128m
- name: PHP_FPM_LISTEN
value: 127.0.0.1:9000
- name: PHP_MEMORY_LIMIT
value: 128m
- name: PHP_FPM_MEMORY_LIMIT
value: 128m
envFrom:
- configMapRef:
name: hydra-oidc-env
- configMapRef:
name: hydra-oidc-env
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
- image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
- name: hydra-oidc-caddy
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
imagePullPolicy: Always
name: hydra-oidc-nginx
args: ["/usr/sbin/nginx"]
args:
[
"/usr/sbin/caddy",
"run",
"--adapter",
"caddyfile",
"--config",
"/etc/caddy/Caddyfile",
]
readinessProbe:
httpGet:
path: /healthy
@ -65,22 +77,26 @@ spec:
initialDelaySeconds: 15
timeoutSeconds: 5
periodSeconds: 15
envFrom:
- configMapRef:
name: hydra-oidc-env
env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000
- name: NGINX_APP_ROOT
value: "/public/"
- name: NGINX_APP_PHP_INDEX
value: "/index.php"
- name: NGINX_ERROR_LOG_LEVEL
value: "warn"
- name: NGINX_APP_PHP_NON_FILE_PATTERN
value: "^/index\\.php(/|$)"
ports:
- containerPort: 8080
- containerPort: 8080
name: http
envFrom:
- configMapRef:
name: hydra-oidc-env
env:
- name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000
- name: CADDY_HTTPS_PORT
value: "8443"
- name: CADDY_HTTP_PORT
value: "8080"
- name: CADDY_DATA_FS
value: "/tmp/caddy"
- name: CADDY_APP_ROOT_PUBLIC
value: "/app/public/"
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
restartPolicy: Always

View File

@ -6,8 +6,9 @@ metadata:
name: hydra-oidc
spec:
ports:
- name: hydra-oidc
port: 8080
- name: http
port: 80
targetPort: http
selector:
app.kubernetes.io/name: hydra-oidc
status:

View File

@ -0,0 +1,22 @@
[opcache]
; Determines if Zend OPCache is enabled
opcache.enable=1
; Determines if Zend OPCache is enabled for the CLI version of PHP
opcache.enable_cli=1
; The OPcache shared memory storage size.
opcache.memory_consumption=512
; The maximum number of keys (scripts) in the OPcache hash table.
; Only numbers between 200 and 1000000 are allowed.
opcache.max_accelerated_files=20000
; When disabled, you must reset the OPcache manually or restart the
; webserver for changes to the filesystem to take effect.
opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMP}
; How often (in seconds) to check file timestamps for changes to the shared
; memory storage allocation. ("1" means validate once per second, but only
; once per request. "0" means always validate)
opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}

View File

@ -11,6 +11,7 @@ generatorOptions:
configMapGenerator:
- name: hydra-sql-env
behavior: create
literals:
- ISSUER_URL="http://localhost:8000"
- BASE_URL='http://localhost:8080'
@ -26,3 +27,6 @@ configMapGenerator:
- name: sql-login-config
files:
- ./files/sql_login.yaml
- name: hydra-sql-php-ini
files:
- ./files/03_base.ini

View File

@ -10,7 +10,10 @@ spec:
matchLabels:
app.kubernetes.io/name: hydra-sql
strategy:
type: Recreate
type: RollingUpdate
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
template:
metadata:
labels:
@ -18,7 +21,7 @@ spec:
spec:
containers:
- name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
@ -36,6 +39,10 @@ spec:
initialDelaySeconds: 10
periodSeconds: 30
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
envFrom:
- configMapRef:
name: hydra-sql-env
@ -48,15 +55,22 @@ 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: hydra-sql-nginx
image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
- name: hydra-sql-caddy
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
imagePullPolicy: Always
args: ["/usr/sbin/nginx"]
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
readinessProbe:
httpGet:
path: /health
@ -75,19 +89,24 @@ spec:
- configMapRef:
name: hydra-sql-env
env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
- name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000
- name: NGINX_APP_ROOT
value: "/public"
- name: NGINX_APP_PHP_INDEX
value: "/index.php"
- name: NGINX_ERROR_LOG_LEVEL
value: "warn"
- name: NGINX_APP_PHP_NON_FILE_PATTERN
value: "^/index\\.php(/|$)"
- name: CADDY_HTTPS_PORT
value: "8443"
- name: CADDY_HTTP_PORT
value: "8080"
- name: CADDY_DATA_FS
value: "/tmp/caddy"
- name: CADDY_APP_ROOT_PUBLIC
value: "/app/public/"
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
ports:
- containerPort: 8080
name: http
volumeMounts:
- name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
@ -96,5 +115,8 @@ spec:
- name: sql-login-config
configMap:
name: sql-login-config
- name: hydra-sql-php-ini
configMap:
name: hydra-sql-php-ini
restartPolicy: Always

View File

@ -6,8 +6,9 @@ metadata:
name: hydra-sql
spec:
ports:
- name: hydra-sql
port: 8080
- name: http
port: 80
targetPort: http
selector:
app.kubernetes.io/name: hydra-sql
status:

View File

@ -0,0 +1,22 @@
[opcache]
; Determines if Zend OPCache is enabled
opcache.enable=1
; Determines if Zend OPCache is enabled for the CLI version of PHP
opcache.enable_cli=1
; The OPcache shared memory storage size.
opcache.memory_consumption=512
; The maximum number of keys (scripts) in the OPcache hash table.
; Only numbers between 200 and 1000000 are allowed.
opcache.max_accelerated_files=20000
; When disabled, you must reset the OPcache manually or restart the
; webserver for changes to the filesystem to take effect.
opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMP}
; How often (in seconds) to check file timestamps for changes to the shared
; memory storage allocation. ("1" means validate once per second, but only
; once per request. "0" means always validate)
opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}

View File

@ -29,3 +29,6 @@ configMapGenerator:
- name: hydra-dispatcher-apps
files:
- apps.yaml=./files/hydra/default.yaml
- name: hydra-dispatcher-php-ini
files:
- ./files/03_base.ini

View File

@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: hydra-dispatcher-php-fpm
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
exec:
@ -41,18 +41,36 @@ 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
resources: {}
- image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
- name: hydra-dispatcher-caddy
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
imagePullPolicy: Always
name: hydra-dispatcher-nginx
args: ["/usr/sbin/nginx"]
args:
[
"/usr/sbin/caddy",
"run",
"--adapter",
"caddyfile",
"--config",
"/etc/caddy/Caddyfile",
]
readinessProbe:
httpGet:
path: /health
@ -71,21 +89,29 @@ spec:
- configMapRef:
name: hydra-dispatcher-env
env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
- name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000
- name: NGINX_APP_ROOT
value: "/public/"
- name: NGINX_APP_PHP_INDEX
value: "/index.php"
- name: NGINX_ERROR_LOG_LEVEL
value: "warn"
- name: NGINX_APP_PHP_NON_FILE_PATTERN
value: "^/index\\.php(/|$)"
- name: CADDY_HTTPS_PORT
value: "8443"
- name: CADDY_HTTP_PORT
value: "8080"
- name: CADDY_DATA_FS
value: "/tmp/caddy"
- name: CADDY_APP_ROOT_PUBLIC
value: "/app/public/"
ports:
- containerPort: 8080
name: http
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
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

View File

@ -6,8 +6,9 @@ metadata:
name: hydra-dispatcher
spec:
ports:
- name: http
port: 8080
- name: http
port: 80
targetPort: http
selector:
app.kubernetes.io/name: hydra-dispatcher
status:

View File

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