fix(oidc): add Caddy deployment

This commit is contained in:
cmsassot 2024-03-25 11:39:42 +01:00
parent f401748b45
commit 26d2adc26e
1 changed files with 72 additions and 67 deletions

View File

@ -1,8 +1,6 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels:
app.kubernetes.io/name: hydra-oidc
name: hydra-oidc name: hydra-oidc
spec: spec:
replicas: 1 replicas: 1
@ -18,7 +16,7 @@ spec:
spec: spec:
containers: containers:
- name: hydra-oidc-php-fpm - name: hydra-oidc-php-fpm
image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad image: reg.cadoles.com/cmsassot/hydra-oidc-test:latest
imagePullPolicy: Always imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
@ -47,10 +45,18 @@ spec:
name: hydra-oidc-env name: hydra-oidc-env
resources: {} resources: {}
- image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad - image: reg.cadoles.com/cmsassot/hydra-oidc-test:latest
imagePullPolicy: Always imagePullPolicy: Always
name: hydra-oidc-nginx name: hydra-oidc-nginx
args: ["/usr/sbin/nginx"] args:
[
"/usr/sbin/caddy",
"run",
"--adapter",
"caddyfile",
"--config",
"/etc/caddy/Caddyfile",
]
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /healthy path: /healthy
@ -65,22 +71,21 @@ spec:
initialDelaySeconds: 15 initialDelaySeconds: 15
timeoutSeconds: 5 timeoutSeconds: 5
periodSeconds: 15 periodSeconds: 15
ports:
- containerPort: 8080
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-oidc-env name: hydra-oidc-env
env: env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000 value: 127.0.0.1:9000
- name: NGINX_APP_ROOT - name: CADDY_HTTPS_PORT
value: "/public/" value: "8443"
- name: NGINX_APP_PHP_INDEX - name: CADDY_HTTP_PORT
value: "/index.php" value: "8080"
- name: NGINX_ERROR_LOG_LEVEL - name: CADDY_DATA_FS
value: "warn" value: "/tmp/caddy"
- name: NGINX_APP_PHP_NON_FILE_PATTERN - name: CADDY_APP_ROOT_PUBLIC
value: "^/index\\.php(/|$)" value: "/app/public/"
ports:
- containerPort: 8080
resources: {} resources: {}
restartPolicy: Always restartPolicy: Always