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>

components/hydra-ldap/resources/deployment.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hydra-ldap
-  namespace: default
   labels:
     app.kubernetes.io/name: hydra-ldap
     app.kubernetes.io/version: "v1.2.2"

components/hydra-ldap/resources/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-ldap
+    app.kubernetes.io/name: hydra-ldap
   name: hydra-ldap
 spec:
   type: ClusterIP

components/hydra-oidc/kustomization.yaml

@@ -2,11 +2,15 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-  - ./resources/hydra-oidc-deployment.yaml
+- ./resources/hydra-oidc-deployment.yaml
-  - ./resources/hydra-oidc-service.yaml
+- ./resources/hydra-oidc-service.yaml
+
+generatorOptions:
+  labels:
+    com.cadoles.forge.sso-kustom/session: redis
 
 configMapGenerator:
-  - name: hydra-oidc-env
+- name: hydra-oidc-env
   literals:
   - APP_ENV=prod
   - APP_DEBUG=false
@@ -26,14 +30,7 @@ configMapGenerator:
   - CLIENT_SECRET_FC=MyClientSecret
   - COOKIE_PATH=/
   - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
-  # - name: hydra-dispatcher-apps
+  - REDIS_DSN="redis://redis:6379"
-  #   behavior: merge
+  - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
-  #   files:
+  - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
-  #     - apps.yaml=./files/hydra/oidc.yaml
+  - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"
-
-patchesJson6902:
-  - target:
-      version: v1
-      kind: ConfigMap
-      name: hydra-dispatcher-env
-    path: patches/hydra-dispatcher-env.yaml

components/hydra-oidc/patches/hydra-dispatcher-env.yaml

@@ -1,9 +0,0 @@
-- op: replace
-  path: "/data/HYDRA_DISPATCHER_OIDC_LOGIN_URL"
-  value: http://hydra-oidc/login
-- op: replace
-  path: "/data/HYDRA_DISPATCHER_OIDC_CONSENT_URL"
-  value: http://hydra-oidc/consent
-- op: replace
-  path: "/data/HYDRA_DISPATCHER_OIDC_LOGOUT_URL"
-  value: http://hydra-oidc/logout

components/hydra-oidc/resources/hydra-oidc-deployment.yaml

@@ -2,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-oidc
+    app.kubernetes.io/name: hydra-oidc
   name: hydra-oidc
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-oidc
+      app.kubernetes.io/name: hydra-oidc
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-oidc
+        app.kubernetes.io/name: hydra-oidc
     spec:
       containers:
       - name: hydra-oidc-php-fpm
-          image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
+        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,41 +46,57 @@ spec:
           - configMapRef:
               name: hydra-oidc-env
         resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
 
-        - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
+      - 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:
-          args: ["/usr/sbin/nginx"]
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
         readinessProbe:
           httpGet:
             path: /healthy
-              port: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /healthy
-              port: 80
+            port: 8080
           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
+          - 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: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
-

components/hydra-oidc/resources/hydra-oidc-service.yaml

@@ -2,13 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-oidc
+    app.kubernetes.io/name: hydra-oidc
   name: hydra-oidc
 spec:
   ports:
-    - name: hydra-oidc
+  - name: http
     port: 80
+    targetPort: http
   selector:
-    io.kompose.service: hydra-oidc
+    app.kubernetes.io/name: hydra-oidc
 status:
   loadBalancer: {}

components/hydra-saml/resources/hydra-saml-remote-user.yaml

@@ -2,28 +2,28 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-saml-remote-user
+    app.kubernetes.io/name: hydra-saml-remote-user
   name: hydra-saml-remote-user
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-saml-remote-user
+      app.kubernetes.io/name: hydra-saml-remote-user
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-saml-remote-user
+        app.kubernetes.io/name: hydra-saml-remote-user
     spec:
       containers:
         - name: hydra-saml-remote-user
-          image: reg.cadoles.com/cadoles/hydra-remote-user-v1:v0.0.0-233-g64fcacc
+          image: reg.cadoles.com/cadoles/hydra-remote-user-base:2023.12.11-develop.1523.5f14595
           envFrom:
             - configMapRef:
                 name: hydra-saml-env
           ports:
-            - containerPort: 80
+            - containerPort: 8080
           resources: {}
       restartPolicy: Always
 ---
@@ -31,13 +31,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-saml-remote-user
+    app.kubernetes.io/name: hydra-saml-remote-user
   name: hydra-saml-remote-user
 spec:
   ports:
     - name: http
       port: 80
+      targetPort: 8080
   selector:
-    io.kompose.service: hydra-saml-remote-user
+    app.kubernetes.io/name: hydra-saml-remote-user
 status:
   loadBalancer: {}

components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml

@@ -2,25 +2,25 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-saml-shibboleth-sp
+    app.kubernetes.io/name: hydra-saml-shibboleth-sp
   name: hydra-saml-shibboleth-sp
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-saml-shibboleth-sp
+      app.kubernetes.io/name: hydra-saml-shibboleth-sp
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-saml-shibboleth-sp
+        app.kubernetes.io/name: hydra-saml-shibboleth-sp
     spec:
       securityContext:
         fsGroup: 102
       containers:
         - name: hydra-saml-shibboleth-sp
-          image: reg.cadoles.com/cadoles/shibboleth-sp-v3:v0.0.0-233-g64fcacc
+          image: reg.cadoles.com/cadoles/shibboleth-sp-v3:2023.12.12-develop.1039.49b85e1
           envFrom:
             - configMapRef:
                 name: hydra-saml-env
@@ -41,14 +41,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-saml
+    app.kubernetes.io/name: hydra-saml
   name: hydra-saml
 spec:
   ports:
     - name: http
       port: 80
   selector:
-    io.kompose.service: hydra-saml-shibboleth-sp
+    app.kubernetes.io/name: hydra-saml-shibboleth-sp
 status:
   loadBalancer: {}
 

components/hydra-sql/kustomization.yaml

@@ -5,6 +5,10 @@ resources:
 - ./resources/hydra-sql-service.yaml
 - ./resources/hydra-sql-deployment.yaml
 
+generatorOptions:
+  labels:
+     com.cadoles.forge.sso-kustom/session: redis
+
 configMapGenerator:
 - name: hydra-sql-env
   literals:
@@ -17,6 +21,7 @@ configMapGenerator:
   - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
   - DB_USER="makeMeASecret"
   - DB_PASSWORD="makeMeASecret"
+  - REDIS_DSN="redis://redis:6379"
   - PEPPER="MakeMeABigSecret"
 - name: sql-login-config
   files:

components/hydra-sql/resources/hydra-sql-deployment.yaml

@@ -2,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-sql
+    app.kubernetes.io/name: hydra-sql
   name: hydra-sql
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-sql
+      app.kubernetes.io/name: hydra-sql
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-sql
+        app.kubernetes.io/name: hydra-sql
     spec:
       containers:
       - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.29-develop.1416.f9d7e94
         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,10 @@ spec:
           mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
           subPath: "sql_login.yaml"
 
-      - name: hydra-sql-nginx
+      - name: hydra-sql-caddy
-        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.29-develop.1416.f9d7e94
         imagePullPolicy: Always
-        args: ["/usr/sbin/nginx"]
+        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
         readinessProbe:
           httpGet:
             path: /health
@@ -75,19 +79,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
+        - 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/"
         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"

components/hydra-sql/resources/hydra-sql-service.yaml

@@ -2,13 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-sql
+    app.kubernetes.io/name: hydra-sql
   name: hydra-sql
 spec:
   ports:
-  - name: hydra-sql
+  - name: http
-    port: 8080
+    port: 80
+    targetPort: http
   selector:
-    io.kompose.service: hydra-sql
+    app.kubernetes.io/name: hydra-sql
 status:
   loadBalancer: {}

components/oidc-test/kustomization.yaml

@@ -7,7 +7,7 @@ resources:
   - ./resources/oauth2-client.yaml
 
 configMapGenerator:
-  - name: oidc-test
+  - name: oidc-test-env
     literals:
       - LOG_LEVEL=0
       - HTTP_ADDRESS=0.0.0.0:8080

components/oidc-test/resources/deployment.yaml

@@ -24,7 +24,7 @@ spec:
           resources: {}
           envFrom:
           - configMapRef:
-              name: oidc-test
+              name: oidc-test-env
           env:
           - name: OIDC_CLIENT_ID
             valueFrom:

components/redis/README.md

@@ -0,0 +1,22 @@
+# Composant `redis`
+
+### Description
+
+Les applications `hydra-dispatcher`, `hydra-sql` et `hydra-oidc` stockent dorénavant le cache et les sessions utilisateur sur un serveur Redis.
+Le DSN du serveur est défini dans leur variable d'environnement respective `REDIS_DSN`.
+Les applications peuvent utiliser le mode `sentinel` de redis
+Il est donc nécessaire donc nécessaire de disposer d'un serveur Redis pour utiliser ces applications.
+
+### Principe général de fonctionnement
+
+Un `RedisFailOver` crée un cluster redis en mode sentinel avec 3 réplicats chacun.
+
+
+### Personnalisation
+
+Via des `patches` sur la ressource `ConfigMap` via un label selector `com.cadoles.forge.sso-kustom/session=redis` il est possible de modifier la valeur du `REDIS_DSN`.
+
+
+|Clé|Description|Exemple|
+|---|-----------|-------|
+|`REDIS_DSN`| DSN du cluster Redis | `redis://rfs-sso-redis:26379?&redis_sentinel=mymaster`

components/redis/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - ./resources/redis-failover.yaml
+
+patches:
+- path: ./patches/hydra-apps.yaml
+  target:
+    kind: ConfigMap
+    labelSelector: "com.cadoles.forge.sso-kustom/session=redis"

components/redis/patches/hydra-apps.yaml

@@ -0,0 +1,3 @@
+- op: replace
+  path: "/data/REDIS_DSN"
+  value: "redis://rfs-sso-redis:26379?&redis_sentinel=mymaster"

components/redis/resources/redis-failover.yaml

@@ -0,0 +1,21 @@
+apiVersion: databases.spotahome.com/v1
+kind: RedisFailover
+metadata:
+  name: sso-redis
+spec:
+  sentinel:
+    replicas: 3
+    resources:
+      requests:
+        cpu: 100m
+      limits:
+        memory: 100Mi
+  redis:
+    replicas: 3
+    resources:
+      requests:
+        cpu: 100m
+        memory: 100Mi
+      limits:
+        cpu: 400m
+        memory: 500Mi

doc/README.md

@@ -1 +0,0 @@
-# Documentation

examples/authenticated-app/README.md

@@ -15,7 +15,7 @@ L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
 2. Déployer les opérateurs nécessaires au déploiement
 
     ```
-    kubectl kustomize --enable-helm ./examples/k8s/kind/cluster | kubectl apply -f -
+    kubectl apply  -k ./examples/k8s/kind/cluster --server-side
     ```
 
 3. Déployer l'application

examples/authenticated-app/resources/port-forwarder.yaml

@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: port-forwarder
+    app.kubernetes.io/name: port-forwarder
   name: port-forwarder
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: port-forwarder
+      app.kubernetes.io/name: port-forwarder
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: port-forwarder
+        app.kubernetes.io/name: port-forwarder
     spec:
       containers:
         - image: hpello/tcp-proxy:latest
@@ -42,7 +42,7 @@ apiVersion: v1
 metadata:
   name: ssokustom
   labels:
-    io.kompose.service: port-forwarder
+    app.kubernetes.io/name: port-forwarder
 spec:
   ports:
   - name: https
@@ -52,4 +52,4 @@ spec:
     port: 80
     targetPort: 80
   selector:
-    io.kompose.service: port-forwarder
+    app.kubernetes.io/name: port-forwarder

examples/authenticated-app/resources/saml-idp.yaml

@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: saml-idp
+    app.kubernetes.io/name: saml-idp
   name: saml-idp
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: saml-idp
+      app.kubernetes.io/name: saml-idp
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: saml-idp
+        app.kubernetes.io/name: saml-idp
     spec:
       containers:
         - image: kristophjunge/test-saml-idp:1.15
@@ -35,7 +35,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: saml-idp
+    app.kubernetes.io/name: saml-idp
   name: saml-idp
 spec:
   ports:
@@ -46,6 +46,6 @@ spec:
       port: 8443
       targetPort: 8443
   selector:
-    io.kompose.service: saml-idp
+    app.kubernetes.io/name: saml-idp
 status:
   loadBalancer: {}

examples/k8s/kind/cluster/kustomization.yaml

@@ -3,6 +3,7 @@ kind: Kustomization
 resources:
 - https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
 - https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
+- https://forge.cadoles.com/CadolesKube/c-kustom//base/redis?ref=develop
 - https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
 
 patchesJson6902:

overlays/full/kustomization.yaml

@@ -15,3 +15,4 @@ components:
 - ../../components/hydra-saml
 - ../../components/hydra-sql
 - ../../components/oidc-test
+- ../../components/redis

resources/hydra-dispatcher/kustomization.yaml

@@ -5,6 +5,10 @@ resources:
 - ./resources/hydra-dispatcher-deployment.yaml
 - ./resources/hydra-dispatcher-service.yaml
 
+generatorOptions:
+  labels:
+     com.cadoles.forge.sso-kustom/session: redis
+
 configMapGenerator:
 - name: hydra-dispatcher-env
   literals:
@@ -21,6 +25,7 @@ configMapGenerator:
   - COOKIE_PATH=/
   - DEFAULT_LOCALE=fr
   - APP_LOCALES=fr,en
+  - REDIS_DSN="redis://redis:6379"
 - name: hydra-dispatcher-apps
   files:
   - apps.yaml=./files/hydra/default.yaml

resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml

@@ -2,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-dispatcher
+    app.kubernetes.io/name: hydra-dispatcher
   name: hydra-dispatcher
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-dispatcher
+      app.kubernetes.io/name: hydra-dispatcher
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-dispatcher
+        app.kubernetes.io/name: hydra-dispatcher
     spec:
       containers:
       - name: hydra-dispatcher-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.29-develop.1417.7f64598
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -48,22 +48,33 @@ spec:
         - mountPath: /app/config/hydra
           name: hydra-dispatcher-apps
         resources: {}
-
+        securityContext:
-      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+      - name: hydra-dispatcher-caddy
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.29-develop.1139.0f72845
         imagePullPolicy: Always
-        name: hydra-dispatcher-nginx
+        args:
-        args: ["/usr/sbin/nginx"]
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
         readinessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -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
+        - 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
+          name: http
         resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
       volumes:
       - name: hydra-dispatcher-apps

resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml

@@ -2,13 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-dispatcher
+    app.kubernetes.io/name: hydra-dispatcher
   name: hydra-dispatcher
 spec:
   ports:
   - name: http
     port: 80
+    targetPort: http
   selector:
-    io.kompose.service: hydra-dispatcher
+    app.kubernetes.io/name: hydra-dispatcher
 status:
   loadBalancer: {}

resources/hydra/kustomization.yaml

@@ -1,23 +1,29 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+images:
+- name: reg.cadoles.com/proxy_cache/oryd/hydra
+  newTag: v2.1.2
+- name: reg.cadoles.com/proxy_cache/oryd/hydra-maester
+  newTag: v0.0.32-amd64
+
 resources:
-  - ./resources/hydra-deployment.yaml
+- ./resources/hydra-deployment.yaml
-  - ./resources/hydra-service.yaml
+- ./resources/hydra-service.yaml
-  - ./resources/hydra-role.yaml
+- ./resources/hydra-role.yaml
-  - ./resources/hydra-rolebinding.yaml
+- ./resources/hydra-rolebinding.yaml
-  - ./resources/hydra-serviceaccount.yaml
+- ./resources/hydra-serviceaccount.yaml
-  - ./resources/hydra-migrate-job.yaml
+- ./resources/hydra-migrate-job.yaml
-  - ./resources/hydra-maester
+- ./resources/hydra-maester
-  - ./resources/hydra-janitor-cronjob.yaml
+- ./resources/hydra-janitor-cronjob.yaml
 
 secretGenerator:
-  - name: hydra-secret
+- name: hydra-secret
   literals:
   - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
 
 configMapGenerator:
-  - name: hydra-env
+- name: hydra-env
   literals:
   - URLS_SELF_ISSUER=http://localhost:4444
   - URLS_LOGIN=http://hydra-login-app/login

resources/hydra/resources/hydra-deployment.yaml

@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra
+    app.kubernetes.io/name: hydra
   name: hydra
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra
+      app.kubernetes.io/name: hydra
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra
+        app.kubernetes.io/name: hydra
     spec:
       serviceAccountName: hydra-sa
       initContainers:

resources/hydra/resources/hydra-maester/kustomization.yaml

@@ -2,12 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ./resources/hydra-maester-deployment.yaml
+- ./resources/hydra-maester-deployment.yaml
-  - ./resources/hydra-maester-rbac.yaml
+- ./resources/hydra-maester-rbac.yaml
-  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
 
 configMapGenerator:
-  - name: hydra-maester-env
+- name: hydra-maester-env
   literals:
   - APP_ENV=prod
   - APP_DEBUG=false

resources/hydra/resources/hydra-service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra
+    app.kubernetes.io/name: hydra
   name: hydra
 spec:
   ports:
@@ -13,6 +13,6 @@ spec:
       port: 4445
       targetPort: hydra-admin
   selector:
-    io.kompose.service: hydra
+    app.kubernetes.io/name: hydra
 status:
   loadBalancer: {}