fix(hydra): update hydra-maester version to 0.0.32-amd64

fix container liveness and readyness probes
fix service with correct port

components/hydra-ldap/resources/deployment.yaml

@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: hydra-ldap
-  namespace: default
   labels:
     app.kubernetes.io/name: hydra-ldap
     app.kubernetes.io/version: "v1.2.2"
@@ -18,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: hydra-ldap-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-oidc/kustomization.yaml

@@ -2,43 +2,35 @@ 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
-    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
+- 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"
+  - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
+  - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
+  - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"

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

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

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

@@ -17,70 +17,70 @@ spec:
         io.kompose.service: hydra-oidc
     spec:
       containers:
-        - 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:
-              - 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: {}
+      - 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:
+            - 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: {}
 
-        - 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: 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: {}
+      - 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: 8080
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /healthy
+            port: 8080
+          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: 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
 

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

@@ -6,8 +6,8 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-    - name: hydra-oidc
-      port: 80
+  - name: hydra-oidc
+    port: 8080
   selector:
     io.kompose.service: hydra-oidc
 status:

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

@@ -49,21 +49,21 @@ spec:
           name: hydra-dispatcher-apps
         resources: {}
 
-      - image:  reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
+      - 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: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15

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

@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
     - name: http
-      port: 80
+      port: 8080
   selector:
     io.kompose.service: hydra-dispatcher
 status:

resources/hydra/kustomization.yaml

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

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

@@ -2,14 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ./resources/hydra-maester-deployment.yaml
-  - ./resources/hydra-maester-rbac.yaml
-  - https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
+- ./resources/hydra-maester-deployment.yaml
+- ./resources/hydra-maester-rbac.yaml
 
 configMapGenerator:
-  - name: hydra-maester-env
-    literals:
-      - APP_ENV=prod
-      - APP_DEBUG=false
-      - HYDRA_ADMIN_BASE_URL=http://hydra
-      - HYDRA_ADMIN_PORT=4445
+- name: hydra-maester-env
+  literals:
+  - APP_ENV=prod
+  - APP_DEBUG=false
+  - HYDRA_ADMIN_BASE_URL=http://hydra
+  - HYDRA_ADMIN_PORT=4445