wip: integrate hydra-sql in example environment

fix container liveness and readyness probes
fix service with correct port

components/hydra-ldap/resources/deployment.yaml

@@ -17,34 +17,34 @@ spec:
         app.kubernetes.io/version: "v1.2.2"
     spec:
       containers:
-      - name: werther
-        image: reg.cadoles.com/cadoles/hydra-werther:2023.12.6-stable.1421.15a4717
-        imagePullPolicy: IfNotPresent
-        envFrom:
-        - configMapRef:
-            name: hydra-ldap-env
-        env:
-        - name: WERTHER_WEB_DIR
-          value: "/usr/share/werther/login/"
-        - name: WERTHER_LDAP_BINDDN
-          valueFrom:
-            secretKeyRef:
-              name: hydra-ldap-sc
-              key: WERTHER_LDAP_BINDDN
-        - name: WERTHER_LDAP_BINDPW
-          valueFrom:
-            secretKeyRef:
-              name: hydra-ldap-sc
-              key: WERTHER_LDAP_BINDPW
-        ports:
-        - containerPort: 8080
-          name: hydra-ldap-http
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
-          privileged: false
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          runAsUser: 100
+        - name: werther
+          image: reg.cadoles.com/cadoles/hydra-werther:2023.12.6-stable.1421.15a4717
+          imagePullPolicy: IfNotPresent
+          envFrom:
+            - configMapRef:
+                name: hydra-ldap-env
+          env:
+            - name: WERTHER_WEB_DIR
+              value: "/usr/share/werther/login/"
+            - name: WERTHER_LDAP_BINDDN
+              valueFrom:
+                secretKeyRef:
+                  name: hydra-ldap-sc
+                  key: WERTHER_LDAP_BINDDN
+            - name: WERTHER_LDAP_BINDPW
+              valueFrom:
+                secretKeyRef:
+                  name: hydra-ldap-sc
+                  key: WERTHER_LDAP_BINDPW
+          ports:
+            - containerPort: 8080
+              name: http
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            privileged: false
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            runAsUser: 100

components/hydra-ldap/resources/service.yaml

@@ -2,14 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    io.kompose.service: hydra-ldap
+    app.kubernetes.io/name: hydra-ldap
   name: hydra-ldap
 spec:
   type: ClusterIP
   ports:
-    - name: hydra-ldap
+    - name: http
       port: 8080
-      targetPort: hydra-ldap-http
+      targetPort: http
       protocol: TCP
   selector:
     app.kubernetes.io/name: hydra-ldap

components/hydra-oidc/kustomization.yaml

@@ -2,43 +2,35 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-  - ./resources/hydra-oidc-deployment.yaml
-  - ./resources/hydra-oidc-service.yaml
+- ./resources/hydra-oidc-deployment.yaml
+- ./resources/hydra-oidc-service.yaml
 
 generatorOptions:
   labels:
-     com.cadoles.forge.sso-kustom/session: redis
+    com.cadoles.forge.sso-kustom/session: redis
 
 configMapGenerator:
-  - name: hydra-oidc-env
-    literals:
-      - APP_ENV=prod
-      - APP_DEBUG=false
-      - PHP_FPM_MEMORY_LIMIT=256m
-      - NGINX_APP_SERVER_LISTEN=80
-      - HYDRA_ADMIN_BASE_URL=http://hydra-dispatcher
-      - OIC_AUTHORIZE_ENDPOINT=https://oidc-idp/api/v1/authorize
-      - OIDC_TOKEN_ENDPOINT=https://oidc-idp/api/v1/token
-      - OIDC_USERINFO_ENDPOINT=https://oidc-idp/api/v1/userinfo
-      - POST_LOGOUT_REDIRECT_URL=http://oidc-sp/logout
-      - OIDC_LOGOUT_ENDPOINT=https://oidc-idp/api/v1/logout?%s
-      - BASE_URL=http://hydra-oidc
-      - PARAMS_TO_DELETE=[]
-      - PARAMS_TO_INSERT={}
-      - OIDC_SCOPE=openid email
-      - CLIENT_ID_FC=MyClientID
-      - CLIENT_SECRET_FC=MyClientSecret
-      - COOKIE_PATH=/
-      - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
-      - REDIS_DSN="redis://redis:6379"
-  # - name: hydra-dispatcher-apps
-  #   behavior: merge
-  #   files:
-  #     - apps.yaml=./files/hydra/oidc.yaml
-
-patchesJson6902:
-  - target:
-      version: v1
-      kind: ConfigMap
-      name: hydra-oidc-env
-    path: patches/hydra-oidc-env.yaml
+- name: hydra-oidc-env
+  literals:
+  - APP_ENV=prod
+  - APP_DEBUG=false
+  - PHP_FPM_MEMORY_LIMIT=256m
+  - NGINX_APP_SERVER_LISTEN=80
+  - HYDRA_ADMIN_BASE_URL=http://hydra-dispatcher
+  - OIC_AUTHORIZE_ENDPOINT=https://oidc-idp/api/v1/authorize
+  - OIDC_TOKEN_ENDPOINT=https://oidc-idp/api/v1/token
+  - OIDC_USERINFO_ENDPOINT=https://oidc-idp/api/v1/userinfo
+  - POST_LOGOUT_REDIRECT_URL=http://oidc-sp/logout
+  - OIDC_LOGOUT_ENDPOINT=https://oidc-idp/api/v1/logout?%s
+  - BASE_URL=http://hydra-oidc
+  - PARAMS_TO_DELETE=[]
+  - PARAMS_TO_INSERT={}
+  - OIDC_SCOPE=openid email
+  - CLIENT_ID_FC=MyClientID
+  - CLIENT_SECRET_FC=MyClientSecret
+  - COOKIE_PATH=/
+  - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
+  - REDIS_DSN="redis://redis:6379"
+  - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
+  - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
+  - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"

components/hydra-oidc/patches/hydra-oidc-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,85 +2,101 @@ 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.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:
             exec:
               command:
-              - sh
-              - -c
-              - test -f /etc/php81/php-fpm.d/www.conf
+                - sh
+                - -c
+                - test -f /etc/php81/php-fpm.d/www.conf
           livenessProbe:
             exec:
               command:
-              - php
-              - bin/console
-              - -V
+                - 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: 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
+        - 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
-              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
-            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_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
-

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,19 +2,19 @@ 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
@@ -31,7 +31,7 @@ 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:
@@ -39,6 +39,6 @@ spec:
       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,19 +2,19 @@ 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
@@ -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/files/hydra/sql.yaml

@@ -0,0 +1,30 @@
+hydra:
+  apps:
+    - id: sql
+      title:
+        fr: Connexion SQL
+        en: Login SQL
+      description:
+        fr: Authentification avec SQL
+        en: Authentication with SQL
+      login_url: "%env(string:HYDRA_DISPATCHER_SQL_LOGIN_URL)%"
+      consent_url: "%env(string:HYDRA_DISPATCHER_SQL_CONSENT_URL)%"
+      logout_url: "%env(string:HYDRA_DISPATCHER_SQL_LOGOUT_URL)%"
+      attributes_rewrite_configuration:
+        uid:
+          rules:
+            - "property_exists(consent.session.id_token, 'uid') ? consent.session.id_token.uid : null"
+        email:
+          rules:
+            - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"
+        eduPersonAffiliation:
+          rules:
+            - "property_exists(consent.session.id_token, 'eduPersonAffiliation') ? consent.session.id_token.eduPersonAffiliation : null"
+  firewall:
+    rules:
+      email:
+        required: false
+      uid:
+        required: false
+      eduPersonAffiliation:
+        required: false

components/hydra-sql/kustomization.yaml

@@ -2,27 +2,38 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-- ./resources/hydra-sql-service.yaml
-- ./resources/hydra-sql-deployment.yaml
+  - ./resources/hydra-sql-service.yaml
+  - ./resources/hydra-sql-deployment.yaml
 
 generatorOptions:
   labels:
-     com.cadoles.forge.sso-kustom/session: redis
+    com.cadoles.forge.sso-kustom/session: redis
 
 configMapGenerator:
-- name: hydra-sql-env
-  literals:
-  - ISSUER_URL="http://localhost:8000"
-  - BASE_URL='http://localhost:8080'
-  - HYDRA_ADMIN_BASE_URL='http://hydra:4445/admin'
-  - APP_LOCALES="fr,en"
-  - HASH_ALGO_LEGACY="sha256, bcrypt"
-  - SECURITY_PATTERN="password,salt,pepper"
-  - 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:
-  - ./files/sql_login.yaml
+  - name: hydra-sql-env
+    literals:
+      - ISSUER_URL="http://localhost:8000"
+      - BASE_URL='http://localhost:8080'
+      - HYDRA_ADMIN_BASE_URL='http://hydra:4445/admin'
+      - APP_LOCALES="fr,en"
+      - HASH_ALGO_LEGACY="sha256, bcrypt"
+      - SECURITY_PATTERN="password,salt,pepper"
+      - 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:
+      - ./files/sql_login.yaml
+  - name: hydra-dispatcher-apps
+    behavior: merge
+    files:
+      - ./files/hydra/sql.yaml
+
+patchesJson6902:
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-dispatcher-env
+    path: patches/hydra-dispatcher-env.yaml

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

@@ -0,0 +1,9 @@
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGIN_URL"
+  value: http://hydra-sql/login
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_CONSENT_URL"
+  value: http://hydra-sql/consent
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGOUT_URL"
+  value: http://hydra-sql/logout

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

@@ -2,99 +2,116 @@ 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:2023.12.14-develop.1107.740a756
-        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
-        resources: {}
-        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
-        volumeMounts:
-        - name: sql-login-config
-          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-          subPath: "sql_login.yaml"
+        - name: hydra-sql-fpm
+          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
+          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
+          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
+          volumeMounts:
+            - name: sql-login-config
+              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
-        imagePullPolicy: Always
-        args: ["/usr/sbin/nginx"]
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 5
-          timeoutSeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 15
-          timeoutSeconds: 5
-          periodSeconds: 15
-        envFrom:
-        - configMapRef:
-            name: hydra-sql-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(/|$)"
-        resources: {}
-        ports:
-        - containerPort: 8080
-        volumeMounts:
-        - name: sql-login-config
-          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-          subPath: "sql_login.yaml"
+        - name: hydra-sql-caddy
+          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
+          imagePullPolicy: Always
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 5
+            timeoutSeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 15
+            timeoutSeconds: 5
+            periodSeconds: 15
+          envFrom:
+            - 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
+              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"
+              subPath: "sql_login.yaml"
       volumes:
-      - name: sql-login-config
-        configMap:
-          name: sql-login-config
+        - name: sql-login-config
+          configMap:
+            name: sql-login-config
 
       restartPolicy: Always

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
-    port: 8080
+    - name: http
+      port: 80
+      targetPort: http
   selector:
-    io.kompose.service: hydra-sql
+    app.kubernetes.io/name: hydra-sql
 status:
   loadBalancer: {}

components/oidc-test/resources/deployment.yaml

@@ -23,17 +23,17 @@ spec:
             - containerPort: 8080
           resources: {}
           envFrom:
-          - configMapRef:
-              name: oidc-test-env
+            - configMapRef:
+                name: oidc-test-env
           env:
-          - name: OIDC_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: oidc-test-oauth2-client
-                key: client_id
-          - name: OIDC_CLIENT_SECRET
-            valueFrom:
-              secretKeyRef:
-                name: oidc-test-oauth2-client
-                key: client_secret
+            - name: OIDC_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: oidc-test-oauth2-client
+                  key: CLIENT_ID
+            - name: OIDC_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: oidc-test-oauth2-client
+                  key: CLIENT_SECRET
       restartPolicy: Always

examples/authenticated-app/README.md

@@ -8,35 +8,27 @@ L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
 
 1. Créer un cluster avec `kind`
 
-    ```
-    kind create cluster --config ./examples/k8s/kind/cluster-config.yaml
-    ```
+   ```
+   kind create cluster --config ./examples/k8s/kind/cluster-config.yaml
+   ```
 
 2. Déployer les opérateurs nécessaires au déploiement
 
-    ```
-    kubectl apply  -k ./examples/k8s/kind/cluster --server-side
-    ```
+   ```
+   kubectl apply  -k ./examples/k8s/kind/cluster --server-side
+   ```
 
 3. Déployer l'application
 
-    ```
-    kubectl apply -k ./examples/authenticated-app
-    ```
-
-   **Note** Il est possible d'avoir l'erreur suivante:
-
    ```
-   error: resource mapping not found for name: "app-oauth2-client" namespace: "" from "./examples/authenticated-app": no matches for kind "OAuth2Client" in version "hydra.ory.sh/v1alpha1"
+   kubectl apply -k ./examples/authenticated-app
    ```
 
-   Cette erreur est "normale" (voir https://github.com/kubernetes/kubectl/issues/1117). Dans ce cas, attendre la création de la CRD (voir ticket) puis relancer la commande.
-
 4. Ajouter l'entrée suivante dans votre fichier `/etc/hosts`
 
-    ```
-    127.0.0.1 ssokustom
-    ```
+   ```
+   127.0.0.1 ssokustom
+   ```
 
 5. Après stabilisation du déploiement, l'application devrait être accessible à l'adresse https://ssokustom
 
@@ -55,7 +47,7 @@ kind delete cluster -n sso-kustom-example
 
 #### URL utiles
 
-|URL|Description|
-|---|-----------|
-|https://ssokustom/auth/saml/Shibboleth.sso/Session|Attributs de la session SP Shibboleth|
-|https://ssokustom/auth/saml/Shibboleth.sso/Metadata|Métadonnées du SP Shibboleth|
+| URL                                                 | Description                           |
+| --------------------------------------------------- | ------------------------------------- |
+| https://ssokustom/auth/saml/Shibboleth.sso/Session  | Attributs de la session SP Shibboleth |
+| https://ssokustom/auth/saml/Shibboleth.sso/Metadata | Métadonnées du SP Shibboleth          |

examples/authenticated-app/kustomization.yaml

@@ -8,7 +8,7 @@ resources:
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
-patchesJson6902:
+patches:
   - target:
       version: v1
       kind: ConfigMap
@@ -38,4 +38,9 @@ patchesJson6902:
       version: v1alpha1
       kind: OAuth2Client
       name: oidc-test-oauth2-client
-    path: patches/oidc-test-oauth2-client.yaml
+    path: patches/oidc-test-oauth2-client.yaml
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-sql-env
+    path: patches/hydra-sql-env.yaml

examples/authenticated-app/patches/hydra-dispatcher-env.yaml

@@ -27,4 +27,14 @@
 - op: replace
   path: "/data/HYDRA_DISPATCHER_SAML_LOGOUT_URL"
   value: https://ssokustom/auth/saml/logout
-  
+
+# Hydra SQL configuration
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGIN_URL"
+  value: https://ssokustom/auth/sql/login
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_CONSENT_URL"
+  value: https://ssokustom/auth/sql/consent
+- op: replace
+  path: "/data/HYDRA_DISPATCHER_SQL_LOGOUT_URL"
+  value: https://ssokustom/auth/sql/logout

examples/authenticated-app/patches/hydra-sql-env.yaml

@@ -0,0 +1,24 @@
+- op: replace
+  path: "/data/BASE_URL"
+  value: https://ssokustom/auth/sql
+- op: replace
+  path: "/data/ISSUER_URL"
+  value: https://ssokustom
+- op: replace
+  path: "/data/ISSUER_URL"
+  value: https://ssokustom
+- op: replace
+  path: "/data/HYDRA_ADMIN_BASE_URL"
+  value: http://hydra-dispatcher
+- op: replace
+  path: "/data/DSN_REMOTE_DATABASE"
+  value: pgsql:host='postgres';port=5432;dbname=lasql
+- op: replace
+  path: "/data/REDIS_DSN"
+  value: redis://redis:6379
+- op: replace
+  path: "/data/DB_USER"
+  value: makeMeASecret
+- op: replace
+  path: "/data/DB_PASSWORD"
+  value: rmakeMeASecret

examples/authenticated-app/resources/ingress.yaml

@@ -10,19 +10,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-  - hosts:
-    - ssokustom
-    secretName: ssokustom-example-tls
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
   rules:
-  - http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: oidc-test
-            port:
-              name: http
+    - http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: oidc-test
+                port:
+                  name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -34,19 +34,43 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-  - hosts:
-    - ssokustom
-    secretName: ssokustom-example-tls
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
   rules:
-  - http:
-      paths:
-      - path: /auth/saml(/|$)(.*)
-        pathType: Prefix
-        backend:
-          service:
-            name: hydra-saml
-            port:
-              name: http
+    - http:
+        paths:
+          - path: /auth/saml(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: hydra-saml
+                port:
+                  name: http
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: auth-sql
+  annotations:
+    cert-manager.io/issuer: "self-signed"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+spec:
+  ingressClassName: nginx
+  tls:
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
+  rules:
+    - http:
+        paths:
+          - path: /auth/sql(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: hydra-sql
+                port:
+                  name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -60,19 +84,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-  - hosts:
-    - ssokustom
-    secretName: ssokustom-example-tls
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
   rules:
-  - http:
-      paths:      
-      - path: /auth/dispatcher(/|$)(.*)
-        pathType: Prefix
-        backend:
-          service:
-            name: hydra-dispatcher
-            port:
-              name: http
+    - http:
+        paths:
+          - path: /auth/dispatcher(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: hydra-dispatcher
+                port:
+                  name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -85,19 +109,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-  - hosts:
-    - ssokustom
-    secretName: ssokustom-example-tls
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
   rules:
-  - http:
-      paths:      
-      - path: /auth(/|$)(.*)
-        pathType: Prefix
-        backend:
-          service:
-            name: hydra
-            port:
-              name: hydra-public
+    - http:
+        paths:
+          - path: /auth(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: hydra
+                port:
+                  name: hydra-public
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -111,21 +135,16 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-  - hosts:
-    - ssokustom
-    secretName: ssokustom-example-tls
+    - hosts:
+        - ssokustom
+      secretName: ssokustom-example-tls
   rules:
-  - http:
-      paths:     
-      - path: /simplesaml(/|$)(.*)
-        pathType: Prefix
-        backend:
-          service:
-            name: saml-idp
-            port:
-              name: https
-
-     
-
-      
-          
+    - http:
+        paths:
+          - path: /simplesaml(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: saml-idp
+                port:
+                  name: https

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

@@ -1,10 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 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
+  - 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
+  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
 
 patchesJson6902:
   - target:

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

@@ -2,90 +2,106 @@ 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.12.15-develop.903.b675347
-        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-dispatcher-env
-        volumeMounts:
-        - mountPath: /app/config/hydra
-          name: hydra-dispatcher-apps
-        resources: {}
-
-      - image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
-        imagePullPolicy: Always
-        name: hydra-dispatcher-nginx
-        args: ["/usr/sbin/nginx"]
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 5
-          timeoutSeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 15
-          timeoutSeconds: 5
-          periodSeconds: 15
-        envFrom:
-        - configMapRef:
-            name: hydra-dispatcher-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: {}
+        - name: hydra-dispatcher-php-fpm
+          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
+          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-dispatcher-env
+          volumeMounts:
+            - mountPath: /app/config/hydra
+              name: hydra-dispatcher-apps
+          resources: {}
+          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
+          args:
+            [
+              "/usr/sbin/caddy",
+              "run",
+              "--adapter",
+              "caddyfile",
+              "--config",
+              "/etc/caddy/Caddyfile",
+            ]
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 5
+            timeoutSeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 15
+            timeoutSeconds: 5
+            periodSeconds: 15
+          envFrom:
+            - 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
+              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
-        configMap:
-          name: hydra-dispatcher-apps
+        - name: hydra-dispatcher-apps
+          configMap:
+            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,36 +1,42 @@
 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-service.yaml
-  - ./resources/hydra-role.yaml
-  - ./resources/hydra-rolebinding.yaml
-  - ./resources/hydra-serviceaccount.yaml
-  - ./resources/hydra-migrate-job.yaml
-  - ./resources/hydra-maester
-  - ./resources/hydra-janitor-cronjob.yaml
+- ./resources/hydra-deployment.yaml
+- ./resources/hydra-service.yaml
+- ./resources/hydra-role.yaml
+- ./resources/hydra-rolebinding.yaml
+- ./resources/hydra-serviceaccount.yaml
+- ./resources/hydra-migrate-job.yaml
+- ./resources/hydra-maester
+- ./resources/hydra-janitor-cronjob.yaml
 
 secretGenerator:
-  - name: hydra-secret
-    literals:
-      - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
+- name: hydra-secret
+  literals:
+  - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
 
 configMapGenerator:
-  - name: hydra-env
-    literals:
-      - URLS_SELF_ISSUER=http://localhost:4444
-      - URLS_LOGIN=http://hydra-login-app/login
-      - URLS_CONSENT=http://hydra-consent-app/consent
-      - URLS_LOGOUT=http://hydra-logout-app/logout
-      - HYDRA_SERVE_ALL_ARGS=--dev
-      - LOG_LEVEL=info
+- name: hydra-env
+  literals:
+  - URLS_SELF_ISSUER=http://localhost:4444
+  - URLS_LOGIN=http://hydra-login-app/login
+  - URLS_CONSENT=http://hydra-consent-app/consent
+  - URLS_LOGOUT=http://hydra-logout-app/logout
+  - HYDRA_SERVE_ALL_ARGS=--dev
+  - LOG_LEVEL=info
 
 vars:
 - name: HYDRA_MIGRATE_JOB_NAME
   objref:
     name: hydra-migrate
-    kind: Job 
+    kind: Job
     apiVersion: batch/v1
   fieldref:
-    fieldpath: metadata.name
+    fieldpath: metadata.name

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-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: {}