Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 65 commits from unstable into master
4 changed files with 93 additions and 110 deletions
Showing only changes of commit 29f539f7ab - Show all commits

View File

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

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

View File

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