Compare commits

...

11 Commits

9 changed files with 163 additions and 176 deletions

View File

@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: hydra-ldap name: hydra-ldap
namespace: default
labels: labels:
app.kubernetes.io/name: hydra-ldap app.kubernetes.io/name: hydra-ldap
app.kubernetes.io/version: "v1.2.2" app.kubernetes.io/version: "v1.2.2"

View File

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

View File

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

View File

@ -1,6 +1,12 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization 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:
- ./resources/hydra-deployment.yaml - ./resources/hydra-deployment.yaml
- ./resources/hydra-service.yaml - ./resources/hydra-service.yaml

View File

@ -4,7 +4,6 @@ kind: Kustomization
resources: resources:
- ./resources/hydra-maester-deployment.yaml - ./resources/hydra-maester-deployment.yaml
- ./resources/hydra-maester-rbac.yaml - ./resources/hydra-maester-rbac.yaml
- https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
configMapGenerator: configMapGenerator:
- name: hydra-maester-env - name: hydra-maester-env