From 7ab78d97aaac20bad6ba9766152c8359d19532df Mon Sep 17 00:00:00 2001
From: cmsassot <cmsassot@cadoles.com>
Date: Wed, 3 Apr 2024 09:45:24 +0200
Subject: [PATCH] feat(hydra-oidc): non root deployment with caddy

---
 .../resources/hydra-oidc-deployment.yaml      | 145 ++++++++++--------
 .../resources/hydra-oidc-service.yaml         |   4 +-
 2 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
index 9d26fa2..a6f1222 100644
--- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
@@ -17,70 +17,85 @@ spec:
         app.kubernetes.io/name: hydra-oidc
     spec:
       containers:
-      - name: hydra-oidc-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
-        imagePullPolicy: Always
-        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
-        resources: {}
+        - name: hydra-oidc-php-fpm
+          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
+          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
+          resources: {}
+          securityContext:
+            runAsNonRoot: true
+            runAsGroup: 1000
+            runAsUser: 1000
 
-      - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
-        imagePullPolicy: Always
-        name: hydra-oidc-nginx
-        args: ["/usr/sbin/nginx"]
-        readinessProbe:
-          httpGet:
-            path: /healthy
-            port: 8080
-          initialDelaySeconds: 5
-          timeoutSeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /healthy
-            port: 8080
-          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
-        resources: {}
+        - image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
+          imagePullPolicy: Always
+          name: hydra-oidc-caddy
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
+          readinessProbe:
+            httpGet:
+              path: /healthy
+              port: 8080
+            initialDelaySeconds: 5
+            timeoutSeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /healthy
+              port: 8080
+            initialDelaySeconds: 15
+            timeoutSeconds: 5
+            periodSeconds: 15
+          ports:
+            - containerPort: 8080
+          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
-
diff --git a/components/hydra-oidc/resources/hydra-oidc-service.yaml b/components/hydra-oidc/resources/hydra-oidc-service.yaml
index 5a94e1d..8cc03d1 100644
--- a/components/hydra-oidc/resources/hydra-oidc-service.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-service.yaml
@@ -6,8 +6,8 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-  - name: hydra-oidc
-    port: 8080
+    - name: hydra-oidc
+      port: 8080
   selector:
     app.kubernetes.io/name: hydra-oidc
 status: