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

This reverts commit 0dbd5dd551.

components/hydra-oidc/kustomization.yaml

@@ -2,15 +2,15 @@ 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
     literals:
       - APP_ENV=prod
       - APP_DEBUG=false
@@ -31,6 +31,14 @@ configMapGenerator:
       - COOKIE_PATH=/
       - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
       - REDIS_DSN="redis://redis:6379"
-  - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
+  # - name: hydra-dispatcher-apps
-  - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
+  #   behavior: merge
-  - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"
+  #   files:
+  #     - apps.yaml=./files/hydra/oidc.yaml
+
+patchesJson6902:
+  - target:
+      version: v1
+      kind: ConfigMap
+      name: hydra-oidc-env
+    path: patches/hydra-oidc-env.yaml

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

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

@@ -54,14 +54,14 @@ spec:
           readinessProbe:
             httpGet:
               path: /healthy
-            port: 8080
+              port: 80
             initialDelaySeconds: 5
             timeoutSeconds: 5
             periodSeconds: 10
           livenessProbe:
             httpGet:
               path: /healthy
-            port: 8080
+              port: 80
             initialDelaySeconds: 15
             timeoutSeconds: 5
             periodSeconds: 15

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

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

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

@@ -56,14 +56,14 @@ spec:
         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

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

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

resources/hydra/kustomization.yaml

@@ -1,29 +1,23 @@
 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:
       - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
 
 configMapGenerator:
-- name: hydra-env
+  - name: hydra-env
     literals:
       - URLS_SELF_ISSUER=http://localhost:4444
       - URLS_LOGIN=http://hydra-login-app/login