diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml index 9c19848..6893e5a 100644 --- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml +++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml @@ -17,55 +17,9 @@ spec: app.kubernetes.io/name: hydra-oidc spec: containers: - - name: hydra-oidc-php-fpm - image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382 + - name: hydra-oidc + image: reg.cadoles.com/gdupont/hydra-oidc-base:latest imagePullPolicy: IfNotPresent - args: ["/usr/sbin/php-fpm81", "-F", "-e"] - readinessProbe: - exec: - command: - - sh - - -c - - test -f /etc/php81/php-fpm.d/www.conf - livenessProbe: - exec: - command: - - 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 - envFrom: - - configMapRef: - name: hydra-oidc-env - volumeMounts: - - name: oidc-tmp - mountPath: /tmp - resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 - - - name: hydra-oidc-caddy - image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382 - imagePullPolicy: IfNotPresent - args: - [ - "/usr/sbin/caddy", - "run", - "--adapter", - "caddyfile", - "--config", - "/etc/caddy/Caddyfile", - ] readinessProbe: httpGet: path: /healthy @@ -87,8 +41,6 @@ spec: - 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 @@ -102,10 +54,6 @@ spec: - name: CADDY_LOG_SKIP value: "true" resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 restartPolicy: Always volumes: - name: oidc-tmp diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml index 1d67286..f3751f9 100644 --- a/components/hydra-sql/resources/hydra-sql-deployment.yaml +++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml @@ -20,56 +20,9 @@ spec: app.kubernetes.io/name: hydra-sql spec: containers: - - name: hydra-sql-fpm - image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c + - name: hydra-sql + image: reg.cadoles.com/gdupont/hydra-sql-base:latest imagePullPolicy: IfNotPresent - args: ["/usr/sbin/php-fpm84", "-F", "-e"] - readinessProbe: - exec: - command: - - sh - - -c - - test -f /etc/php84/php-fpm.d/www.conf - livenessProbe: - exec: - command: - - php - - bin/console - - -V - initialDelaySeconds: 10 - periodSeconds: 30 - resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 - envFrom: - - configMapRef: - name: hydra-sql-env - 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_LOG_LEVEL - value: warning - - name: OPCACHE_VALIDATE_TIMESTAMP - value: "0" - - name: OPCACHE_REVALIDATE_FREQ - value: "0" - volumeMounts: - - name: hydra-sql-php-ini - mountPath: /etc/php84/conf.d/03_base.ini - subPath: 03_base.ini - - name: sql-tmp - mountPath: /tmp - - - name: hydra-sql-caddy - image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c - imagePullPolicy: IfNotPresent - args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"] readinessProbe: httpGet: path: /health @@ -88,8 +41,6 @@ spec: - configMapRef: name: hydra-sql-env env: - - name: CADDY_APP_UPSTREAM_BACKEND_SERVER - value: 127.0.0.1:9000 - name: CADDY_HTTPS_PORT value: "8443" - name: CADDY_HTTP_PORT @@ -103,10 +54,6 @@ spec: - name: CADDY_LOG_SKIP value: "true" resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 ports: - containerPort: 8080 name: http diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml index 73d18d2..d7e9ac0 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml @@ -18,60 +18,9 @@ spec: app.kubernetes.io/name: hydra-dispatcher spec: containers: - - name: hydra-dispatcher-php-fpm - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.8.28-develop.1505.75881cb - args: ["/usr/sbin/php-fpm84", "-F", "-e"] - readinessProbe: - exec: - command: - - sh - - -c - - test -f /etc/php84/php-fpm.d/www.conf - livenessProbe: - exec: - command: - - 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: OPCACHE_VALIDATE_TIMESTAMP - value: "0" - - name: OPCACHE_REVALIDATE_FREQ - value: "0" - envFrom: - - configMapRef: - name: hydra-dispatcher-env - volumeMounts: - - name: hydra-dispatcher-php-ini - mountPath: /etc/php84/conf.d/03_base.ini - subPath: 03_base.ini - - name: dispatcher-tmp - mountPath: /tmp - resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 - - name: hydra-dispatcher-caddy - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.8.28-develop.1505.75881cb + - name: hydra-dispatcher + image: reg.cadoles.com/gdupont/hydra-dispatcher-base:latest imagePullPolicy: IfNotPresent - args: - [ - "/usr/sbin/caddy", - "run", - "--adapter", - "caddyfile", - "--config", - "/etc/caddy/Caddyfile", - ] readinessProbe: httpGet: path: /health @@ -90,8 +39,6 @@ spec: - configMapRef: name: hydra-dispatcher-env env: - - name: CADDY_APP_UPSTREAM_BACKEND_SERVER - value: 127.0.0.1:9000 - name: CADDY_HTTPS_PORT value: "8443" - name: CADDY_HTTP_PORT @@ -108,10 +55,6 @@ spec: - containerPort: 8080 name: http resources: {} - securityContext: - runAsNonRoot: true - runAsGroup: 1000 - runAsUser: 1000 restartPolicy: Always volumes: - name: hydra-dispatcher-php-ini