no-crd-in-deploy

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"
@@ -38,7 +39,7 @@ spec:
                   key: WERTHER_LDAP_BINDPW
           ports:
             - containerPort: 8080
-              name: http
+              name: hydra-ldap-http
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

components/hydra-ldap/resources/service.yaml

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

components/hydra-oidc/kustomization.yaml

@@ -5,10 +5,6 @@ resources:
   - ./resources/hydra-oidc-deployment.yaml
   - ./resources/hydra-oidc-service.yaml
 
-generatorOptions:
-  labels:
-    com.cadoles.forge.sso-kustom/session: redis
-
 configMapGenerator:
   - name: hydra-oidc-env
     literals:
@@ -30,7 +26,14 @@ configMapGenerator:
       - 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"
+  # - name: hydra-dispatcher-apps
+  #   behavior: merge
+  #   files:
+  #     - apps.yaml=./files/hydra/oidc.yaml
+
+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,23 +2,23 @@ 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
-          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: Always
           args: ["/usr/sbin/php-fpm81", "-F", "-e"]
           readinessProbe:
@@ -46,57 +46,41 @@ spec:
             - configMapRef:
                 name: hydra-oidc-env
           resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
 
-        - name: hydra-oidc-caddy
-          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: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
+          name: hydra-oidc-nginx
+          args: ["/usr/sbin/nginx"]
           readinessProbe:
             httpGet:
               path: /healthy
-              port: 8080
+              port: 80
             initialDelaySeconds: 5
             timeoutSeconds: 5
             periodSeconds: 10
           livenessProbe:
             httpGet:
               path: /healthy
-              port: 8080
+              port: 80
             initialDelaySeconds: 15
             timeoutSeconds: 5
             periodSeconds: 15
-          ports:
-            - containerPort: 8080
-              name: http
           envFrom:
             - configMapRef:
                 name: hydra-oidc-env
           env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+          - name: NGINX_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/"
+          - 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: {}
-          securityContext:
-            runAsNonRoot: true
-            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
-      targetPort: http
   selector:
-    app.kubernetes.io/name: hydra-oidc
+    io.kompose.service: hydra-oidc
 status:
   loadBalancer: {}

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

@@ -2,28 +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
           resources: {}
       restartPolicy: Always
 ---
@@ -31,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/hydra/sql.yaml

@@ -1,30 +0,0 @@
-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

@@ -5,10 +5,6 @@ resources:
 - ./resources/hydra-sql-service.yaml
 - ./resources/hydra-sql-deployment.yaml
 
-generatorOptions:
-  labels:
-    com.cadoles.forge.sso-kustom/session: redis
-
 configMapGenerator:
 - name: hydra-sql-env
   literals:
@@ -21,19 +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-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

@@ -1,9 +0,0 @@
-- 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,23 +2,23 @@ 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: Recreate
   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:2024.4.2-develop.953.fc87b24
+        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
         imagePullPolicy: Always
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
@@ -36,10 +36,6 @@ spec:
           initialDelaySeconds: 10
           periodSeconds: 30
         resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
         envFrom:
         - configMapRef:
             name: hydra-sql-env
@@ -57,18 +53,10 @@ spec:
           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
+      - name: hydra-sql-nginx
+        image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
         imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
+        args: ["/usr/sbin/nginx"]
         readinessProbe:
           httpGet:
             path: /health
@@ -87,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
-              value: "8443"
-            - name: CADDY_HTTP_PORT
-              value: "8080"
-            - name: CADDY_DATA_FS
-              value: "/tmp/caddy"
-            - name: CADDY_APP_ROOT_PUBLIC
-              value: "/app/public/"
+        - 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: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
         ports:
         - containerPort: 8080
-              name: http
         volumeMounts:
         - name: sql-login-config
           mountPath: "/app/config/sql_login_configuration/sql_login.yaml"

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

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

components/oidc-test/resources/deployment.yaml

@@ -30,10 +30,10 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: oidc-test-oauth2-client
-                  key: CLIENT_ID
+                key: client_id
           - name: OIDC_CLIENT_SECRET
             valueFrom:
               secretKeyRef:
                 name: oidc-test-oauth2-client
-                  key: CLIENT_SECRET
+                key: client_secret
       restartPolicy: Always

components/redis/README.md

@@ -1,22 +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`.
-Les applications peuvent utiliser le mode `sentinel` de redis
-Il est donc nécessaire donc nécessaire de disposer d'un serveur Redis pour utiliser ces applications.
-
-### Principe général de fonctionnement
-
-Un `RedisFailOver` crée un cluster redis en mode sentinel avec 3 réplicats chacun.
-
-
-### Personnalisation
-
-Via des `patches` sur la ressource `ConfigMap` via un label selector `com.cadoles.forge.sso-kustom/session=redis` il est possible de modifier la valeur du `REDIS_DSN`.
-
-
-|Clé|Description|Exemple|
-|---|-----------|-------|
-|`REDIS_DSN`| DSN du cluster Redis | `redis://rfs-sso-redis:26379?&redis_sentinel=mymaster`

components/redis/kustomization.yaml

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

components/redis/patches/hydra-apps.yaml

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

components/redis/resources/redis-failover.yaml

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

doc/README.md

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

examples/authenticated-app/README.md

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

examples/authenticated-app/kustomization.yaml

@@ -8,7 +8,7 @@ resources:
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
-patches:
+patchesJson6902:
   - target:
       version: v1
       kind: ConfigMap
@@ -39,8 +39,3 @@ patches:
       kind: OAuth2Client
       name: oidc-test-oauth2-client
     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

@@ -28,13 +28,3 @@
   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

@@ -1,24 +0,0 @@
-- 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

@@ -50,30 +50,6 @@ spec:
 ---
 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
 metadata:
   name: auth-dispatcher
   annotations:
@@ -148,3 +124,8 @@ spec:
             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

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

examples/k8s/kind/cluster/kustomization.yaml

@@ -3,9 +3,7 @@ kind: Kustomization
 resources:
 - https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
 - https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
-  - https://forge.cadoles.com/CadolesKube/c-kustom//base/redis?ref=develop
 - https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
-  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
 
 patchesJson6902:
   - target:

overlays/full/kustomization.yaml

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

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,7 +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

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

@@ -2,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-dispatcher
+    io.kompose.service: hydra-dispatcher
   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
-          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -48,33 +48,22 @@ spec:
         - 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
+
+      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
         imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
+        name: hydra-dispatcher-nginx
+        args: ["/usr/sbin/nginx"]
         readinessProbe:
           httpGet:
             path: /health
-              port: 8080
+            port: 80
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-              port: 8080
+            port: 80
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -82,24 +71,19 @@ spec:
         - configMapRef:
             name: hydra-dispatcher-env
         env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+        - name: NGINX_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/"
+        - 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: http
         resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
       restartPolicy: Always
       volumes:
       - name: hydra-dispatcher-apps

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

@@ -2,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
       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

resources/hydra/resources/hydra-deployment.yaml

@@ -2,19 +2,19 @@ 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:

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