CadolesKube/sso-kustom
14
0
Fork 0
Code Issues 17 Pull Requests 4 Projects Releases Wiki Activity

Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 67 commits from unstable into master
pull from: unstable
merge into: CadolesKube:master
Conversation 0 Commits 67 Files Changed 36 +11 -9
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a02622b516 - Show all commits

5
components/hydra-oidc/kustomization.yaml
View File

@ -26,6 +26,7 @@ configMapGenerator:
- CLIENT_SECRET_FC=MyClientSecret
- COOKIE_PATH=/
- TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
- REDIS_DSN="redis://redis:6379"
# - name: hydra-dispatcher-apps
# behavior: merge
# files:
@ -35,5 +36,5 @@ patchesJson6902:
- target:
version: v1
kind: ConfigMap
name: hydra-dispatcher-env
path: patches/hydra-dispatcher-env.yaml
name: hydra-oidc-env
path: patches/hydra-oidc-env.yaml

0
components/hydra-oidc/patches/hydra-dispatcher-env.yaml → components/hydra-oidc/patches/hydra-oidc-env.yaml
View File

4
components/hydra-oidc/resources/hydra-oidc-deployment.yaml
View File

@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: hydra-oidc-php-fpm
image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
@ -47,7 +47,7 @@ spec:
name: hydra-oidc-env
resources: {}
- image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
- image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.12.15-develop.1012.d57f2ad
imagePullPolicy: Always
name: hydra-oidc-nginx
args: ["/usr/sbin/nginx"]

2
components/hydra-sql/kustomization.yaml
View File

@ -17,7 +17,7 @@ configMapGenerator:
- DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
- DB_USER="makeMeASecret"
- DB_PASSWORD="makeMeASecret"
- REDIS_DSN="redis://rfs-redis:26379?&redis_sentinel=mymaster"
- REDIS_DSN="redis://redis:6379"
- PEPPER="MakeMeABigSecret"
- name: sql-login-config
files:

4
components/hydra-sql/resources/hydra-sql-deployment.yaml
View File

@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.12-develop.848.72e912f
image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
@ -54,7 +54,7 @@ spec:
subPath: "sql_login.yaml"
- name: hydra-sql-nginx
image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.12-develop.848.72e912f
image: reg.cadoles.com/cadoles/hydra-sql-base:2023.12.14-develop.1107.740a756
imagePullPolicy: Always
args: ["/usr/sbin/nginx"]
readinessProbe:

1
resources/hydra-dispatcher/kustomization.yaml
View File

@ -21,6 +21,7 @@ configMapGenerator:
- COOKIE_PATH=/
- DEFAULT_LOCALE=fr
- APP_LOCALES=fr,en
- REDIS_DSN= redis://redis:6379?&prefix=hydradispatcher&ttl=3600
- name: hydra-dispatcher-apps
files:
- apps.yaml=./files/hydra/default.yaml

4
resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
View File

@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: hydra-dispatcher-php-fpm
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.23-develop.1635.0c3bdb6
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
exec:
@ -49,7 +49,7 @@ spec:
name: hydra-dispatcher-apps
resources: {}
- image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.23-develop.1635.0c3bdb6
- image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.12.15-develop.903.b675347
imagePullPolicy: Always
name: hydra-dispatcher-nginx
args: ["/usr/sbin/nginx"]