Merge pull request 'feat(pods): change image pull policy from Always to IfNotPresent' (#53) from feat/pull-policy-IfNotPresent into unstable

Reviewed-on: #53
Reviewed-by: Matthieu Lamalle <mlamalle@cadoles.com>
Reviewed-by: pcaseiro <pcaseiro@cadoles.com>

components/hydra-cnpg-database/kustomization.yaml

@@ -7,29 +7,7 @@ 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
-
-patchesJson6902:
+patches:
 - target:
     group: apps
     version: v1
@@ -42,3 +20,9 @@ patchesJson6902:
     kind: Job
     name: hydra-migrate
   path: patches/hydra-migrate-job.yaml
+- target:
+    group: batch
+    version: v1
+    kind: CronJob
+    name: hydra-janitor
+  path: patches/hydra-janitor-cronjob.yaml

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

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: username
 - op: add
   path: "/spec/template/spec/containers/0/env/-"
@@ -12,10 +12,18 @@
     name: HYDRA_DATABASE_PASSWORD
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         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)-rw:5432/hydra?sslmode=disable"
+    value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)"

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

@@ -0,0 +1,29 @@
+- op: add
+  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_USER
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-app
+        key: username
+- op: add
+  path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
+  value:
+    name: HYDRA_DATABASE_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: hydra-postgres-app
+        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"

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

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

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

@@ -5,13 +5,9 @@ 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

components/hydra-ldap/resources/deployment.yaml

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

components/hydra-ldap/resources/service.yaml

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

components/hydra-oidc/kustomization.yaml

@@ -5,8 +5,13 @@ 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
+  behavior: create
   literals:
   - APP_ENV=prod
   - APP_DEBUG=false
@@ -26,14 +31,7 @@ configMapGenerator:
   - CLIENT_SECRET_FC=MyClientSecret
   - COOKIE_PATH=/
   - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
-  # - 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
+  - REDIS_DSN="redis://redis:6379"
+  - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
+  - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
+  - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"

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

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

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

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

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

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

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

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

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

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

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

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

components/redis/README.md

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

components/redis/kustomization.yaml

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

components/redis/patches/hydra-apps.yaml

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

components/redis/resources/redis-failover.yaml

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

doc/README.md

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

examples/authenticated-app/README.md

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

examples/authenticated-app/kustomization.yaml

@@ -2,19 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../overlays/base
+  - ../../overlays/full
   - ./resources/ingress.yaml
   - ./resources/saml-idp.yaml
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
-components:
-  - ../../components/hydra-cnpg-database
-  - ../../components/oidc-test
-  #- ../../components/hydra-oidc
-  - ../../components/hydra-saml
-
-
 patchesJson6902:
   - target:
       version: v1
@@ -38,7 +31,7 @@ patchesJson6902:
     path: patches/hydra-secret.yaml
   - target:
       version: v1
-      kind: Secret
+      kind: ConfigMap
       name: oidc-test
     path: patches/oidc-test.yaml
   - target:

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

@@ -3,4 +3,4 @@
   value: https://ssokustom/oauth2/callback
 - op: replace
   path: "/spec/postLogoutRedirectUris/0"
-  value: https://ssokustom/oauth2/callback
+  value: https://ssokustom

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

@@ -1,6 +1,3 @@
-- op: replace
-  path: "/data/LOG_LEVEL"
-  value: 0
 - op: replace
   path: "/data/OIDC_REDIRECT_URL"
   value: https://ssokustom/oauth2/callback

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

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

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

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

examples/k8s/kind/cluster/kustomization.yaml

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

kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ./overlays/base

overlays/full/kustomization.yaml

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

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

@@ -0,0 +1,22 @@
+[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/kustomization.yaml

@@ -5,6 +5,10 @@ resources:
 - ./resources/hydra-dispatcher-deployment.yaml
 - ./resources/hydra-dispatcher-service.yaml
 
+generatorOptions:
+  labels:
+     com.cadoles.forge.sso-kustom/session: redis
+
 configMapGenerator:
 - name: hydra-dispatcher-env
   literals:
@@ -21,6 +25,10 @@ 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,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    io.kompose.service: hydra-dispatcher
+    app.kubernetes.io/name: hydra-dispatcher
   name: hydra-dispatcher
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: hydra-dispatcher
+      app.kubernetes.io/name: hydra-dispatcher
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        io.kompose.service: hydra-dispatcher
+        app.kubernetes.io/name: hydra-dispatcher
     spec:
       containers:
       - name: hydra-dispatcher-php-fpm
-        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -41,29 +41,47 @@ spec:
           value: 128m
         - name: PHP_FPM_MEMORY_LIMIT
           value: 128m
+        - name: OPCACHE_VALIDATE_TIMESTAMP
+          value: "0"
+        - name: OPCACHE_REVALIDATE_FREQ
+          value: "0"
         envFrom:
         - configMapRef:
             name: hydra-dispatcher-env
         volumeMounts:
         - mountPath: /app/config/hydra
           name: hydra-dispatcher-apps
+        - name: hydra-dispatcher-php-ini
+          mountPath: /etc/php81/conf.d/03_base.ini
+          subPath: 03_base.ini
         resources: {}
-
-      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
-        imagePullPolicy: Always
-        name: hydra-dispatcher-nginx
-        args: ["/usr/sbin/nginx"]
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+      - name: hydra-dispatcher-caddy
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
+        imagePullPolicy: IfNotPresent
+        args:
+          [
+            "/usr/sbin/caddy",
+            "run",
+            "--adapter",
+            "caddyfile",
+            "--config",
+            "/etc/caddy/Caddyfile",
+          ]
         readinessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -71,21 +89,29 @@ spec:
         - configMapRef:
             name: hydra-dispatcher-env
         env:
-        - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
+        - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
           value: 127.0.0.1:9000
-        - name: NGINX_APP_ROOT
-          value: "/public/"
-        - name: NGINX_APP_PHP_INDEX
-          value: "/index.php"
-        - name: NGINX_ERROR_LOG_LEVEL
-          value: "warn"
-        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "^/index\\.php(/|$)"
+        - name: CADDY_HTTPS_PORT
+          value: "8443"
+        - name: CADDY_HTTP_PORT
+          value: "8080"
+        - name: CADDY_DATA_FS
+          value: "/tmp/caddy"
+        - name: CADDY_APP_ROOT_PUBLIC
+          value: "/app/public/"
         ports:
         - containerPort: 8080
+          name: http
         resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
       volumes:
       - name: hydra-dispatcher-apps
         configMap:
           name: hydra-dispatcher-apps
+      - name: hydra-dispatcher-php-ini
+        configMap:
+          name: hydra-dispatcher-php-ini

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

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

resources/hydra/kustomization.yaml

@@ -1,6 +1,12 @@
 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
@@ -9,6 +15,7 @@ resources:
 - ./resources/hydra-serviceaccount.yaml
 - ./resources/hydra-migrate-job.yaml
 - ./resources/hydra-maester
+- ./resources/hydra-janitor-cronjob.yaml
 
 secretGenerator:
 - name: hydra-secret
@@ -23,6 +30,7 @@ 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"
   - LOG_LEVEL=info
 
 vars:

resources/hydra/resources/hydra-deployment.yaml

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

resources/hydra/resources/hydra-janitor-cronjob.yaml

@@ -0,0 +1,34 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: hydra-janitor
+  labels:
+    app.kubernetes.io/name: hydra-janitor
+spec:
+  concurrencyPolicy: Forbid
+  schedule: "0 */1 * * *"
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          labels:
+            app.kubernetes.io/name: hydra-janitor
+        spec:
+          restartPolicy: OnFailure
+          serviceAccountName: hydra-sa
+          containers:
+            - name: janitor
+              image: reg.cadoles.com/proxy_cache/oryd/hydra:v2.0.3
+              envFrom:
+              - configMapRef:
+                  name: hydra-env
+              imagePullPolicy: IfNotPresent
+              command: ["hydra"]
+              env: []
+              args:
+                - janitor
+                - --read-from-env
+                - --grants
+                - --requests
+                - --tokens
+              resources: {}

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

@@ -4,7 +4,6 @@ kind: Kustomization
 resources:
 - ./resources/hydra-maester-deployment.yaml
 - ./resources/hydra-maester-rbac.yaml
-  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
 
 configMapGenerator:
 - name: hydra-maester-env

resources/hydra/resources/hydra-service.yaml

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