no-crd-in-deploy

components/hydra-cnpg-database/kustomization.yaml

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

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

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

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

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

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

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

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

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

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

components/hydra-ldap/resources/service.yaml

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

components/hydra-oidc/kustomization.yaml

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

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

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

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

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

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

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

components/hydra-saml/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/03_base.ini

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

components/hydra-sql/kustomization.yaml

@@ -5,13 +5,8 @@ resources:
 - ./resources/hydra-sql-service.yaml
 - ./resources/hydra-sql-deployment.yaml
 
-generatorOptions:
-  labels:
-     com.cadoles.forge.sso-kustom/session: redis
-
 configMapGenerator:
 - name: hydra-sql-env
-  behavior: create
   literals:
   - ISSUER_URL="http://localhost:8000"
   - BASE_URL='http://localhost:8080'
@@ -22,11 +17,7 @@ configMapGenerator:
   - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
   - DB_USER="makeMeASecret"
   - DB_PASSWORD="makeMeASecret"
-  - REDIS_DSN="redis://redis:6379"
   - PEPPER="MakeMeABigSecret"
 - name: sql-login-config
   files:
   - ./files/sql_login.yaml
-- name: hydra-sql-php-ini
-  files:
-  - ./files/03_base.ini

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

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

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

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

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

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,7 +3,6 @@ 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:
@@ -12,4 +11,4 @@ patchesJson6902:
       kind: ConfigMap
       name: ingress-nginx-controller
       namespace: ingress-nginx
-    path: patches/nginx-controller.yaml
+    path: patches/nginx-controller.yaml

overlays/full/kustomization.yaml

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

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

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

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

@@ -14,4 +14,4 @@ hydra:
     api_method: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_METHOD)%"
   firewall:
     additional_properties: "%env(bool:HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES)%"
-    rules: {}
+    rules: {}

resources/hydra-dispatcher/kustomization.yaml

@@ -5,10 +5,6 @@ resources:
 - ./resources/hydra-dispatcher-deployment.yaml
 - ./resources/hydra-dispatcher-service.yaml
 
-generatorOptions:
-  labels:
-     com.cadoles.forge.sso-kustom/session: redis
-
 configMapGenerator:
 - name: hydra-dispatcher-env
   literals:
@@ -25,10 +21,6 @@ configMapGenerator:
   - COOKIE_PATH=/
   - DEFAULT_LOCALE=fr
   - APP_LOCALES=fr,en
-  - REDIS_DSN="redis://redis:6379"
 - name: hydra-dispatcher-apps
   files:
   - apps.yaml=./files/hydra/default.yaml
-- name: hydra-dispatcher-php-ini
-  files:
-  - ./files/03_base.ini

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

@@ -2,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.9.24-develop.1122.f88a5eb
+        image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
         args: ["/usr/sbin/php-fpm81", "-F", "-e"]
         readinessProbe:
           exec:
@@ -41,47 +41,29 @@ 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: {}
-        securityContext:
+
-          runAsNonRoot: true
+      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
-          runAsGroup: 1000
+        imagePullPolicy: Always
-          runAsUser: 1000
+        name: hydra-dispatcher-nginx
-      - name: hydra-dispatcher-caddy
+        args: ["/usr/sbin/nginx"]
-        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
+            port: 80
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 8080
+            port: 80
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -89,29 +71,21 @@ 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
+        - name: NGINX_APP_ROOT
-          value: "8443"
+          value: "/public/"
-        - name: CADDY_HTTP_PORT
+        - name: NGINX_APP_PHP_INDEX
-          value: "8080"
+          value: "/index.php"
-        - name: CADDY_DATA_FS
+        - name: NGINX_ERROR_LOG_LEVEL
-          value: "/tmp/caddy"
+          value: "warn"
-        - name: CADDY_APP_ROOT_PUBLIC
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
-          value: "/app/public/"
+          value: "^/index\\.php(/|$)"
         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,14 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/name: hydra-dispatcher
+    io.kompose.service: hydra-dispatcher
   name: hydra-dispatcher
 spec:
   ports:
-  - name: http
+    - name: http
-    port: 80
+      port: 80
-    targetPort: http
   selector:
-    app.kubernetes.io/name: hydra-dispatcher
+    io.kompose.service: hydra-dispatcher
 status:
   loadBalancer: {}

resources/hydra/kustomization.yaml

@@ -1,43 +1,36 @@
 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-deployment.yaml
-- ./resources/hydra-service.yaml
+  - ./resources/hydra-service.yaml
-- ./resources/hydra-role.yaml
+  - ./resources/hydra-role.yaml
-- ./resources/hydra-rolebinding.yaml
+  - ./resources/hydra-rolebinding.yaml
-- ./resources/hydra-serviceaccount.yaml
+  - ./resources/hydra-serviceaccount.yaml
-- ./resources/hydra-migrate-job.yaml
+  - ./resources/hydra-migrate-job.yaml
-- ./resources/hydra-maester
+  - ./resources/hydra-maester
-- ./resources/hydra-janitor-cronjob.yaml
+  - ./resources/hydra-janitor-cronjob.yaml
 
 secretGenerator:
-- name: hydra-secret
+  - name: hydra-secret
-  literals:
+    literals:
-  - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
+      - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
 
 configMapGenerator:
-- name: hydra-env
+  - name: hydra-env
-  literals:
+    literals:
-  - URLS_SELF_ISSUER=http://localhost:4444
+      - URLS_SELF_ISSUER=http://localhost:4444
-  - URLS_LOGIN=http://hydra-login-app/login
+      - URLS_LOGIN=http://hydra-login-app/login
-  - URLS_CONSENT=http://hydra-consent-app/consent
+      - URLS_CONSENT=http://hydra-consent-app/consent
-  - URLS_LOGOUT=http://hydra-logout-app/logout
+      - URLS_LOGOUT=http://hydra-logout-app/logout
-  - HYDRA_SERVE_ALL_ARGS=--dev
+      - HYDRA_SERVE_ALL_ARGS=--dev
-  - HYDRA_DATABASE_MAX_CONN="10"
+      - LOG_LEVEL=info
-  - LOG_LEVEL=info
 
 vars:
 - name: HYDRA_MIGRATE_JOB_NAME
   objref:
     name: hydra-migrate
-    kind: Job
+    kind: Job 
     apiVersion: batch/v1
   fieldref:
-    fieldpath: metadata.name
+    fieldpath: metadata.name

resources/hydra/resources/hydra-deployment.yaml

@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    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: {}