no-crd-in-deploy

README.md

@@ -2,6 +2,10 @@
 
 Kustomization du service "SSO" (Ory Hydra)
 
+## Usage
+
+[Voir la documentation](./doc/README.md)
+
 ## Exemple
 
-Ce projet contient un exemple fonctionnel de déploiement dans le répertoire [`./examples/authenticated-app`](./examples/authenticated-app)
+Ce projet contient un exemple fonctionnel de déploiement dans le répertoire [`./examples/authenticated-app`](./examples/authenticated-app)

components/hydra-cleaner/files/hydra-cleaner.sh

@@ -1,116 +0,0 @@
-#!/bin/sh
-
-set -e
-set -o nounset
-
-# 4 tables to empty, at least
-# oidc, code, flow, authentication_session
-
-# \d hydra_oauth2_flow
-#Referenced by:
-#    TABLE "hydra_oauth2_access" CONSTRAINT "hydra_oauth2_access_challenge_id_fk" FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE
-#    TABLE "hydra_oauth2_code" CONSTRAINT "hydra_oauth2_code_challenge_id_fk" FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE
-#    TABLE "hydra_oauth2_oidc" CONSTRAINT "hydra_oauth2_oidc_challenge_id_fk" FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE
-#    TABLE "hydra_oauth2_pkce" CONSTRAINT "hydra_oauth2_pkce_challenge_id_fk" FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE
-#    TABLE "hydra_oauth2_refresh" CONSTRAINT "hydra_oauth2_refresh_challenge_id_fk" FOREIGN KEY (challenge_id) REFERENCES hydra_oauth2_flow(consent_challenge_id) ON DELETE CASCADE
-
-# -> delete "cascade" on table "flow" cleans access, code, oidc, pkce and refresh tables.
-
-
-DSN="${DSN:-postgresql://${HYDRA_DATABASE_USER}:${HYDRA_DATABASE_PASSWORD}@${HYDRA_DATABASE_SERVICE_NAME}:${HYDRA_DATABASE_SERVICE_PORT:-5432}/hydra?sslmode=disable}"
-RETENTION_HOURS="${RETENTION_HOURS:-48}"
-BATCH_SIZE="${BATCH_SIZE:-50}"
-LIMIT="${LIMIT:-1000}"
-BEFORE_DATE="$(date +'%Y-%m-%d %H:%M:%S' --date=@$(($(date +%s) - RETENTION_HOURS * 3600)))"
-
-
-log() {
-    echo "$(date +'%d-%m-%y %H:%M:%S%z')| $1"
-}
-
-perror() {
-    log "Something went wrong, exiting."
-    trap - EXIT
-    exit 1
-}
-
-trap perror EXIT
-
-if ! [[ ${RETENTION_HOURS} =~ '^[0-9]+$' ]]; then
-    log "Error: variable RETENTION_HOURS is not a positive integer."
-    perror
-fi
-
-if ! [[ ${LIMIT} =~ '^[0-9]+$' ]]; then
-    log "Error: variable LIMIT is not a positive integer."
-    perror
-fi
-
-if ! [[ ${BATCH_SIZE} =~ '^[0-9]+$' ]]; then
-    log "Error: variable BATCH_SIZE is not a positive integer."
-    perror
-fi
-
-log "Starting hydra cleaner"
-
-log "Removing up to ${LIMIT} elements before ${BEFORE_DATE} by batch of ${BATCH_SIZE}"
-
-log "Beginning estimated size:"
-psql "${DSN}" <<EOF
-select
-  table_name, reltuples as estimate,
-  pg_size_pretty(pg_total_relation_size(quote_ident(table_name))),
-  pg_total_relation_size(quote_ident(table_name))
-from information_schema.tables left join pg_class on information_schema.tables.table_name=pg_class.relname
-where table_schema = 'public'
-order by 4 desc;
-EOF
-
-
-REMAINING_ELMTS="${LIMIT}"
-while [ "${REMAINING_ELMTS}" -gt 0 ]; do
-    OUTPUT=$(psql "${DSN}" <<EOF
-DELETE
-FROM hydra_oauth2_flow
-WHERE login_challenge = ANY (
-  array(
-    SELECT login_challenge
-    FROM hydra_oauth2_flow
-    WHERE requested_at < '${BEFORE_DATE}'
-    LIMIT ${BATCH_SIZE}
-  )
-);
-EOF
-    )
-
-    log "${OUTPUT}"
-
-    if ! [[ "${OUTPUT}" =~ '^DELETE ' ]] ; then
-	log "Output doesn't seems OK..."
-	break
-    fi
-    OUTPUT_NB=$(echo "${OUTPUT}" | cut -d' ' -f 2)
-
-    if [ "${OUTPUT_NB}" -lt "${BATCH_SIZE}" ]; then
-	break
-    fi
-
-    REMAINING_ELMTS=$((REMAINING_ELMTS - BATCH_SIZE))
-    if [ "${REMAINING_ELMTS}" -lt "${BATCH_SIZE}" ]; then
-	BATCH_SIZE="${REMAINING_ELMTS}"
-    fi
-done
-
-
-log "Final estimated size:"
-psql "${DSN}" <<EOF
-select
-  table_name, reltuples as estimate,
-  pg_size_pretty(pg_total_relation_size(quote_ident(table_name))),
-  pg_total_relation_size(quote_ident(table_name))
-from information_schema.tables left join pg_class on information_schema.tables.table_name=pg_class.relname
-where table_schema = 'public'
-order by 4 desc;
-EOF
-
-trap - EXIT

components/hydra-cleaner/kustomization.yaml

@@ -1,17 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
-kind: Component
-
-resources:
-- ./resources/hydra-cleaner-cronjob.yaml
-
-configMapGenerator:
-- name: hydra-cleaner-env
-  behavior: create
-  literals:
-  - RETENTION_HOURS="48"
-  - BATCH_SIZE="100"
-  - LIMIT="1000"
-- name: hydra-cleaner-script
-  behavior: create
-  files:
-  - ./files/hydra-cleaner.sh

components/hydra-cleaner/resources/hydra-cleaner-cronjob.yaml

@@ -1,54 +0,0 @@
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: hydra-cleaner
-  labels:
-    app.kubernetes.io/name: hydra-cleaner
-spec:
-  concurrencyPolicy: Forbid
-  schedule: "30 */1 * * *"
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/name: hydra-cleaner
-        spec:
-          restartPolicy: OnFailure
-          serviceAccountName: hydra-sa
-          containers:
-          - name: hydra-cleaner
-            image: reg.cadoles.com/proxy_cache/alpine/psql:17.4
-            envFrom:
-            - configMapRef:
-                name: hydra-env
-            - configMapRef:
-                name: hydra-cleaner-env
-            imagePullPolicy: IfNotPresent
-            command: ["/hydra-cleaner.sh"]
-            env:
-            - name: HYDRA_DATABASE_USER
-              valueFrom:
-                secretKeyRef:
-                  name: hydra-postgres-app
-                  key: username
-            - name: HYDRA_DATABASE_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: hydra-postgres-app
-                  key: password
-            - name: HYDRA_DATABASE_SERVICE_NAME
-              valueFrom:
-                secretKeyRef:
-                  name: hydra-postgres-app
-                  key: host
-            args: []
-            volumeMounts:
-            - name: hydra-cleaner-script
-              mountPath: "/hydra-cleaner.sh"
-              subPath: "hydra-cleaner.sh"
-          volumes:
-          - name: hydra-cleaner-script
-            configMap:
-              name: hydra-cleaner-script
-              defaultMode: 0544

components/hydra-cnpg-database/kustomization.yaml

@@ -7,6 +7,28 @@ configurations:
 resources:
 - ./resources/hydra-cnpg-cluster.yaml
 
+secretGenerator:
+- name: hydra-postgres-admin
+  type: Secret
+  literals:
+  - username=postgres
+  - password=NotSoSecret
+- name: hydra-postgres-user
+  type: Secret
+  literals:
+  - username=hydra
+  - password=NotSoSecret
+
+
+vars:
+- name: HYDRA_DATABASE_SERVICE_NAME
+  objref:
+    name: hydra-postgres
+    kind: Cluster
+    apiVersion: postgresql.cnpg.io/v1
+  fieldref:
+    fieldpath: metadata.name
+
 patches:
 - target:
     group: apps

components/hydra-cnpg-database/patches/hydra-deployment.yaml

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-app
+        name: hydra-postgres-user
         key: username
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
@@ -12,18 +12,10 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-app
+        name: hydra-postgres-user
         key: password
-- op: add
-  path: "/spec/template/spec/containers/0/env/-"
-  value:
-    name: HYDRA_DATABASE_SERVICE_NAME
-    valueFrom:
-      secretKeyRef:
-        name: hydra-postgres-app
-        key: host
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
   value:
     name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)&max_idle_conns=$(HYDRA_DATABASE_MAX_IDLE_CONNS)&max_conn_lifetime=$(HYDRA_DATABASE_MAX_CONN_LIFETIME)&max_conn_idle_time=$(HYDRA_DATABASE_MAX_CONN_IDLE_TIME)&connect_timeout=$(HYDRA_DATABASE_CONNECT_TIMEOUT)"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"

components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-app
+        name: hydra-postgres-user
         key: username
 - op: add
   path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
@@ -12,18 +12,10 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-app
+        name: hydra-postgres-user
         key: password
-- op: add
-  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
-  value:
-    name: HYDRA_DATABASE_SERVICE_NAME
-    valueFrom:
-      secretKeyRef:
-        name: hydra-postgres-app
-        key: host
 - op: add
   path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
   value:
     name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"

components/hydra-cnpg-database/patches/hydra-migrate-job.yaml

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-app
+        name: hydra-postgres-user
         key: username
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
@@ -12,18 +12,10 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-app
+        name: hydra-postgres-user
         key: password
-- op: add
-  path: "/spec/template/spec/containers/0/env/-"
-  value:
-    name: HYDRA_DATABASE_SERVICE_NAME
-    valueFrom:
-      secretKeyRef:
-        name: hydra-postgres-app
-        key: host
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
   value:
     name: DSN
-    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"

components/hydra-cnpg-database/resources/hydra-cnpg-cluster.yaml

@@ -5,9 +5,13 @@ metadata:
 spec:
   instances: 3
   primaryUpdateStrategy: unsupervised
+  superuserSecret:
+    name: hydra-postgres-admin
   bootstrap:
     initdb:
       database: hydra
       owner: hydra
+      secret:
+        name: hydra-postgres-user
   storage:
-    size: 2Gi
+    size: 2Gi

components/hydra-ldap/kustomization.yaml

@@ -7,7 +7,6 @@ resources:
 
 configMapGenerator:
   - name: hydra-ldap-env
-    behavior: create
     literals:
       - WERTHER_DEV_MODE=false
       - WERTHER_LDAP_ROLE_CLAIM="https://hydra/claims/roles"
@@ -22,7 +21,6 @@ configMapGenerator:
 
 secretGenerator:
   - name: hydra-ldap-sc
-    behavior: create
     literals:
       - WERTHER_LDAP_BINDDN="cn=reader,o=test,c=fr"
       - WERTHER_LDAP_BINDPW=ThisMustBeAbsolutelyChanged

components/hydra-ldap/resources/deployment.yaml

@@ -2,6 +2,7 @@ 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"
@@ -18,12 +19,14 @@ spec:
     spec:
       containers:
         - name: werther
-          image: reg.cadoles.com/cadoles/hydra-werther:2025.2.17-stable.1544.8ded23c
+          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:

components/hydra-ldap/resources/service.yaml

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

components/hydra-oidc/kustomization.yaml

@@ -2,36 +2,38 @@ 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
-  behavior: create
+    literals:
-  literals:
+      - APP_ENV=prod
-  - APP_ENV=prod
+      - APP_DEBUG=false
-  - APP_DEBUG=false
+      - PHP_FPM_MEMORY_LIMIT=256m
-  - PHP_FPM_MEMORY_LIMIT=256m
+      - NGINX_APP_SERVER_LISTEN=80
-  - NGINX_APP_SERVER_LISTEN=80
+      - HYDRA_ADMIN_BASE_URL=http://hydra-dispatcher
-  - HYDRA_ADMIN_BASE_URL=http://hydra-dispatcher
+      - OIC_AUTHORIZE_ENDPOINT=https://oidc-idp/api/v1/authorize
-  - OIC_AUTHORIZE_ENDPOINT=https://oidc-idp/api/v1/authorize
+      - OIDC_TOKEN_ENDPOINT=https://oidc-idp/api/v1/token
-  - OIDC_TOKEN_ENDPOINT=https://oidc-idp/api/v1/token
+      - OIDC_USERINFO_ENDPOINT=https://oidc-idp/api/v1/userinfo
-  - OIDC_USERINFO_ENDPOINT=https://oidc-idp/api/v1/userinfo
+      - POST_LOGOUT_REDIRECT_URL=http://oidc-sp/logout
-  - POST_LOGOUT_REDIRECT_URL=http://oidc-sp/logout
+      - OIDC_LOGOUT_ENDPOINT=https://oidc-idp/api/v1/logout?%s
-  - OIDC_LOGOUT_ENDPOINT=https://oidc-idp/api/v1/logout?%s
+      - BASE_URL=http://hydra-oidc
-  - BASE_URL=http://hydra-oidc
+      - PARAMS_TO_DELETE=[]
-  - PARAMS_TO_DELETE=[]
+      - PARAMS_TO_INSERT={}
-  - PARAMS_TO_INSERT={}
+      - OIDC_SCOPE=openid email
-  - OIDC_SCOPE=openid email
+      - CLIENT_ID_FC=MyClientID
-  - CLIENT_ID_FC=MyClientID
+      - CLIENT_SECRET_FC=MyClientSecret
-  - CLIENT_SECRET_FC=MyClientSecret
+      - COOKIE_PATH=/
-  - COOKIE_PATH=/
+      - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
-  - 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

@@ -0,0 +1,9 @@
+- 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,101 +2,85 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-oidc
+    io.kompose.service: hydra-oidc
   name: hydra-oidc
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: hydra-oidc
+      io.kompose.service: hydra-oidc
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: hydra-oidc
+        io.kompose.service: hydra-oidc
     spec:
       containers:
-      - name: hydra-oidc-php-fpm
+        - name: hydra-oidc-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
+          image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
-        imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
-        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
+          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-        readinessProbe:
+          readinessProbe:
-          exec:
+            exec:
-            command:
+              command:
               - sh
               - -c
               - test -f /etc/php81/php-fpm.d/www.conf
-        livenessProbe:
+          livenessProbe:
-          exec:
+            exec:
-            command:
+              command:
               - php
               - bin/console
               - -V
-          initialDelaySeconds: 10
+            initialDelaySeconds: 10
-          periodSeconds: 30
+            periodSeconds: 30
-        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
-        envFrom:
+          envFrom:
-          - configMapRef:
+            - configMapRef:
-              name: hydra-oidc-env
+                name: hydra-oidc-env
-        resources: {}
+          resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
 
-      - name: hydra-oidc-caddy
+        - 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
-        imagePullPolicy: IfNotPresent
+          name: hydra-oidc-nginx
-        args:
+          args: ["/usr/sbin/nginx"]
-          [
+          readinessProbe:
-            "/usr/sbin/caddy",
+            httpGet:
-            "run",
+              path: /healthy
-            "--adapter",
+              port: 80
-            "caddyfile",
+            initialDelaySeconds: 5
-            "--config",
+            timeoutSeconds: 5
-            "/etc/caddy/Caddyfile",
+            periodSeconds: 10
-          ]
+          livenessProbe:
-        readinessProbe:
+            httpGet:
-          httpGet:
+              path: /healthy
-            path: /healthy
+              port: 80
-            port: 8080
+            initialDelaySeconds: 15
-          initialDelaySeconds: 5
+            timeoutSeconds: 5
-          timeoutSeconds: 5
+            periodSeconds: 15
-          periodSeconds: 10
+          envFrom:
-        livenessProbe:
+            - configMapRef:
-          httpGet:
+                name: hydra-oidc-env
-            path: /healthy
+          env:
-            port: 8080
+          - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
-          initialDelaySeconds: 15
-          timeoutSeconds: 5
-          periodSeconds: 15
-        ports:
-          - containerPort: 8080
-            name: http
-        envFrom:
-          - configMapRef:
-              name: hydra-oidc-env
-        env:
-          - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
             value: 127.0.0.1:9000
-          - name: CADDY_HTTPS_PORT
+          - name: NGINX_APP_ROOT
-            value: "8443"
+            value: "/public/"
-          - name: CADDY_HTTP_PORT
+          - name: NGINX_APP_PHP_INDEX
-            value: "8080"
+            value: "/index.php"
-          - name: CADDY_DATA_FS
+          - name: NGINX_ERROR_LOG_LEVEL
-            value: "/tmp/caddy"
+            value: "warn"
-          - name: CADDY_APP_ROOT_PUBLIC
+          - name: NGINX_APP_PHP_NON_FILE_PATTERN
-            value: "/app/public/"
+            value: "^/index\\.php(/|$)"
-        resources: {}
+          ports:
-        securityContext:
+          - containerPort: 8080
-          runAsNonRoot: true
+          resources: {}
-          runAsGroup: 1000
-          runAsUser: 1000
       restartPolicy: Always
+

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

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

components/hydra-saml/files/hydra/saml.yaml

@@ -20,3 +20,11 @@ hydra:
         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-saml/resources/hydra-saml-remote-user.yaml

@@ -2,30 +2,28 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-saml-remote-user
+    io.kompose.service: hydra-saml-remote-user
   name: hydra-saml-remote-user
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: hydra-saml-remote-user
+      io.kompose.service: hydra-saml-remote-user
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: hydra-saml-remote-user
+        io.kompose.service: hydra-saml-remote-user
     spec:
       containers:
         - name: hydra-saml-remote-user
-          image: reg.cadoles.com/cadoles/hydra-remote-user-base:2023.12.11-develop.1523.5f14595
+          image: reg.cadoles.com/cadoles/hydra-remote-user-v1:v0.0.0-233-g64fcacc
           envFrom:
             - configMapRef:
                 name: hydra-saml-env
           ports:
-            - containerPort: 8080
+            - containerPort: 80
-          command:
-            - /bin/apache2-foreground
           resources: {}
       restartPolicy: Always
 ---
@@ -33,14 +31,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-saml-remote-user
+    io.kompose.service: hydra-saml-remote-user
   name: hydra-saml-remote-user
 spec:
   ports:
     - name: http
       port: 80
-      targetPort: 8080
   selector:
-    app.kubernetes.io/name: hydra-saml-remote-user
+    io.kompose.service: 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:
-    app.kubernetes.io/name: hydra-saml-shibboleth-sp
+    io.kompose.service: hydra-saml-shibboleth-sp
   name: hydra-saml-shibboleth-sp
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: hydra-saml-shibboleth-sp
+      io.kompose.service: hydra-saml-shibboleth-sp
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: hydra-saml-shibboleth-sp
+        io.kompose.service: hydra-saml-shibboleth-sp
     spec:
       securityContext:
         fsGroup: 102
       containers:
         - name: hydra-saml-shibboleth-sp
-          image: reg.cadoles.com/cadoles/shibboleth-sp-v3:2023.12.12-develop.1039.49b85e1
+          image: reg.cadoles.com/cadoles/shibboleth-sp-v3:v0.0.0-233-g64fcacc
           envFrom:
             - configMapRef:
                 name: hydra-saml-env
@@ -41,14 +41,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-saml
+    io.kompose.service: hydra-saml
   name: hydra-saml
 spec:
   ports:
     - name: http
       port: 80
   selector:
-    app.kubernetes.io/name: hydra-saml-shibboleth-sp
+    io.kompose.service: hydra-saml-shibboleth-sp
 status:
   loadBalancer: {}
 

components/hydra-sql/files/03_base.ini

@@ -1,22 +0,0 @@
-[opcache]
-; Determines if Zend OPCache is enabled
-opcache.enable=1
-
-; Determines if Zend OPCache is enabled for the CLI version of PHP
-opcache.enable_cli=1
-
-; The OPcache shared memory storage size.
-opcache.memory_consumption=512
-
-; The maximum number of keys (scripts) in the OPcache hash table.
-; Only numbers between 200 and 1000000 are allowed.
-opcache.max_accelerated_files=20000
-
-; When disabled, you must reset the OPcache manually or restart the
-; webserver for changes to the filesystem to take effect.
-opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMP}
-
-; How often (in seconds) to check file timestamps for changes to the shared
-; memory storage allocation. ("1" means validate once per second, but only
-; once per request. "0" means always validate)
-opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}

components/hydra-sql/kustomization.yaml

@@ -5,13 +5,8 @@ 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
-  behavior: create
   literals:
   - ISSUER_URL="http://localhost:8000"
   - BASE_URL='http://localhost:8080'
@@ -22,11 +17,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:
   - ./files/sql_login.yaml
-- name: hydra-sql-php-ini
-  files:
-  - ./files/03_base.ini

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

@@ -2,27 +2,24 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-sql
+    io.kompose.service: hydra-sql
   name: hydra-sql
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: hydra-sql
+      io.kompose.service: hydra-sql
   strategy:
-    type: RollingUpdate
+    type: Recreate
-    rollingUpdate:
-      maxSurge: 25%
-      maxUnavailable: 25%
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: hydra-sql
+        io.kompose.service: hydra-sql
     spec:
       containers:
       - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2025.3.7-develop.1415.7239d84
+        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -39,10 +36,6 @@ spec:
           initialDelaySeconds: 10
           periodSeconds: 30
         resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
         envFrom:
         - configMapRef:
             name: hydra-sql-env
@@ -55,22 +48,15 @@ spec:
           value: 128m
         - name: PHP_FPM_LOG_LEVEL
           value: warning
-        - name: OPCACHE_VALIDATE_TIMESTAMP
-          value: "0"
-        - name: OPCACHE_REVALIDATE_FREQ
-          value: "0"
         volumeMounts:
         - name: sql-login-config
           mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
           subPath: "sql_login.yaml"
-        - name: hydra-sql-php-ini
-          mountPath: /etc/php81/conf.d/03_base.ini
-          subPath: 03_base.ini
 
-      - name: hydra-sql-caddy
+      - name: hydra-sql-nginx
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2025.3.7-develop.1415.7239d84
+        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
-        args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
+        args: ["/usr/sbin/nginx"]
         readinessProbe:
           httpGet:
             path: /health
@@ -89,24 +75,19 @@ spec:
         - configMapRef:
             name: hydra-sql-env
         env:
-        - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
           value: 127.0.0.1:9000
-        - name: CADDY_HTTPS_PORT
+        - name: NGINX_APP_ROOT
-          value: "8443"
+          value: "/public"
-        - name: CADDY_HTTP_PORT
+        - name: NGINX_APP_PHP_INDEX
-          value: "8080"
+          value: "/index.php"
-        - name: CADDY_DATA_FS
+        - name: NGINX_ERROR_LOG_LEVEL
-          value: "/tmp/caddy"
+          value: "warn"
-        - name: CADDY_APP_ROOT_PUBLIC
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "/app/public/"
+          value: "^/index\\.php(/|$)"
         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"
@@ -115,8 +96,5 @@ spec:
       - name: sql-login-config
         configMap:
           name: sql-login-config
-      - name: hydra-sql-php-ini
-        configMap:
-          name: hydra-sql-php-ini
 
       restartPolicy: Always

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

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

components/oidc-test/kustomization.yaml

@@ -17,5 +17,4 @@ configMapGenerator:
       - OIDC_REDIRECT_URL=https://example.net/oauth2/callback
       - OIDC_POST_LOGOUT_REDIRECT_URL=https://example.net
       - OIDC_SKIP_ISSUER_VERIFICATION="true"
-      - OIDC_SCOPES="openid profile"
+      - OIDC_INSECURE_SKIP_VERIFY="true"
-      - OIDC_INSECURE_SKIP_VERIFY="true"

components/oidc-test/resources/deployment.yaml

@@ -17,23 +17,23 @@ spec:
         app.kubernetes.io/name: oidc-test
     spec:
       containers:
-        - image: reg.cadoles.com/cadoles/oidc-test:2025.3.11-stable.1428.6545cb3
+        - image: reg.cadoles.com/cadoles/oidc-test:2023.12.6-stable.1502.ebfd504
           name: oidc-test
           ports:
             - containerPort: 8080
           resources: {}
           envFrom:
-            - configMapRef:
+          - configMapRef:
-                name: oidc-test-env
+              name: oidc-test-env
           env:
-            - name: OIDC_CLIENT_ID
+          - name: OIDC_CLIENT_ID
-              valueFrom:
+            valueFrom:
-                secretKeyRef:
+              secretKeyRef:
-                  name: oidc-test-oauth2-client
+                name: oidc-test-oauth2-client
-                  key: CLIENT_ID
+                key: client_id
-            - name: OIDC_CLIENT_SECRET
+          - name: OIDC_CLIENT_SECRET
-              valueFrom:
+            valueFrom:
-                secretKeyRef:
+              secretKeyRef:
-                  name: oidc-test-oauth2-client
+                name: oidc-test-oauth2-client
-                  key: CLIENT_SECRET
+                key: client_secret
       restartPolicy: Always

components/oidc-test/resources/oauth2-client.yaml

@@ -6,13 +6,13 @@ spec:
   clientName: "oidc-test"
   tokenEndpointAuthMethod: "client_secret_basic"
   grantTypes:
-    - authorization_code
+  - authorization_code
-    - refresh_token
+  - refresh_token
   responseTypes:
-    - code
+  - code
-  scope: "openid email profile"
+  scope: "openid email"
   secretName: oidc-test-oauth2-client
   redirectUris:
-    - https://example.net/oauth2/callback
+  - https://example.net/oauth2/callback
   postLogoutRedirectUris:
-    - https://example.net
+  - https://example.net

components/redis/README.md

@@ -1,19 +0,0 @@
-# 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`.
-
-### Principe général de fonctionnement
-
-Un `Redis` crée une instance Redis dédiée à l'environnement SSO.
-
-### Personnalisation
-
-Un `patch` sur la ressource `ConfigMap` via un label selector `com.cadoles.forge.sso-kustom/session=redis` permet de modifier la valeur de la clé `REDIS_DSN`.
-
-| Clé         | Description          | Exemple                  |
-| ----------- | -------------------- | ------------------------ |
-| `REDIS_DSN` | DSN du cluster Redis | `redis://redis-sso:6379` |

components/redis/configurations/redis-conf.yaml

@@ -1,5 +0,0 @@
-nameReference:
-  - kind: ConfigMap
-    fieldSpecs:
-      - kind: Redis
-        path: spec/redisConfig/additionalRedisConfig

components/redis/files/redis-additional.conf

@@ -1,3 +0,0 @@
-maxmemory-policy allkeys-lru
-maxmemory 1536mb
-tcp-keepalive 90

components/redis/kustomization.yaml

@@ -1,19 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
-kind: Component
-
-configurations:
-  - ./configurations/redis-conf.yaml
-
-resources:
-  - ./resources/redis-sso.yaml
-
-configMapGenerator:
-- name: redis-sso-extra-conf
-  files:
-    - ./files/redis-additional.conf
-
-patches:
-  - path: ./patches/hydra-apps.yaml
-    target:
-      kind: ConfigMap
-      labelSelector: "com.cadoles.forge.sso-kustom/session=redis"

components/redis/patches/hydra-apps.yaml

@@ -1,3 +0,0 @@
-- op: replace
-  path: "/data/REDIS_DSN"
-  value: "redis://redis-sso:6379"

components/redis/resources/redis-sso.yaml

@@ -1,27 +0,0 @@
-apiVersion: redis.redis.opstreelabs.in/v1beta1
-kind: Redis
-metadata:
-  name: redis-sso
-spec:
-  kubernetesConfig:
-    image: reg.cadoles.com/quay/opstree/redis:v7.0.15
-    imagePullPolicy: IfNotPresent
-    resources:
-      requests:
-        cpu: 500m
-        memory: 1024Mi
-      limits:
-        cpu: 2000m
-        memory: 2048Mi
-  redisConfig:
-    additionalRedisConfig: redis-sso-extra-conf
-  storage:
-    volumeClaimTemplate:
-      spec:
-        # storageClassName: standard
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: 1Gi
-  securityContext:
-    runAsUser: 1000

doc/README.md

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

examples/authenticated-app/README.md

@@ -1,6 +1,6 @@
 # Exemple: Déploiement d'une application authentifiée avec la stack SSO
 
-L'exemple est actuellement déployé avec le composant `hydra-ldap` uniquement.
+L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
 
 ## Procédure
 
@@ -8,40 +8,37 @@ L'exemple est actuellement déployé avec le composant `hydra-ldap` 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 kustomize --enable-helm ./examples/k8s/kind/cluster | kubectl apply -f -
-   ```
+    ```
 
-   > Si une erreur du type `ensure CRDs are installed first` s'affiche, relancer la commande.
+3. Déployer l'application
 
-3. Attendre que l'opérateur Redis soit opérationnel puis patcher le `ClusterRole` de celui ci (cf. https://github.com/OT-CONTAINER-KIT/redis-operator/issues/526):
+    ```
+    kubectl apply -k ./examples/authenticated-app
+    ```
 
-   ```bash
+   **Note** Il est possible d'avoir l'erreur suivante:
-   kubectl wait -n operators --timeout 10m --for=jsonpath=".status.state"=AtLatestKnown subscription my-redis-operator
-   # On attend quelques secondes supplémentaires pour s'assurer que l'opérateur a réellement démarré
-   sleep 30
-   kubectl patch clusterroles.rbac.authorization.k8s.io $(kubectl get clusterrole | awk '/redis-operator/ {print $1}') --patch-file examples/k8s/kind/cluster/fix/redis-operator-clusterrole.yaml
-   ```
-
-4. Déployer l'application
 
    ```
-   kubectl apply -k ./examples/authenticated-app
+   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"
    ```
 
-5. Ajouter l'entrée suivante dans votre fichier `/etc/hosts`
+   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
-   ```
 
-6. Après stabilisation du déploiement, l'application devrait être accessible à l'adresse https://ssokustom
+    ```
+    127.0.0.1 ssokustom
+    ```
+
+5. Après stabilisation du déploiement, l'application devrait être accessible à l'adresse https://ssokustom
 
 #### Supprimer le cluster
 
@@ -51,15 +48,14 @@ kind delete cluster -n sso-kustom-example
 
 ## Authentification
 
-### LDAP
+### SAML
 
-#### Comptes par défaut
+- Utilisateur: `user1`
+- Mot de passe `user1pass`
 
-1. `jdoe` / `jdoe`
+#### URL utiles
-2. `jdoe2` / `jdoe`
-3. `siret1` / `siret`
-4. `siret2` / `siret`
 
-#### Gestion des comptes
+|URL|Description|
-
+|---|-----------|
-Les comptes LDAP sont définis dans le fichier [`./files/glauth.conf`](./files/glauth.conf)
+|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/files/glauth.conf

@@ -1,83 +0,0 @@
-debug = true
-
-[ldap]
-  enabled = true
-  listen = "0.0.0.0:3893"
-  tls = false
-
-[ldaps]
-  enabled = false
-
-[behaviors]
-  IgnoreCapabilities = true
-
-[backend]
-  datastore = "config"
-  baseDN = "dc=glauth,dc=com"
-
-[[users]]
-  uid = "serviceuser"
-  name = "serviceuser"
-  mail = "serviceuser@example.com"
-  uidnumber = 5001
-  primarygroup = 5502
-  # use echo -n "mysecret" | openssl dgst -sha256
-  passsha256 = "652c7dc687d98c9889304ed2e408c74b611e86a40caa51c4b43f1dd5913c5cd0" # mysecret
-    [[users.capabilities]]
-    action = "search"
-    object = "*"
-
-[[users]]
-  uid = "jdoe"
-  name = "jdoe"
-  uidnumber = 5002
-  primarygroup = 5501
-  givenname = "John"
-  sn = "Doe"
-  mail = "jdoe@example.com"
-  passsha256 = "d30a5f57532a603697ccbb51558fa02ccadd74a0c499fcf9d45b33863ee1582f" # jdoe
-    [[users.customattributes]]
-    employeetype = ["Intern", "Temp"]
-    employeenumber = [12345, 54321]
-
-[[users]]
-  uid = "jdoe2"
-  name = "jdoe2"
-  uidnumber = 5003
-  primarygroup = 5501
-  givenname = "John"
-  sn = "Doe2"
-  mail = "jdoe2@jdoe2.com"
-  passsha256 = "d30a5f57532a603697ccbb51558fa02ccadd74a0c499fcf9d45b33863ee1582f" # jdoe
-
-[[users]]
-  uid = "siret1"
-  name = "siret1"
-  uidnumber = 5004
-  primarygroup = 5501
-  givenname = "Siret"
-  sn = "Siret"
-  mail = "siret1@siret.com"
-  passsha256 = "7926ef18c7ae8eb23d4d325aa6bd81cc9ae99b429e9299a18dbd2c4729486ebc" # siret
-    [[users.customattributes]]
-    siret = ["0001"]
-
-[[users]]
-  uid = "siret2"
-  name = "siret2"
-  uidnumber = 5005
-  primarygroup = 5501
-  givenname = "Siret"
-  sn = "Siret"
-  mail = "siret2@siret.com"
-  passsha256 = "7926ef18c7ae8eb23d4d325aa6bd81cc9ae99b429e9299a18dbd2c4729486ebc" # siret
-    [[users.customattributes]]
-    siret = ["0002"]
-
-[[groups]]
-  name = "users"
-  gidnumber = 5501
-
-[[groups]]
-  name = "svcaccts"
-  gidnumber = 5502

examples/authenticated-app/files/hydra-dispatcher-apps.yaml

@@ -1,31 +0,0 @@
-hydra:
-  apps:
-    - id: ldap
-      title:
-        fr: Connexion LDAP
-        en: Login LDAP
-      description:
-        fr: Authentification avec LDAP
-        en: Authentication with LDAP
-      login_url: "%env(string:HYDRA_DISPATCHER_LDAP_LOGIN_URL)%"
-      consent_url: "%env(string:HYDRA_DISPATCHER_LDAP_CONSENT_URL)%"
-      logout_url: "%env(string:HYDRA_DISPATCHER_LDAP_LOGOUT_URL)%"
-      attributes_rewrite_configuration:
-        siret:
-          rules:
-            - "property_exists(consent.session.id_token, 'siret') ?  consent.session.id_token.siret : null"
-            - "value ?: ( consent.session.id_token.email matches '/.*@example.com$/' ? '0000' : null )"
-            - "value ?: ( consent.session.id_token.email matches '/.*@jdoe.com$/' ? '0001' : null )"
-        family_name:
-          rules:
-            - "property_exists(consent.session.id_token, 'family_name') ? consent.session.id_token.family_name : null"
-        given_name:
-          rules:
-            - "property_exists(consent.session.id_token, 'given_name') ? consent.session.id_token.given_name : null"
-        email:
-          rules:
-            - "property_exists(consent.session.id_token, 'email') ? consent.session.id_token.email : null"
-  webhook:
-    enabled: false
-  webhook_post_login:
-    enabled: false

examples/authenticated-app/kustomization.yaml

@@ -2,20 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../overlays/base
+  - ../../overlays/full
-
   - ./resources/ingress.yaml
-  - ./resources/glauth-ldap.yaml
+  - ./resources/saml-idp.yaml
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
-components:
-  - ../../components/hydra-cnpg-database
-  - ../../components/hydra-ldap
-  - ../../components/oidc-test
-  - ../../components/redis
-  - ../../components/hydra-cleaner
-
 patchesJson6902:
   - target:
       version: v1
@@ -30,13 +22,8 @@ patchesJson6902:
   - target:
       version: v1
       kind: ConfigMap
-      name: hydra-ldap-env
+      name: hydra-saml-env
-    path: patches/hydra-ldap-env.yaml
+    path: patches/hydra-saml-env.yaml
-  - target:
-      version: v1
-      kind: Secret
-      name: hydra-ldap-sc
-    path: patches/hydra-ldap-sc.yaml
   - target:
       version: v1
       kind: Secret
@@ -45,29 +32,10 @@ patchesJson6902:
   - target:
       version: v1
       kind: ConfigMap
-      name: oidc-test-env
+      name: oidc-test
     path: patches/oidc-test.yaml
   - target:
       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-cleaner-env
-    path: patches/hydra-cleaner-env.yaml
-  - target:
-      version: v1
-      kind: CronJob
-      name: hydra-cleaner
-    path: patches/hydra-cleaner.yaml
-
-configMapGenerator:
-  - name: hydra-dispatcher-apps
-    behavior: replace
-    files:
-      - ./files/hydra-dispatcher-apps.yaml
-  - name: glauth-ldap-conf
-    files:
-      - ./files/glauth.conf

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

@@ -1,9 +0,0 @@
-- op: replace
-  path: "/data/RETENTION_HOURS"
-  value: "1" # 1 HOUR
-- op: replace
-  path: "/data/BATCH_SIZE"
-  value: "100"
-- op: replace
-  path: "/data/LIMIT"
-  value: "1000"

examples/authenticated-app/patches/hydra-cleaner.yaml

@@ -1,3 +0,0 @@
-- op: replace
-  path: "/spec/schedule"
-  value: "* * * * *"

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

@@ -1,9 +1,3 @@
-- op: replace
-  path: "/data/APP_ENV"
-  value: dev
-- op: replace
-  path: "/data/APP_DEBUG"
-  value: "true"
 - op: replace
   path: "/data/HYDRA_BASE_URL"
   value: http://hydra:4444
@@ -23,13 +17,14 @@
   path: "/data/COOKIE_PATH"
   value: /auth/dispatcher
 
-# Hydra LDAP configuration
+# Hydra SAML configuration
 - op: replace
-  path: "/data/HYDRA_DISPATCHER_LDAP_LOGIN_URL"
+  path: "/data/HYDRA_DISPATCHER_SAML_LOGIN_URL"
-  value: https://ssokustom/auth/ldap/auth/login
+  value: https://ssokustom/auth/saml/login
 - op: replace
-  path: "/data/HYDRA_DISPATCHER_LDAP_CONSENT_URL"
+  path: "/data/HYDRA_DISPATCHER_SAML_CONSENT_URL"
-  value: https://ssokustom/auth/ldap/auth/consent
+  value: https://ssokustom/auth/saml/consent
 - op: replace
-  path: "/data/HYDRA_DISPATCHER_LDAP_LOGOUT_URL"
+  path: "/data/HYDRA_DISPATCHER_SAML_LOGOUT_URL"
-  value: https://ssokustom/auth/ldap/auth/logout
+  value: https://ssokustom/auth/saml/logout
+  

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

@@ -12,13 +12,4 @@
   value: https://ssokustom/auth/dispatcher/consent
 - op: replace
   path: "/data/HYDRA_SERVE_ALL_ARGS"
-  value: "--dev"
+  value: "--dev"
-- op: replace
-  path: "/data/SERVE_COOKIES_SAME_SITE_MODE"
-  value: "Lax"
-- op: replace
-  path: "/data/SERVE_COOKIES_SAME_SITE_LEGACY_WORKAROUND"
-  value: "true"
-- op: replace
-  path: "/data/SERVE_COOKIES_DOMAIN"
-  value: "ssokustom"

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

@@ -1,55 +0,0 @@
-- op: replace
-  path: "/data/WERTHER_DEV_MODE"
-  value: "true"
-
-- op: replace
-  path: "/data/WERTHER_WEB_BASE_PATH"
-  value: "/auth/ldap/"
-
-- op: replace
-  path: "/data/WERTHER_IDENTP_HYDRA_URL"
-  value: "http://hydra-dispatcher"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_ENDPOINTS"
-  value: "glauth-ldap:389"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_BASEDN"
-  value: "dc=glauth,dc=com"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_ROLE_BASEDN"
-  value: "ou=groups,dc=glauth,dc=com"
-
-- op: replace
-  path: "/data/WERTHER_IDENTP_CLAIM_SCOPES"
-  value: "uid:profile,name:profile,family_name:profile,given_name:profile,email:profile,https%3A%2F%2Fhydra%2Fclaims%2Froles:roles,siret:siret"
-
-- op: replace
-  path: "/data/WERTHER_INSECURE_SKIP_VERIFY"
-  value: "true"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_IS_TLS"
-  value: "false"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_ATTR_CLAIMS"
-  value: "name:name,sn:family_name,givenName:given_name,mail:email,siret:siret"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_CONNECTION_TIMEOUT"
-  value: "30s"
-
-- op: replace
-  path: "/data/WERTHER_LDAP_USER_SEARCH_QUERY"
-  value: "(&(objectClass=*)(|(uid=%[1]s)(mail=%[1]s)(userPrincipalName=%[1]s)(sAMAccountName=%[1]s)))"
-
-- op: replace
-  path: "/data/WERTHER_IDENTP_ACR"
-  value: "eidas1"
-
-- op: replace
-  path: "/data/WERTHER_IDENTP_AMR"
-  value: "pwd"

examples/authenticated-app/patches/hydra-ldap-sc.yaml

@@ -1,7 +0,0 @@
-- op: replace
-  path: "/data/WERTHER_LDAP_BINDDN"
-  value: "Y249c2VydmljZXVzZXIsb3U9c3ZjYWNjdHMsb3U9dXNlcnMsZGM9Z2xhdXRoLGRjPWNvbQ==" # cn=serviceuser,ou=svcaccts,ou=users,dc=glauth,dc=com
-
-- op: replace
-  path: "/data/WERTHER_LDAP_BINDPW"
-  value: "bXlzZWNyZXQ=" # mysecret

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

@@ -0,0 +1,43 @@
+- op: replace
+  path: "/data/HTTP_BASE_URL"
+  value: https://ssokustom/auth/saml
+- op: replace
+  path: "/data/COOKIE_PATH"
+  value: /auth/saml
+- op: replace
+  path: "/data/HYDRA_ADMIN_BASE_URL"
+  value: http://hydra-dispatcher
+- op: replace
+  path: "/data/LOGOUT_REDIRECT_URL_PATTERN"
+  value: https://ssokustom/auth/saml/Shibboleth.sso/Logout?return=%s
+- op: replace
+  path: "/data/PATH_PREFIX"
+  value: "/auth/saml"
+
+- op: replace
+  path: "/data/SP_ENTITY_ID"
+  value: https://ssokustom/auth/saml
+- op: replace
+  path: "/data/IDP_ENTITY_ID"
+  value: https://ssokustom/simplesaml/saml2/idp/metadata.php
+- op: replace
+  path: "/data/IDP_METADATA_URL"
+  value: https://ssokustom/simplesaml/saml2/idp/metadata.php
+- op: replace
+  path: "/data/APACHE_FORCE_HTTPS"
+  value: "true"
+- op: replace
+  path: "/data/SP_HANDLER_BASE_PATH"
+  value: "/auth/saml"
+- op: replace
+  path: "/data/SP_LOG_LEVEL"
+  value: DEBUG
+- op: replace
+  path: "/data/SP_SESSIONS_REDIRECT_LIMIT"
+  value: none
+- op: replace
+  path: "/data/SP_SESSIONS_REDIRECT_ALLOW"
+  value: https://ssokustom
+- op: replace
+  path: "/data/SP_SESSIONS_COOKIE_PROPS"
+  value: https

examples/authenticated-app/patches/oidc-test-oauth2-client.yaml

@@ -3,7 +3,4 @@
   value: https://ssokustom/oauth2/callback
 - op: replace
   path: "/spec/postLogoutRedirectUris/0"
-  value: https://ssokustom
+  value: https://ssokustom
-- op: replace
-  path: "/spec/scope"
-  value: "openid profile roles siret"

examples/authenticated-app/patches/oidc-test.yaml

@@ -4,6 +4,3 @@
 - op: replace
   path: "/data/OIDC_POST_LOGOUT_REDIRECT_URL"
   value: https://ssokustom
-- op: replace
-  path: "/data/OIDC_SCOPES"
-  value: "openid profile roles siret"

examples/authenticated-app/resources/glauth-ldap.yaml

@@ -1,55 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/name: glauth-ldap
-  name: glauth-ldap
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: glauth-ldap
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: glauth-ldap
-    spec:
-      containers:
-        - image: glauth/glauth:v2.3.2
-          name: glauth-ldap
-          ports:
-            - containerPort: 3893
-              name: ldap
-            - containerPort: 3894
-              name: ldaps
-          resources: {}
-          volumeMounts:
-            - name: glauth-ldap-conf
-              mountPath: /app/config/config.cfg
-              subPath: glauth.conf
-      restartPolicy: Always
-      volumes:
-        - name: glauth-ldap-conf
-          configMap:
-            name: glauth-ldap-conf
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/name: glauth-ldap
-  name: glauth-ldap
-spec:
-  ports:
-    - name: ldap
-      port: 389
-      targetPort: ldap
-    - name: ldaps
-      port: 636
-      targetPort: ldaps
-  selector:
-    app.kubernetes.io/name: glauth-ldap
-status:
-  loadBalancer: {}

examples/authenticated-app/resources/ingress.yaml

@@ -10,47 +10,43 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
+  - hosts:
-        - ssokustom
+    - ssokustom
-      secretName: ssokustom-example-tls
+    secretName: ssokustom-example-tls
   rules:
-    - http:
+  - http:
-        paths:
+      paths:
-          - path: /
+      - path: /
-            pathType: Prefix
+        pathType: Prefix
-            backend:
+        backend:
-              service:
+          service:
-                name: oidc-test
+            name: oidc-test
-                port:
+            port:
-                  name: http
+              name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: auth-ldap
+  name: auth-saml
   annotations:
     cert-manager.io/issuer: "self-signed"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/x-forwarded-prefix: /auth/ldap
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      proxy_set_header X-Forwarded-Proto https;
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
+  - hosts:
-        - ssokustom
+    - ssokustom
-      secretName: ssokustom-example-tls
+    secretName: ssokustom-example-tls
   rules:
-    - http:
+  - http:
-        paths:
+      paths:
-          - path: /auth/ldap(/|$)(.*)
+      - path: /auth/saml(/|$)(.*)
-            pathType: Prefix
+        pathType: Prefix
-            backend:
+        backend:
-              service:
+          service:
-                name: hydra-ldap
+            name: hydra-saml
-                port:
+            port:
-                  name: hydra-ldap
+              name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -61,24 +57,22 @@ metadata:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/x-forwarded-prefix: /auth/dispatcher
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      proxy_set_header X-Forwarded-Proto https;
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
+  - hosts:
-        - ssokustom
+    - ssokustom
-      secretName: ssokustom-example-tls
+    secretName: ssokustom-example-tls
   rules:
-    - http:
+  - http:
-        paths:
+      paths:      
-          - path: /auth/dispatcher(/|$)(.*)
+      - path: /auth/dispatcher(/|$)(.*)
-            pathType: Prefix
+        pathType: Prefix
-            backend:
+        backend:
-              service:
+          service:
-                name: hydra-dispatcher
+            name: hydra-dispatcher
-                port:
+            port:
-                  name: http
+              name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -88,22 +82,50 @@ metadata:
     cert-manager.io/issuer: "self-signed"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
-    nginx.ingress.kubernetes.io/x-forwarded-prefix: /auth
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      proxy_set_header X-Forwarded-Proto https;
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
+  - hosts:
-        - ssokustom
+    - ssokustom
-      secretName: ssokustom-example-tls
+    secretName: ssokustom-example-tls
   rules:
-    - http:
+  - http:
-        paths:
+      paths:      
-          - path: /auth(/|$)(.*)
+      - path: /auth(/|$)(.*)
-            pathType: Prefix
+        pathType: Prefix
-            backend:
+        backend:
-              service:
+          service:
-                name: hydra
+            name: hydra
-                port:
+            port:
-                  name: hydra-public
+              name: hydra-public
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: saml-idp
+  annotations:
+    cert-manager.io/issuer: "self-signed"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /simplesaml/$2
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+spec:
+  ingressClassName: nginx
+  tls:
+  - hosts:
+    - ssokustom
+    secretName: ssokustom-example-tls
+  rules:
+  - 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:
-    app.kubernetes.io/name: port-forwarder
+    io.kompose.service: port-forwarder
   name: port-forwarder
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: port-forwarder
+      io.kompose.service: port-forwarder
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: port-forwarder
+        io.kompose.service: port-forwarder
     spec:
       containers:
         - image: hpello/tcp-proxy:latest
@@ -42,7 +42,7 @@ apiVersion: v1
 metadata:
   name: ssokustom
   labels:
-    app.kubernetes.io/name: port-forwarder
+    io.kompose.service: port-forwarder
 spec:
   ports:
   - name: https
@@ -52,4 +52,4 @@ spec:
     port: 80
     targetPort: 80
   selector:
-    app.kubernetes.io/name: port-forwarder
+    io.kompose.service: port-forwarder

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

@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    io.kompose.service: saml-idp
+  name: saml-idp
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: saml-idp
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        io.kompose.service: saml-idp
+    spec:
+      containers:
+        - image: kristophjunge/test-saml-idp:1.15
+          name: saml-idp
+          ports:
+            - containerPort: 8443
+          resources: {}
+          env:
+            - name: SIMPLESAMLPHP_SP_ENTITY_ID
+              value: https://ssokustom/auth/saml
+            - name: SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE
+              value: https://ssokustom/auth/saml/Shibboleth.sso/SAML2/POST
+            - name: SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE
+              value: https://ssokustom/auth/saml/Shibboleth.sso/Logout?return=https://ssokustom
+      restartPolicy: Always
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: saml-idp
+  name: saml-idp
+spec:
+  ports:
+    - name: http
+      port: 8080
+      targetPort: 8080
+    - name: https
+      port: 8443
+      targetPort: 8443
+  selector:
+    io.kompose.service: saml-idp
+status:
+  loadBalancer: {}

examples/k8s/kind/cluster/fix/redis-operator-clusterrole.yaml

@@ -1,92 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-rules:
-  - apiGroups:
-      - redis.redis.opstreelabs.in
-    resources:
-      - rediss
-      - redisclusters
-      - redis
-      - rediscluster
-      - redisreplication
-      - redisreplications
-      - redissentinel
-      - redissentinels
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - redis.redis.opstreelabs.in
-    resources:
-      - redis/finalizers
-      - rediscluster/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - redis.redis.opstreelabs.in
-    resources:
-      - redis/status
-      - rediscluster/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-      - pods/exec
-      - services
-      - configmaps
-      - pods
-      - persistentvolumes
-      - persistentvolumeclaims
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - coordination.k8s.io
-    resources:
-      - leases
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - policy
-    resources:
-      - poddisruptionbudgets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch

examples/k8s/kind/cluster/kustomization.yaml

@@ -1,15 +1,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://forge.cadoles.com/CadolesKube/c-kustom//crds?ref=develop
+- https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
-  - https://github.com/cert-manager/cert-manager/releases/download/v1.10.0/cert-manager.yaml
+- https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
-  - ./resources/olm
+- https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
-  - https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
-  - https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
 
-patches:
+patchesJson6902:
-  - path: patches/nginx-controller.yaml
+  - target:
-    target:
+      version: v1
       kind: ConfigMap
       name: ingress-nginx-controller
       namespace: ingress-nginx
+    path: patches/nginx-controller.yaml

examples/k8s/kind/cluster/patches/nginx-controller.yaml

@@ -1,9 +1,6 @@
-kind: ConfigMap
+- op: replace
-apiVersion: v1
+  path: "/data/allow-snippet-annotations"
-metadata:
+  value: "true"
-  name: ingress-nginx-controller
+- op: replace
-data:
+  path: "/data/use-forwarded-headers"
-  allow-snippet-annotations: "true"
+  value: "true"
-  use-forwarded-headers: "true"
-  strict-validate-path-type: "false"
-  annotations-risk-level: "Critical"

examples/k8s/kind/cluster/resources/olm/kustomization.yaml

@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.31.0/olm.yaml
-  - https://forge.cadoles.com/CadolesKube/c-kustom/raw/branch/develop/base/olm/resources/mandatory-operators/resources/redis-operator.yaml

overlays/full/kustomization.yaml

@@ -14,5 +14,4 @@ components:
 - ../../components/hydra-oidc
 - ../../components/hydra-saml
 - ../../components/hydra-sql
-- ../../components/oidc-test
+- ../../components/oidc-test
-- ../../components/redis

resources/hydra-dispatcher/files/03_base.ini

@@ -1,22 +0,0 @@
-[opcache]
-; Determines if Zend OPCache is enabled
-opcache.enable=1
-
-; Determines if Zend OPCache is enabled for the CLI version of PHP
-opcache.enable_cli=1
-
-; The OPcache shared memory storage size.
-opcache.memory_consumption=512
-
-; The maximum number of keys (scripts) in the OPcache hash table.
-; Only numbers between 200 and 1000000 are allowed.
-opcache.max_accelerated_files=20000
-
-; When disabled, you must reset the OPcache manually or restart the
-; webserver for changes to the filesystem to take effect.
-opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMP}
-
-; How often (in seconds) to check file timestamps for changes to the shared
-; memory storage allocation. ("1" means validate once per second, but only
-; once per request. "0" means always validate)
-opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}

resources/hydra-dispatcher/files/hydra/default.yaml

@@ -12,5 +12,6 @@ hydra:
     api_url: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_URL)%"
     api_key: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_KEY)%"
     api_method: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_METHOD)%"
-  webhook_post_login:
+  firewall:
-    enabled: false
+    additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
+    rules: {}

resources/hydra-dispatcher/kustomization.yaml

@@ -5,10 +5,6 @@ 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:
@@ -25,10 +21,6 @@ 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
-- name: hydra-dispatcher-php-ini
-  files:
-  - ./files/03_base.ini

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

@@ -2,117 +2,90 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-dispatcher
+    io.kompose.service: hydra-dispatcher
-    com.cadoles.forge.sso-kustom/session: redis
   name: hydra-dispatcher
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: hydra-dispatcher
+      io.kompose.service: hydra-dispatcher
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: hydra-dispatcher
+        io.kompose.service: hydra-dispatcher
     spec:
       containers:
-        - name: hydra-dispatcher-php-fpm
+      - name: hydra-dispatcher-php-fpm
-          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.3.18-develop.1401.4646fbb
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
+        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
+        readinessProbe:
-            exec:
+          exec:
-              command:
+            command:
-                - sh
+            - sh
-                - -c
+            - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
+            - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
+        livenessProbe:
-            exec:
+          exec:
-              command:
+            command:
-                - php
+            - php
-                - bin/console
+            - bin/console
-                - -V
+            - -V
-            initialDelaySeconds: 10
+          initialDelaySeconds: 10
-            periodSeconds: 30
+          periodSeconds: 30
-          env:
+        env:
-            - name: PHP_FPM_LISTEN
+        - name: PHP_FPM_LISTEN
-              value: 127.0.0.1:9000
+          value: 127.0.0.1:9000
-            - name: PHP_MEMORY_LIMIT
+        - name: PHP_MEMORY_LIMIT
-              value: 128m
+          value: 128m
-            - name: PHP_FPM_MEMORY_LIMIT
+        - name: PHP_FPM_MEMORY_LIMIT
-              value: 128m
+          value: 128m
-            - name: OPCACHE_VALIDATE_TIMESTAMP
+        envFrom:
-              value: "0"
+        - configMapRef:
-            - name: OPCACHE_REVALIDATE_FREQ
+            name: hydra-dispatcher-env
-              value: "0"
+        volumeMounts:
-          envFrom:
+        - mountPath: /app/config/hydra
-            - configMapRef:
+          name: hydra-dispatcher-apps
-                name: hydra-dispatcher-env
+        resources: {}
-          volumeMounts:
+
-            - mountPath: /app/config/hydra
+      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
-              name: hydra-dispatcher-apps
+        imagePullPolicy: Always
-            - name: hydra-dispatcher-php-ini
+        name: hydra-dispatcher-nginx
-              mountPath: /etc/php81/conf.d/03_base.ini
+        args: ["/usr/sbin/nginx"]
-              subPath: 03_base.ini
+        readinessProbe:
-          resources: {}
+          httpGet:
-          securityContext:
+            path: /health
-            runAsNonRoot: true
+            port: 80
-            runAsGroup: 1000
+          initialDelaySeconds: 5
-            runAsUser: 1000
+          timeoutSeconds: 5
-        - name: hydra-dispatcher-caddy
+          periodSeconds: 10
-          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.3.18-develop.1401.4646fbb
+        livenessProbe:
-          imagePullPolicy: IfNotPresent
+          httpGet:
-          args:
+            path: /health
-            [
+            port: 80
-              "/usr/sbin/caddy",
+          initialDelaySeconds: 15
-              "run",
+          timeoutSeconds: 5
-              "--adapter",
+          periodSeconds: 15
-              "caddyfile",
+        envFrom:
-              "--config",
+        - configMapRef:
-              "/etc/caddy/Caddyfile",
+            name: hydra-dispatcher-env
-            ]
+        env:
-          readinessProbe:
+        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
-            httpGet:
+          value: 127.0.0.1:9000
-              path: /health
+        - name: NGINX_APP_ROOT
-              port: 8080
+          value: "/public/"
-            initialDelaySeconds: 5
+        - name: NGINX_APP_PHP_INDEX
-            timeoutSeconds: 5
+          value: "/index.php"
-            periodSeconds: 10
+        - name: NGINX_ERROR_LOG_LEVEL
-          livenessProbe:
+          value: "warn"
-            httpGet:
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-              path: /health
+          value: "^/index\\.php(/|$)"
-              port: 8080
+        ports:
-            initialDelaySeconds: 15
+        - containerPort: 8080
-            timeoutSeconds: 5
+        resources: {}
-            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
+      - name: hydra-dispatcher-apps
-          configMap:
+        configMap:
-            name: hydra-dispatcher-apps
+          name: hydra-dispatcher-apps
-        - name: hydra-dispatcher-php-ini
-          configMap:
-            name: hydra-dispatcher-php-ini

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

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

resources/hydra/kustomization.yaml

@@ -1,12 +1,6 @@
 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
@@ -30,22 +24,13 @@ configMapGenerator:
       - URLS_CONSENT=http://hydra-consent-app/consent
       - URLS_LOGOUT=http://hydra-logout-app/logout
       - HYDRA_SERVE_ALL_ARGS=--dev
-      - HYDRA_DATABASE_MAX_CONN="10"
-      - HYDRA_DATABASE_MAX_IDLE_CONNS="5"
-      - HYDRA_DATABASE_MAX_CONN_LIFETIME="0"  # Unlimited. ms, s, m, h
-      - HYDRA_DATABASE_MAX_CONN_IDLE_TIME="0"  # Unlimited. ms, s, m, h
-      - HYDRA_DATABASE_CONNECT_TIMEOUT="0"  # Unlimited
-      - SERVE_ADMIN_REQUEST_LOG_DISABLE_FOR_HEALTH="true"
       - LOG_LEVEL=info
 
-replacements:
+vars:
-  - source:
+- name: HYDRA_MIGRATE_JOB_NAME
-      kind: Job
+  objref:
-      name: hydra-migrate
+    name: hydra-migrate
-      fieldPath: metadata.name
+    kind: Job 
-    targets:
+    apiVersion: batch/v1
-      - select:
+  fieldref:
-          kind: Deployment
+    fieldpath: metadata.name
-          name: hydra
-        fieldPaths:
-          - spec.template.spec.initContainers.0.args.1

resources/hydra/resources/hydra-deployment.yaml

@@ -2,27 +2,27 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/name: hydra
+    io.kompose.service: hydra
   name: hydra
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: hydra
+      io.kompose.service: hydra
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: hydra
+        io.kompose.service: hydra
     spec:
       serviceAccountName: hydra-sa
       initContainers:
         - name: wait-for-migrate
           image: reg.cadoles.com/proxy_cache/groundnuty/k8s-wait-for:v1.3
           args:
-            - job
+          - job
-            - REPLACE_ME
+          - $(HYDRA_MIGRATE_JOB_NAME)
       containers:
         - name: hydra
           image: reg.cadoles.com/proxy_cache/oryd/hydra:v2.0.3
@@ -46,31 +46,10 @@ spec:
                 - wget
                 - --spider
                 - -q
-                - http://127.0.0.1:4445/health/alive
+                - http://127.0.0.1:4444/.well-known/openid-configuration
             failureThreshold: 6
             periodSeconds: 10
             timeoutSeconds: 10
-          readinessProbe:
-            exec:
-              command:
-                - wget
-                - --spider
-                - -q
-                - http://127.0.0.1:4445/health/ready
-            failureThreshold: 6
-            periodSeconds: 10
-            timeoutSeconds: 10
-          startupProbe:
-            exec:
-              command:
-                - wget
-                - --spider
-                - -q
-                - http://127.0.0.1:4445/health/ready
-            failureThreshold: 60
-            successThreshold: 1
-            periodSeconds: 1
-            timeoutSeconds: 1
           ports:
             - containerPort: 4444
               name: hydra-public
@@ -78,3 +57,4 @@ spec:
               name: hydra-admin
           resources: {}
       restartPolicy: Always
+  

resources/hydra/resources/hydra-maester/resources/hydra-maester-deployment.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: hydra-maester
     app.kubernetes.io/instance: hydra-master
-    app.kubernetes.io/version: "v0.0.25"
+    app.kubernetes.io/version: "v0.0.23"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -38,14 +38,15 @@ spec:
             - --hydra-url=$(HYDRA_ADMIN_BASE_URL)
             - --hydra-port=$(HYDRA_ADMIN_PORT)
             - --endpoint=/admin/clients
-          resources: {}
+          resources:
+            {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
               drop:
-                - ALL
+              - ALL
             privileged: false
             readOnlyRootFilesystem: true
             runAsNonRoot: true

resources/hydra/resources/hydra-service.yaml

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