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

@@ -4,7 +4,7 @@
     name: HYDRA_DATABASE_USER
     valueFrom:
       secretKeyRef:
-        name: hydra-postgres-user
+        name: hydra-postgres-app
         key: username
 - op: add
   path: "/spec/jobTemplate/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/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)-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/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
+    size: 2Gi

components/hydra-ldap/resources/deployment.yaml

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

components/hydra-ldap/resources/service.yaml

@@ -7,9 +7,9 @@ metadata:
 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

@@ -11,6 +11,7 @@ generatorOptions:
 
 configMapGenerator:
 - name: hydra-oidc-env
+  behavior: create
   literals:
   - APP_ENV=prod
   - APP_DEBUG=false

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

@@ -17,86 +17,86 @@ spec:
         app.kubernetes.io/name: hydra-oidc
     spec:
       containers:
-        - name: hydra-oidc-php-fpm
-          image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
-          imagePullPolicy: Always
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
-            exec:
-              command:
-                - php
-                - bin/console
-                - -V
-            initialDelaySeconds: 10
-            periodSeconds: 30
-          env:
-            - name: PHP_FPM_LISTEN
-              value: 127.0.0.1:9000
-            - name: PHP_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_MEMORY_LIMIT
-              value: 128m
-          envFrom:
-            - configMapRef:
-                name: hydra-oidc-env
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
+      - name: hydra-oidc-php-fpm
+        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:
+            command:
+              - sh
+              - -c
+              - test -f /etc/php81/php-fpm.d/www.conf
+        livenessProbe:
+          exec:
+            command:
+              - php
+              - bin/console
+              - -V
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        env:
+          - name: PHP_FPM_LISTEN
+            value: 127.0.0.1:9000
+          - name: PHP_MEMORY_LIMIT
+            value: 128m
+          - name: PHP_FPM_MEMORY_LIMIT
+            value: 128m
+        envFrom:
+          - configMapRef:
+              name: hydra-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
-          imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
-          readinessProbe:
-            httpGet:
-              path: /healthy
-              port: 8080
-            initialDelaySeconds: 5
-            timeoutSeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /healthy
-              port: 8080
-            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
-              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
+      - 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: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /healthy
+            port: 8080
+          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
+            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

@@ -6,9 +6,9 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-    - name: http
-      port: 80
-      targetPort: http
+  - name: http
+    port: 80
+    targetPort: http
   selector:
     app.kubernetes.io/name: hydra-oidc
 status:

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/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

@@ -2,38 +2,31 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
 resources:
-  - ./resources/hydra-sql-service.yaml
-  - ./resources/hydra-sql-deployment.yaml
+- ./resources/hydra-sql-service.yaml
+- ./resources/hydra-sql-deployment.yaml
 
 generatorOptions:
   labels:
-    com.cadoles.forge.sso-kustom/session: redis
+     com.cadoles.forge.sso-kustom/session: redis
 
 configMapGenerator:
-  - name: hydra-sql-env
-    literals:
-      - ISSUER_URL="http://localhost:8000"
-      - BASE_URL='http://localhost:8080'
-      - HYDRA_ADMIN_BASE_URL='http://hydra:4445/admin'
-      - APP_LOCALES="fr,en"
-      - HASH_ALGO_LEGACY="sha256, bcrypt"
-      - SECURITY_PATTERN="password,salt,pepper"
-      - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
-      - DB_USER="makeMeASecret"
-      - DB_PASSWORD="makeMeASecret"
-      - REDIS_DSN="redis://redis:6379"
-      - PEPPER="MakeMeABigSecret"
-  - name: sql-login-config
-    files:
-      - ./files/sql_login.yaml
-  - name: hydra-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
+- name: hydra-sql-env
+  behavior: create
+  literals:
+  - ISSUER_URL="http://localhost:8000"
+  - BASE_URL='http://localhost:8080'
+  - HYDRA_ADMIN_BASE_URL='http://hydra:4445/admin'
+  - APP_LOCALES="fr,en"
+  - HASH_ALGO_LEGACY="sha256, bcrypt"
+  - SECURITY_PATTERN="password,salt,pepper"
+  - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
+  - DB_USER="makeMeASecret"
+  - DB_PASSWORD="makeMeASecret"
+  - REDIS_DSN="redis://redis:6379"
+  - PEPPER="MakeMeABigSecret"
+- name: sql-login-config
+  files:
+  - ./files/sql_login.yaml
+- name: hydra-sql-php-ini
+  files:
+  - ./files/03_base.ini

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

@@ -10,108 +10,113 @@ spec:
     matchLabels:
       app.kubernetes.io/name: hydra-sql
   strategy:
-    type: Recreate
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
   template:
     metadata:
       labels:
         app.kubernetes.io/name: hydra-sql
     spec:
       containers:
-        - name: hydra-sql-fpm
-          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
-          imagePullPolicy: Always
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
-            exec:
-              command:
-                - php
-                - bin/console
-                - -V
-            initialDelaySeconds: 10
-            periodSeconds: 30
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
-          envFrom:
-            - configMapRef:
-                name: hydra-sql-env
-          env:
-            - name: PHP_FPM_LISTEN
-              value: 127.0.0.1:9000
-            - name: PHP_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_LOG_LEVEL
-              value: warning
-          volumeMounts:
-            - name: sql-login-config
-              mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-              subPath: "sql_login.yaml"
-
-        - name: hydra-sql-caddy
-          image: reg.cadoles.com/cadoles/hydra-sql-base:2024.4.2-develop.953.fc87b24
-          imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 5
-            timeoutSeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
-            periodSeconds: 15
-          envFrom:
-            - configMapRef:
-                name: hydra-sql-env
-          env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
-              value: 127.0.0.1:9000
-            - name: CADDY_HTTPS_PORT
-              value: "8443"
-            - name: CADDY_HTTP_PORT
-              value: "8080"
-            - name: CADDY_DATA_FS
-              value: "/tmp/caddy"
-            - name: CADDY_APP_ROOT_PUBLIC
-              value: "/app/public/"
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
-          ports:
-            - containerPort: 8080
-              name: http
-          volumeMounts:
-            - name: sql-login-config
-              mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
-              subPath: "sql_login.yaml"
-      volumes:
+      - name: hydra-sql-fpm
+        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:
+            command:
+            - sh
+            - -c
+            - test -f /etc/php81/php-fpm.d/www.conf
+        livenessProbe:
+          exec:
+            command:
+            - php
+            - bin/console
+            - -V
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+        envFrom:
+        - configMapRef:
+            name: hydra-sql-env
+        env:
+        - name: PHP_FPM_LISTEN
+          value: 127.0.0.1:9000
+        - name: PHP_MEMORY_LIMIT
+          value: 128m
+        - name: PHP_FPM_MEMORY_LIMIT
+          value: 128m
+        - name: PHP_FPM_LOG_LEVEL
+          value: warning
+        - name: OPCACHE_VALIDATE_TIMESTAMP
+          value: "0"
+        - name: OPCACHE_REVALIDATE_FREQ
+          value: "0"
+        volumeMounts:
         - name: sql-login-config
-          configMap:
-            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
+        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
+            port: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 15
+          timeoutSeconds: 5
+          periodSeconds: 15
+        envFrom:
+        - configMapRef:
+            name: hydra-sql-env
+        env:
+        - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+          value: 127.0.0.1:9000
+        - name: CADDY_HTTPS_PORT
+          value: "8443"
+        - name: CADDY_HTTP_PORT
+          value: "8080"
+        - name: CADDY_DATA_FS
+          value: "/tmp/caddy"
+        - name: CADDY_APP_ROOT_PUBLIC
+          value: "/app/public/"
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
+        ports:
+        - containerPort: 8080
+          name: http
+        volumeMounts:
+        - name: sql-login-config
+          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
+          subPath: "sql_login.yaml"
+      volumes:
+      - name: sql-login-config
+        configMap:
+          name: sql-login-config
+      - name: hydra-sql-php-ini
+        configMap:
+          name: hydra-sql-php-ini
 
       restartPolicy: Always

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

@@ -6,9 +6,9 @@ metadata:
   name: hydra-sql
 spec:
   ports:
-    - name: http
-      port: 80
-      targetPort: http
+  - name: http
+    port: 80
+    targetPort: http
   selector:
     app.kubernetes.io/name: hydra-sql
 status:

components/oidc-test/resources/deployment.yaml

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

examples/authenticated-app/README.md

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

examples/authenticated-app/kustomization.yaml

@@ -8,7 +8,7 @@ resources:
   - ./resources/self-signed-issuer.yaml
   - ./resources/port-forwarder.yaml
 
-patches:
+patchesJson6902:
   - target:
       version: v1
       kind: ConfigMap
@@ -38,9 +38,4 @@ patches:
       version: v1alpha1
       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
+    path: patches/oidc-test-oauth2-client.yaml

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

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

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

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

@@ -10,19 +10,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
-        - ssokustom
-      secretName: ssokustom-example-tls
+  - hosts:
+    - ssokustom
+    secretName: ssokustom-example-tls
   rules:
-    - http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: oidc-test
-                port:
-                  name: http
+  - http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: oidc-test
+            port:
+              name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -34,43 +34,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
-        - ssokustom
-      secretName: ssokustom-example-tls
+  - hosts:
+    - ssokustom
+    secretName: ssokustom-example-tls
   rules:
-    - http:
-        paths:
-          - path: /auth/saml(/|$)(.*)
-            pathType: Prefix
-            backend:
-              service:
-                name: hydra-saml
-                port:
-                  name: http
----
-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
+  - http:
+      paths:
+      - path: /auth/saml(/|$)(.*)
+        pathType: Prefix
+        backend:
+          service:
+            name: hydra-saml
+            port:
+              name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -84,19 +60,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
-        - ssokustom
-      secretName: ssokustom-example-tls
+  - hosts:
+    - ssokustom
+    secretName: ssokustom-example-tls
   rules:
-    - http:
-        paths:
-          - path: /auth/dispatcher(/|$)(.*)
-            pathType: Prefix
-            backend:
-              service:
-                name: hydra-dispatcher
-                port:
-                  name: http
+  - http:
+      paths:      
+      - path: /auth/dispatcher(/|$)(.*)
+        pathType: Prefix
+        backend:
+          service:
+            name: hydra-dispatcher
+            port:
+              name: http
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -109,19 +85,19 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
-        - ssokustom
-      secretName: ssokustom-example-tls
+  - hosts:
+    - ssokustom
+    secretName: ssokustom-example-tls
   rules:
-    - http:
-        paths:
-          - path: /auth(/|$)(.*)
-            pathType: Prefix
-            backend:
-              service:
-                name: hydra
-                port:
-                  name: hydra-public
+  - http:
+      paths:      
+      - path: /auth(/|$)(.*)
+        pathType: Prefix
+        backend:
+          service:
+            name: hydra
+            port:
+              name: hydra-public
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -135,16 +111,21 @@ metadata:
 spec:
   ingressClassName: nginx
   tls:
-    - hosts:
-        - ssokustom
-      secretName: ssokustom-example-tls
+  - hosts:
+    - ssokustom
+    secretName: ssokustom-example-tls
   rules:
-    - http:
-        paths:
-          - path: /simplesaml(/|$)(.*)
-            pathType: Prefix
-            backend:
-              service:
-                name: saml-idp
-                port:
-                  name: https
+  - http:
+      paths:     
+      - path: /simplesaml(/|$)(.*)
+        pathType: Prefix
+        backend:
+          service:
+            name: saml-idp
+            port:
+              name: https
+
+     
+
+      
+          

examples/k8s/kind/cluster/kustomization.yaml

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

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

@@ -29,3 +29,6 @@ configMapGenerator:
 - 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

@@ -17,91 +17,101 @@ spec:
         app.kubernetes.io/name: hydra-dispatcher
     spec:
       containers:
-        - name: hydra-dispatcher-php-fpm
-          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
-          args: ["/usr/sbin/php-fpm81", "-F", "-e"]
-          readinessProbe:
-            exec:
-              command:
-                - sh
-                - -c
-                - test -f /etc/php81/php-fpm.d/www.conf
-          livenessProbe:
-            exec:
-              command:
-                - php
-                - bin/console
-                - -V
-            initialDelaySeconds: 10
-            periodSeconds: 30
-          env:
-            - name: PHP_FPM_LISTEN
-              value: 127.0.0.1:9000
-            - name: PHP_MEMORY_LIMIT
-              value: 128m
-            - name: PHP_FPM_MEMORY_LIMIT
-              value: 128m
-          envFrom:
-            - configMapRef:
-                name: hydra-dispatcher-env
-          volumeMounts:
-            - mountPath: /app/config/hydra
-              name: hydra-dispatcher-apps
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
-        - name: hydra-dispatcher-caddy
-          image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.4.2-develop.1411.74a9f16
-          imagePullPolicy: Always
-          args:
-            [
-              "/usr/sbin/caddy",
-              "run",
-              "--adapter",
-              "caddyfile",
-              "--config",
-              "/etc/caddy/Caddyfile",
-            ]
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 5
-            timeoutSeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
-            periodSeconds: 15
-          envFrom:
-            - configMapRef:
-                name: hydra-dispatcher-env
-          env:
-            - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
-              value: 127.0.0.1:9000
-            - name: CADDY_HTTPS_PORT
-              value: "8443"
-            - name: CADDY_HTTP_PORT
-              value: "8080"
-            - name: CADDY_DATA_FS
-              value: "/tmp/caddy"
-            - name: CADDY_APP_ROOT_PUBLIC
-              value: "/app/public/"
-          ports:
-            - containerPort: 8080
-              name: http
-          resources: {}
-          securityContext:
-            runAsNonRoot: true
-            runAsGroup: 1000
-            runAsUser: 1000
+      - name: hydra-dispatcher-php-fpm
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
+        args: ["/usr/sbin/php-fpm81", "-F", "-e"]
+        readinessProbe:
+          exec:
+            command:
+            - sh
+            - -c
+            - test -f /etc/php81/php-fpm.d/www.conf
+        livenessProbe:
+          exec:
+            command:
+            - php
+            - bin/console
+            - -V
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        env:
+        - name: PHP_FPM_LISTEN
+          value: 127.0.0.1:9000
+        - name: PHP_MEMORY_LIMIT
+          value: 128m
+        - name: PHP_FPM_MEMORY_LIMIT
+          value: 128m
+        - 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: {}
+        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: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 15
+          timeoutSeconds: 5
+          periodSeconds: 15
+        envFrom:
+        - configMapRef:
+            name: hydra-dispatcher-env
+        env:
+        - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
+          value: 127.0.0.1:9000
+        - name: CADDY_HTTPS_PORT
+          value: "8443"
+        - name: CADDY_HTTP_PORT
+          value: "8080"
+        - name: CADDY_DATA_FS
+          value: "/tmp/caddy"
+        - name: CADDY_APP_ROOT_PUBLIC
+          value: "/app/public/"
+        ports:
+        - containerPort: 8080
+          name: http
+        resources: {}
+        securityContext:
+          runAsNonRoot: true
+          runAsGroup: 1000
+          runAsUser: 1000
       restartPolicy: Always
       volumes:
-        - name: hydra-dispatcher-apps
-          configMap:
-            name: hydra-dispatcher-apps
+      - name: hydra-dispatcher-apps
+        configMap:
+          name: hydra-dispatcher-apps
+      - name: hydra-dispatcher-php-ini
+        configMap:
+          name: hydra-dispatcher-php-ini

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

@@ -6,9 +6,9 @@ metadata:
   name: hydra-dispatcher
 spec:
   ports:
-    - name: http
-      port: 80
-      targetPort: http
+  - name: http
+    port: 80
+    targetPort: http
   selector:
     app.kubernetes.io/name: hydra-dispatcher
 status:

resources/hydra/kustomization.yaml

@@ -30,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: