Merge pull request 'Modification des deployements pour le passage à Caddy' (#36) from cmsassot into develop

Reviewed-on: #36 Reviewed-by: wpetit <wpetit@cadoles.com>
2024-04-04 17:09:45 +02:00 · 2024-04-04 17:09:45 +02:00 · bd317f937f
parent 380a116fa8 546f31b2dd
commit bd317f937f
6 changed files with 148 additions and 96 deletions
--- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
@ -18,7 +18,7 @@ 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:
@ -46,11 +46,23 @@ spec:
          - 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
+        ports:
+          - containerPort: 8080
+            name: http
        envFrom:
          - configMapRef:
              name: hydra-oidc-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(/|$)"
-        ports:
-        - containerPort: 8080
+          - 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
-
--- a/components/hydra-oidc/resources/hydra-oidc-service.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-service.yaml
@ -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:
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml
@ -18,7 +18,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.4.2-develop.953.fc87b24
        imagePullPolicy: Always
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
@ -36,6 +36,10 @@ spec:
          initialDelaySeconds: 10
          periodSeconds: 30
        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
        envFrom:
          - configMapRef:
              name: hydra-sql-env
@ -53,10 +57,18 @@ spec:
            mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
            subPath: "sql_login.yaml"

-      - 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.4.2-develop.953.fc87b24
        imagePullPolicy: Always
-        args: ["/usr/sbin/nginx"]
+        args:
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
        readinessProbe:
          httpGet:
            path: /health
@ -75,19 +87,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"
--- a/components/hydra-sql/resources/hydra-sql-service.yaml
+++ b/components/hydra-sql/resources/hydra-sql-service.yaml
@ -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:
--- 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:2023.12.15-develop.903.b675347
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
        readinessProbe:
          exec:
@ -48,11 +48,22 @@ spec:
        - mountPath: /app/config/hydra
          name: hydra-dispatcher-apps
        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.4.2-develop.1411.74a9f16
        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,19 +82,24 @@ 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
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
@ -7,7 +7,8 @@ metadata:
 spec:
  ports:
  - name: http
-      port: 8080
+    port: 80
+    targetPort: http
  selector:
    app.kubernetes.io/name: hydra-dispatcher
 status: