fix(oidc): removing deprecated and useless patch

fix container liveness and readyness probes
fix service with correct port
This commit is contained in:
Philippe Caseiro 2024-02-13 16:49:37 +01:00
parent 0084707bbc
commit 29f539f7ab
4 changed files with 93 additions and 110 deletions

View File

@ -2,15 +2,15 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component kind: Component
resources: resources:
- ./resources/hydra-oidc-deployment.yaml - ./resources/hydra-oidc-deployment.yaml
- ./resources/hydra-oidc-service.yaml - ./resources/hydra-oidc-service.yaml
generatorOptions: generatorOptions:
labels: labels:
com.cadoles.forge.sso-kustom/session: redis com.cadoles.forge.sso-kustom/session: redis
configMapGenerator: configMapGenerator:
- name: hydra-oidc-env - name: hydra-oidc-env
literals: literals:
- APP_ENV=prod - APP_ENV=prod
- APP_DEBUG=false - APP_DEBUG=false
@ -31,14 +31,6 @@ configMapGenerator:
- COOKIE_PATH=/ - COOKIE_PATH=/
- TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
- REDIS_DSN="redis://redis:6379" - REDIS_DSN="redis://redis:6379"
# - name: hydra-dispatcher-apps - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
# behavior: merge - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
# files: - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"
# - apps.yaml=./files/hydra/oidc.yaml
patchesJson6902:
- target:
version: v1
kind: ConfigMap
name: hydra-oidc-env
path: patches/hydra-oidc-env.yaml

View File

@ -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

View File

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

View File

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