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-service.yaml
+- ./resources/hydra-oidc-deployment.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,14 +31,6 @@ configMapGenerator:
   - 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
+  - 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

@@ -54,14 +54,14 @@ spec:
         readinessProbe:
           httpGet:
             path: /healthy
-              port: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /healthy
-              port: 80
+            port: 8080
           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: 80
+    port: 8080
   selector:
     io.kompose.service: hydra-oidc
 status: