Update master branch with latest devs from unstable branch #34
|
@ -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
|
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue