Revert "fix(dispatcher): liveness probe must use the container port"

This reverts commit 0dbd5dd551.
2024-02-12 14:41:44 +01:00
25 changed files with 233 additions and 340 deletions
--- a/components/hydra-cnpg-database/kustomization.yaml
+++ b/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
--- a/components/hydra-cnpg-database/patches/hydra-deployment.yaml
+++ b/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"
--- a/components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml
+++ b/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"
--- a/components/hydra-cnpg-database/patches/hydra-migrate-job.yaml
+++ b/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"
--- a/components/hydra-cnpg-database/resources/hydra-cnpg-cluster.yaml
+++ b/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
--- a/components/hydra-ldap/resources/service.yaml
+++ b/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
--- a/components/hydra-oidc/kustomization.yaml
+++ b/components/hydra-oidc/kustomization.yaml
@ -2,36 +2,43 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component

 resources:
- ./resources/hydra-oidc-deployment.yaml
- ./resources/hydra-oidc-service.yaml
+  - ./resources/hydra-oidc-deployment.yaml
+  - ./resources/hydra-oidc-service.yaml

 generatorOptions:
  labels:
-    com.cadoles.forge.sso-kustom/session: redis
+     com.cadoles.forge.sso-kustom/session: redis

 configMapGenerator:
- name: hydra-oidc-env
-  behavior: create
-  literals:
-  - APP_ENV=prod
-  - APP_DEBUG=false
-  - PHP_FPM_MEMORY_LIMIT=256m
-  - NGINX_APP_SERVER_LISTEN=80
-  - HYDRA_ADMIN_BASE_URL=http://hydra-dispatcher
-  - OIC_AUTHORIZE_ENDPOINT=https://oidc-idp/api/v1/authorize
-  - OIDC_TOKEN_ENDPOINT=https://oidc-idp/api/v1/token
-  - OIDC_USERINFO_ENDPOINT=https://oidc-idp/api/v1/userinfo
-  - POST_LOGOUT_REDIRECT_URL=http://oidc-sp/logout
-  - OIDC_LOGOUT_ENDPOINT=https://oidc-idp/api/v1/logout?%s
-  - BASE_URL=http://hydra-oidc
-  - PARAMS_TO_DELETE=[]
-  - PARAMS_TO_INSERT={}
-  - OIDC_SCOPE=openid email
-  - CLIENT_ID_FC=MyClientID
-  - CLIENT_SECRET_FC=MyClientSecret
-  - COOKIE_PATH=/
-  - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
-  - REDIS_DSN="redis://redis:6379"
-  - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
-  - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
-  - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"
+  - name: hydra-oidc-env
+    literals:
+      - APP_ENV=prod
+      - APP_DEBUG=false
+      - PHP_FPM_MEMORY_LIMIT=256m
+      - NGINX_APP_SERVER_LISTEN=80
+      - HYDRA_ADMIN_BASE_URL=http://hydra-dispatcher
+      - OIC_AUTHORIZE_ENDPOINT=https://oidc-idp/api/v1/authorize
+      - OIDC_TOKEN_ENDPOINT=https://oidc-idp/api/v1/token
+      - OIDC_USERINFO_ENDPOINT=https://oidc-idp/api/v1/userinfo
+      - POST_LOGOUT_REDIRECT_URL=http://oidc-sp/logout
+      - OIDC_LOGOUT_ENDPOINT=https://oidc-idp/api/v1/logout?%s
+      - BASE_URL=http://hydra-oidc
+      - PARAMS_TO_DELETE=[]
+      - PARAMS_TO_INSERT={}
+      - OIDC_SCOPE=openid email
+      - CLIENT_ID_FC=MyClientID
+      - CLIENT_SECRET_FC=MyClientSecret
+      - COOKIE_PATH=/
+      - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
+      - REDIS_DSN="redis://redis:6379"
+  # - name: hydra-dispatcher-apps
+  #   behavior: merge
+  #   files:
+  #     - apps.yaml=./files/hydra/oidc.yaml
+
+patchesJson6902:
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-oidc-env
+    path: patches/hydra-oidc-env.yaml
--- a/components/hydra-oidc/patches/hydra-oidc-env.yaml
+++ b/components/hydra-oidc/patches/hydra-oidc-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
--- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
+++ b/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
-        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:
+        - name: hydra-oidc-php-fpm
+          image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
+          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:
+          livenessProbe:
+            exec:
+              command:
              - php
              - bin/console
              - -V
-          initialDelaySeconds: 10
-          periodSeconds: 30
-        env:
+            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
+          envFrom:
+            - configMapRef:
+                name: hydra-oidc-env
+          resources: {}

-      - 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
+        - image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
+          imagePullPolicy: Always
+          name: hydra-oidc-nginx
+          args: ["/usr/sbin/nginx"]
+          readinessProbe:
+            httpGet:
+              path: /healthy
+              port: 80
+            initialDelaySeconds: 5
+            timeoutSeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /healthy
+              port: 80
+            initialDelaySeconds: 15
+            timeoutSeconds: 5
+            periodSeconds: 15
+          envFrom:
+            - configMapRef:
+                name: hydra-oidc-env
+          env:
+          - name: NGINX_APP_UPSTREAM_BACKEND_SERVER
            value: 127.0.0.1:9000
-          - name: CADDY_HTTPS_PORT
-            value: "8443"
-          - name: CADDY_HTTP_PORT
-            value: "8080"
-          - name: CADDY_DATA_FS
-            value: "/tmp/caddy"
-          - name: CADDY_APP_ROOT_PUBLIC
-            value: "/app/public/"
-        resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
+          - name: NGINX_APP_ROOT
+            value: "/public/"
+          - name: NGINX_APP_PHP_INDEX
+            value: "/index.php"
+          - name: NGINX_ERROR_LOG_LEVEL
+            value: "warn"
+          - name: NGINX_APP_PHP_NON_FILE_PATTERN
+            value: "^/index\\.php(/|$)"
+          ports:
+          - containerPort: 8080
+          resources: {}
      restartPolicy: Always
+
--- a/components/hydra-oidc/resources/hydra-oidc-service.yaml
+++ b/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
-    port: 80
-    targetPort: http
+    - name: hydra-oidc
+      port: 80
  selector:
-    app.kubernetes.io/name: hydra-oidc
+    io.kompose.service: hydra-oidc
 status:
  loadBalancer: {}
--- a/components/hydra-saml/resources/hydra-saml-remote-user.yaml
+++ b/components/hydra-saml/resources/hydra-saml-remote-user.yaml
@ -2,19 +2,19 @@ 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
@ -31,7 +31,7 @@ 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:
@ -39,6 +39,6 @@ spec:
      port: 80
      targetPort: 8080
  selector:
-    app.kubernetes.io/name: hydra-saml-remote-user
+    io.kompose.service: hydra-saml-remote-user
 status:
  loadBalancer: {}
--- a/components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml
+++ b/components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml
@ -2,19 +2,19 @@ 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
@ -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: {}

--- a/components/hydra-sql/files/03_base.ini
+++ b/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}
--- a/components/hydra-sql/kustomization.yaml
+++ b/components/hydra-sql/kustomization.yaml
@ -11,7 +11,6 @@ generatorOptions:

 configMapGenerator:
 - name: hydra-sql-env
-  behavior: create
  literals:
  - ISSUER_URL="http://localhost:8000"
  - BASE_URL='http://localhost:8080'
@ -27,6 +26,3 @@ configMapGenerator:
 - name: sql-login-config
  files:
  - ./files/sql_login.yaml
- name: hydra-sql-php-ini
-  files:
-  - ./files/03_base.ini
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/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
-    rollingUpdate:
-      maxSurge: 25%
-      maxUnavailable: 25%
+    type: Recreate
  template:
    metadata:
      labels:
-        app.kubernetes.io/name: hydra-sql
+        io.kompose.service: hydra-sql
    spec:
      containers:
      - name: hydra-sql-fpm
-        image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
-        imagePullPolicy: IfNotPresent
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+        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
-        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"]
+      - name: hydra-sql-nginx
+        image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
+        imagePullPolicy: Always
+        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
-          value: "8443"
-        - name: CADDY_HTTP_PORT
-          value: "8080"
-        - name: CADDY_DATA_FS
-          value: "/tmp/caddy"
-        - name: CADDY_APP_ROOT_PUBLIC
-          value: "/app/public/"
+        - name: NGINX_APP_ROOT
+          value: "/public"
+        - name: NGINX_APP_PHP_INDEX
+          value: "/index.php"
+        - name: NGINX_ERROR_LOG_LEVEL
+          value: "warn"
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
+          value: "^/index\\.php(/|$)"
        resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
        ports:
        - containerPort: 8080
-          name: http
        volumeMounts:
        - name: sql-login-config
          mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
@ -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
--- a/components/hydra-sql/resources/hydra-sql-service.yaml
+++ b/components/hydra-sql/resources/hydra-sql-service.yaml
@ -2,14 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
  labels:
-    app.kubernetes.io/name: hydra-sql
+    io.kompose.service: hydra-sql
  name: hydra-sql
 spec:
  ports:
-  - name: http
-    port: 80
-    targetPort: http
+  - name: hydra-sql
+    port: 8080
  selector:
-    app.kubernetes.io/name: hydra-sql
+    io.kompose.service: hydra-sql
 status:
  loadBalancer: {}
--- a/examples/authenticated-app/resources/port-forwarder.yaml
+++ b/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
--- a/examples/authenticated-app/resources/saml-idp.yaml
+++ b/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: {}
--- a/resources/hydra-dispatcher/files/03_base.ini
+++ b/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}
--- a/resources/hydra-dispatcher/kustomization.yaml
+++ b/resources/hydra-dispatcher/kustomization.yaml
@ -29,6 +29,3 @@ configMapGenerator:
 - name: hydra-dispatcher-apps
  files:
  - apps.yaml=./files/hydra/default.yaml
- name: hydra-dispatcher-php-ini
-  files:
-  - ./files/03_base.ini
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/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.12.15-develop.903.b675347
        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
-          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",
-          ]
+
+      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+        imagePullPolicy: Always
+        name: hydra-dispatcher-nginx
+        args: ["/usr/sbin/nginx"]
        readinessProbe:
          httpGet:
            path: /health
-            port: 8080
+            port: 80
          initialDelaySeconds: 5
          timeoutSeconds: 5
          periodSeconds: 10
        livenessProbe:
          httpGet:
            path: /health
-            port: 8080
+            port: 80
          initialDelaySeconds: 15
          timeoutSeconds: 5
          periodSeconds: 15
@ -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
-          value: "8443"
-        - name: CADDY_HTTP_PORT
-          value: "8080"
-        - name: CADDY_DATA_FS
-          value: "/tmp/caddy"
-        - name: CADDY_APP_ROOT_PUBLIC
-          value: "/app/public/"
+        - name: NGINX_APP_ROOT
+          value: "/public/"
+        - name: NGINX_APP_PHP_INDEX
+          value: "/index.php"
+        - name: NGINX_ERROR_LOG_LEVEL
+          value: "warn"
+        - name: NGINX_APP_PHP_NON_FILE_PATTERN
+          value: "^/index\\.php(/|$)"
        ports:
        - containerPort: 8080
-          name: http
        resources: {}
-        securityContext:
-          runAsNonRoot: true
-          runAsGroup: 1000
-          runAsUser: 1000
      restartPolicy: Always
      volumes:
      - name: hydra-dispatcher-apps
        configMap:
          name: hydra-dispatcher-apps
-      - name: hydra-dispatcher-php-ini
-        configMap:
-          name: hydra-dispatcher-php-ini
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
@ -2,14 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
  labels:
-    app.kubernetes.io/name: hydra-dispatcher
+    io.kompose.service: hydra-dispatcher
  name: hydra-dispatcher
 spec:
  ports:
-  - name: http
-    port: 80
-    targetPort: http
+    - name: http
+      port: 80
  selector:
-    app.kubernetes.io/name: hydra-dispatcher
+    io.kompose.service: hydra-dispatcher
 status:
  loadBalancer: {}
--- a/resources/hydra/kustomization.yaml
+++ b/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-service.yaml
- ./resources/hydra-role.yaml
- ./resources/hydra-rolebinding.yaml
- ./resources/hydra-serviceaccount.yaml
- ./resources/hydra-migrate-job.yaml
- ./resources/hydra-maester
- ./resources/hydra-janitor-cronjob.yaml
+  - ./resources/hydra-deployment.yaml
+  - ./resources/hydra-service.yaml
+  - ./resources/hydra-role.yaml
+  - ./resources/hydra-rolebinding.yaml
+  - ./resources/hydra-serviceaccount.yaml
+  - ./resources/hydra-migrate-job.yaml
+  - ./resources/hydra-maester
+  - ./resources/hydra-janitor-cronjob.yaml

 secretGenerator:
- name: hydra-secret
-  literals:
-  - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
+  - name: hydra-secret
+    literals:
+      - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged

 configMapGenerator:
- name: hydra-env
-  literals:
-  - URLS_SELF_ISSUER=http://localhost:4444
-  - URLS_LOGIN=http://hydra-login-app/login
-  - 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
+  - name: hydra-env
+    literals:
+      - URLS_SELF_ISSUER=http://localhost:4444
+      - URLS_LOGIN=http://hydra-login-app/login
+      - URLS_CONSENT=http://hydra-consent-app/consent
+      - URLS_LOGOUT=http://hydra-logout-app/logout
+      - HYDRA_SERVE_ALL_ARGS=--dev
+      - 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
--- a/resources/hydra/resources/hydra-deployment.yaml
+++ b/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:
--- a/resources/hydra/resources/hydra-service.yaml
+++ b/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: {}