Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
 Laurent Gourvenec
|
4cbc6c3972 |
|
|
@ -7,6 +7,28 @@ configurations:
|
|||
resources:
|
||||
- ./resources/hydra-cnpg-cluster.yaml
|
||||
|
||||
secretGenerator:
|
||||
- name: hydra-postgres-admin
|
||||
type: Secret
|
||||
literals:
|
||||
- username=postgres
|
||||
- password=NotSoSecret
|
||||
- name: hydra-postgres-user
|
||||
type: Secret
|
||||
literals:
|
||||
- username=hydra
|
||||
- password=NotSoSecret
|
||||
|
||||
|
||||
vars:
|
||||
- name: HYDRA_DATABASE_SERVICE_NAME
|
||||
objref:
|
||||
name: hydra-postgres
|
||||
kind: Cluster
|
||||
apiVersion: postgresql.cnpg.io/v1
|
||||
fieldref:
|
||||
fieldpath: metadata.name
|
||||
|
||||
patches:
|
||||
- target:
|
||||
group: apps
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
name: HYDRA_DATABASE_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
name: hydra-postgres-user
|
||||
key: username
|
||||
- op: add
|
||||
path: "/spec/template/spec/containers/0/env/-"
|
||||
|
|
@ -12,18 +12,10 @@
|
|||
name: HYDRA_DATABASE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
name: hydra-postgres-user
|
||||
key: password
|
||||
- op: add
|
||||
path: "/spec/template/spec/containers/0/env/-"
|
||||
value:
|
||||
name: HYDRA_DATABASE_SERVICE_NAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
key: host
|
||||
- op: add
|
||||
path: "/spec/template/spec/containers/0/env/-"
|
||||
value:
|
||||
name: DSN
|
||||
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)"
|
||||
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
name: HYDRA_DATABASE_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
name: hydra-postgres-user
|
||||
key: username
|
||||
- op: add
|
||||
path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
|
||||
|
|
@ -12,18 +12,10 @@
|
|||
name: HYDRA_DATABASE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
name: hydra-postgres-user
|
||||
key: password
|
||||
- op: add
|
||||
path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
|
||||
value:
|
||||
name: HYDRA_DATABASE_SERVICE_NAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
key: host
|
||||
- op: add
|
||||
path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
|
||||
value:
|
||||
name: DSN
|
||||
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"
|
||||
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
name: HYDRA_DATABASE_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
name: hydra-postgres-user
|
||||
key: username
|
||||
- op: add
|
||||
path: "/spec/template/spec/containers/0/env/-"
|
||||
|
|
@ -12,18 +12,10 @@
|
|||
name: HYDRA_DATABASE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
name: hydra-postgres-user
|
||||
key: password
|
||||
- op: add
|
||||
path: "/spec/template/spec/containers/0/env/-"
|
||||
value:
|
||||
name: HYDRA_DATABASE_SERVICE_NAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: hydra-postgres-app
|
||||
key: host
|
||||
- op: add
|
||||
path: "/spec/template/spec/containers/0/env/-"
|
||||
value:
|
||||
name: DSN
|
||||
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"
|
||||
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable"
|
||||
|
|
@ -5,9 +5,13 @@ metadata:
|
|||
spec:
|
||||
instances: 3
|
||||
primaryUpdateStrategy: unsupervised
|
||||
superuserSecret:
|
||||
name: hydra-postgres-admin
|
||||
bootstrap:
|
||||
initdb:
|
||||
database: hydra
|
||||
owner: hydra
|
||||
secret:
|
||||
name: hydra-postgres-user
|
||||
storage:
|
||||
size: 2Gi
|
||||
|
|
@ -2,6 +2,7 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
name: hydra-ldap
|
||||
namespace: default
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-ldap
|
||||
app.kubernetes.io/version: "v1.2.2"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-ldap
|
||||
io.kompose.service: hydra-ldap
|
||||
name: hydra-ldap
|
||||
spec:
|
||||
type: ClusterIP
|
||||
|
|
|
|||
|
|
@ -2,16 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
|
|||
kind: Component
|
||||
|
||||
resources:
|
||||
- ./resources/hydra-oidc-deployment.yaml
|
||||
- ./resources/hydra-oidc-service.yaml
|
||||
|
||||
generatorOptions:
|
||||
labels:
|
||||
com.cadoles.forge.sso-kustom/session: redis
|
||||
- ./resources/hydra-oidc-deployment.yaml
|
||||
- ./resources/hydra-oidc-service.yaml
|
||||
|
||||
configMapGenerator:
|
||||
- name: hydra-oidc-env
|
||||
behavior: create
|
||||
- name: hydra-oidc-env
|
||||
literals:
|
||||
- APP_ENV=prod
|
||||
- APP_DEBUG=false
|
||||
|
|
@ -31,7 +26,14 @@ configMapGenerator:
|
|||
- CLIENT_SECRET_FC=MyClientSecret
|
||||
- COOKIE_PATH=/
|
||||
- TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
|
||||
- REDIS_DSN="redis://redis:6379"
|
||||
- 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"
|
||||
# - name: hydra-dispatcher-apps
|
||||
# behavior: merge
|
||||
# files:
|
||||
# - apps.yaml=./files/hydra/oidc.yaml
|
||||
|
||||
patchesJson6902:
|
||||
- target:
|
||||
version: v1
|
||||
kind: ConfigMap
|
||||
name: hydra-dispatcher-env
|
||||
path: patches/hydra-dispatcher-env.yaml
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
- 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
|
||||
|
|
@ -2,23 +2,23 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-oidc
|
||||
io.kompose.service: hydra-oidc
|
||||
name: hydra-oidc
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: hydra-oidc
|
||||
io.kompose.service: hydra-oidc
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-oidc
|
||||
io.kompose.service: hydra-oidc
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-oidc-php-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
|
||||
imagePullPolicy: Always
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
|
|
@ -46,57 +46,41 @@ spec:
|
|||
- configMapRef:
|
||||
name: hydra-oidc-env
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
|
||||
- name: hydra-oidc-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
|
||||
- image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
[
|
||||
"/usr/sbin/caddy",
|
||||
"run",
|
||||
"--adapter",
|
||||
"caddyfile",
|
||||
"--config",
|
||||
"/etc/caddy/Caddyfile",
|
||||
]
|
||||
name: hydra-oidc-nginx
|
||||
args: ["/usr/sbin/nginx"]
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /healthy
|
||||
port: 8080
|
||||
port: 80
|
||||
initialDelaySeconds: 5
|
||||
timeoutSeconds: 5
|
||||
periodSeconds: 10
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /healthy
|
||||
port: 8080
|
||||
port: 80
|
||||
initialDelaySeconds: 15
|
||||
timeoutSeconds: 5
|
||||
periodSeconds: 15
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
name: http
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-oidc-env
|
||||
env:
|
||||
- name: CADDY_APP_UPSTREAM_BACKEND_SERVER
|
||||
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
|
||||
value: 127.0.0.1:9000
|
||||
- name: CADDY_HTTPS_PORT
|
||||
value: "8443"
|
||||
- name: CADDY_HTTP_PORT
|
||||
value: "8080"
|
||||
- name: CADDY_DATA_FS
|
||||
value: "/tmp/caddy"
|
||||
- name: CADDY_APP_ROOT_PUBLIC
|
||||
value: "/app/public/"
|
||||
- name: NGINX_APP_ROOT
|
||||
value: "/public/"
|
||||
- name: NGINX_APP_PHP_INDEX
|
||||
value: "/index.php"
|
||||
- name: NGINX_ERROR_LOG_LEVEL
|
||||
value: "warn"
|
||||
- name: NGINX_APP_PHP_NON_FILE_PATTERN
|
||||
value: "^/index\\.php(/|$)"
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
restartPolicy: Always
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-oidc
|
||||
io.kompose.service: hydra-oidc
|
||||
name: hydra-oidc
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
- name: hydra-oidc
|
||||
port: 80
|
||||
targetPort: http
|
||||
selector:
|
||||
app.kubernetes.io/name: hydra-oidc
|
||||
io.kompose.service: hydra-oidc
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
|
|
|||
|
|
@ -2,28 +2,28 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-saml-remote-user
|
||||
io.kompose.service: hydra-saml-remote-user
|
||||
name: hydra-saml-remote-user
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: hydra-saml-remote-user
|
||||
io.kompose.service: hydra-saml-remote-user
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-saml-remote-user
|
||||
io.kompose.service: hydra-saml-remote-user
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-saml-remote-user
|
||||
image: reg.cadoles.com/cadoles/hydra-remote-user-base:2023.12.11-develop.1523.5f14595
|
||||
image: reg.cadoles.com/cadoles/hydra-remote-user-v1:v0.0.0-233-g64fcacc
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-saml-env
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
- containerPort: 80
|
||||
resources: {}
|
||||
restartPolicy: Always
|
||||
---
|
||||
|
|
@ -31,14 +31,13 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-saml-remote-user
|
||||
io.kompose.service: hydra-saml-remote-user
|
||||
name: hydra-saml-remote-user
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
port: 80
|
||||
targetPort: 8080
|
||||
selector:
|
||||
app.kubernetes.io/name: hydra-saml-remote-user
|
||||
io.kompose.service: hydra-saml-remote-user
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
|
|
|||
|
|
@ -2,25 +2,25 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-saml-shibboleth-sp
|
||||
io.kompose.service: hydra-saml-shibboleth-sp
|
||||
name: hydra-saml-shibboleth-sp
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: hydra-saml-shibboleth-sp
|
||||
io.kompose.service: hydra-saml-shibboleth-sp
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-saml-shibboleth-sp
|
||||
io.kompose.service: hydra-saml-shibboleth-sp
|
||||
spec:
|
||||
securityContext:
|
||||
fsGroup: 102
|
||||
containers:
|
||||
- name: hydra-saml-shibboleth-sp
|
||||
image: reg.cadoles.com/cadoles/shibboleth-sp-v3:2023.12.12-develop.1039.49b85e1
|
||||
image: reg.cadoles.com/cadoles/shibboleth-sp-v3:v0.0.0-233-g64fcacc
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-saml-env
|
||||
|
|
@ -41,14 +41,14 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-saml
|
||||
io.kompose.service: hydra-saml
|
||||
name: hydra-saml
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
port: 80
|
||||
selector:
|
||||
app.kubernetes.io/name: hydra-saml-shibboleth-sp
|
||||
io.kompose.service: hydra-saml-shibboleth-sp
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
[opcache]
|
||||
; Determines if Zend OPCache is enabled
|
||||
opcache.enable=1
|
||||
|
||||
; Determines if Zend OPCache is enabled for the CLI version of PHP
|
||||
opcache.enable_cli=1
|
||||
|
||||
; The OPcache shared memory storage size.
|
||||
opcache.memory_consumption=512
|
||||
|
||||
; The maximum number of keys (scripts) in the OPcache hash table.
|
||||
; Only numbers between 200 and 1000000 are allowed.
|
||||
opcache.max_accelerated_files=20000
|
||||
|
||||
; When disabled, you must reset the OPcache manually or restart the
|
||||
; webserver for changes to the filesystem to take effect.
|
||||
opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMP}
|
||||
|
||||
; How often (in seconds) to check file timestamps for changes to the shared
|
||||
; memory storage allocation. ("1" means validate once per second, but only
|
||||
; once per request. "0" means always validate)
|
||||
opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}
|
||||
|
|
@ -5,13 +5,8 @@ resources:
|
|||
- ./resources/hydra-sql-service.yaml
|
||||
- ./resources/hydra-sql-deployment.yaml
|
||||
|
||||
generatorOptions:
|
||||
labels:
|
||||
com.cadoles.forge.sso-kustom/session: redis
|
||||
|
||||
configMapGenerator:
|
||||
- name: hydra-sql-env
|
||||
behavior: create
|
||||
literals:
|
||||
- ISSUER_URL="http://localhost:8000"
|
||||
- BASE_URL='http://localhost:8080'
|
||||
|
|
@ -22,11 +17,7 @@ configMapGenerator:
|
|||
- DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
|
||||
- DB_USER="makeMeASecret"
|
||||
- DB_PASSWORD="makeMeASecret"
|
||||
- REDIS_DSN="redis://redis:6379"
|
||||
- PEPPER="MakeMeABigSecret"
|
||||
- name: sql-login-config
|
||||
files:
|
||||
- ./files/sql_login.yaml
|
||||
- name: hydra-sql-php-ini
|
||||
files:
|
||||
- ./files/03_base.ini
|
||||
|
|
|
|||
|
|
@ -2,26 +2,23 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-sql
|
||||
io.kompose.service: hydra-sql
|
||||
name: hydra-sql
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: hydra-sql
|
||||
io.kompose.service: hydra-sql
|
||||
strategy:
|
||||
type: RollingUpdate
|
||||
rollingUpdate:
|
||||
maxSurge: 25%
|
||||
maxUnavailable: 25%
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-sql
|
||||
io.kompose.service: hydra-sql
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-sql-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
|
||||
imagePullPolicy: Always
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
|
|
@ -39,10 +36,6 @@ spec:
|
|||
initialDelaySeconds: 10
|
||||
periodSeconds: 30
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-sql-env
|
||||
|
|
@ -55,22 +48,15 @@ spec:
|
|||
value: 128m
|
||||
- name: PHP_FPM_LOG_LEVEL
|
||||
value: warning
|
||||
- name: OPCACHE_VALIDATE_TIMESTAMP
|
||||
value: "0"
|
||||
- name: OPCACHE_REVALIDATE_FREQ
|
||||
value: "0"
|
||||
volumeMounts:
|
||||
- name: sql-login-config
|
||||
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
|
||||
subPath: "sql_login.yaml"
|
||||
- name: hydra-sql-php-ini
|
||||
mountPath: /etc/php81/conf.d/03_base.ini
|
||||
subPath: 03_base.ini
|
||||
|
||||
- name: hydra-sql-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
|
||||
- name: hydra-sql-nginx
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1
|
||||
imagePullPolicy: Always
|
||||
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
|
||||
args: ["/usr/sbin/nginx"]
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
|
|
@ -89,24 +75,19 @@ spec:
|
|||
- configMapRef:
|
||||
name: hydra-sql-env
|
||||
env:
|
||||
- name: CADDY_APP_UPSTREAM_BACKEND_SERVER
|
||||
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
|
||||
value: 127.0.0.1:9000
|
||||
- name: CADDY_HTTPS_PORT
|
||||
value: "8443"
|
||||
- name: CADDY_HTTP_PORT
|
||||
value: "8080"
|
||||
- name: CADDY_DATA_FS
|
||||
value: "/tmp/caddy"
|
||||
- name: CADDY_APP_ROOT_PUBLIC
|
||||
value: "/app/public/"
|
||||
- name: NGINX_APP_ROOT
|
||||
value: "/public"
|
||||
- name: NGINX_APP_PHP_INDEX
|
||||
value: "/index.php"
|
||||
- name: NGINX_ERROR_LOG_LEVEL
|
||||
value: "warn"
|
||||
- name: NGINX_APP_PHP_NON_FILE_PATTERN
|
||||
value: "^/index\\.php(/|$)"
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
name: http
|
||||
volumeMounts:
|
||||
- name: sql-login-config
|
||||
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
|
||||
|
|
@ -115,8 +96,5 @@ spec:
|
|||
- name: sql-login-config
|
||||
configMap:
|
||||
name: sql-login-config
|
||||
- name: hydra-sql-php-ini
|
||||
configMap:
|
||||
name: hydra-sql-php-ini
|
||||
|
||||
restartPolicy: Always
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-sql
|
||||
io.kompose.service: hydra-sql
|
||||
name: hydra-sql
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
port: 80
|
||||
targetPort: http
|
||||
- name: hydra-sql
|
||||
port: 8080
|
||||
selector:
|
||||
app.kubernetes.io/name: hydra-sql
|
||||
io.kompose.service: hydra-sql
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ resources:
|
|||
- ./resources/oauth2-client.yaml
|
||||
|
||||
configMapGenerator:
|
||||
- name: oidc-test-env
|
||||
- name: oidc-test
|
||||
literals:
|
||||
- LOG_LEVEL=0
|
||||
- HTTP_ADDRESS=0.0.0.0:8080
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ spec:
|
|||
resources: {}
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: oidc-test-env
|
||||
name: oidc-test
|
||||
env:
|
||||
- name: OIDC_CLIENT_ID
|
||||
valueFrom:
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
# Composant `redis`
|
||||
|
||||
### Description
|
||||
|
||||
Les applications `hydra-dispatcher`, `hydra-sql` et `hydra-oidc` stockent dorénavant le cache et les sessions utilisateur sur un serveur Redis.
|
||||
Le DSN du serveur est défini dans leur variable d'environnement respective `REDIS_DSN`.
|
||||
Les applications peuvent utiliser le mode `sentinel` de redis
|
||||
Il est donc nécessaire donc nécessaire de disposer d'un serveur Redis pour utiliser ces applications.
|
||||
|
||||
### Principe général de fonctionnement
|
||||
|
||||
Un `RedisFailOver` crée un cluster redis en mode sentinel avec 3 réplicats chacun.
|
||||
|
||||
|
||||
### Personnalisation
|
||||
|
||||
Via des `patches` sur la ressource `ConfigMap` via un label selector `com.cadoles.forge.sso-kustom/session=redis` il est possible de modifier la valeur du `REDIS_DSN`.
|
||||
|
||||
|
||||
|Clé|Description|Exemple|
|
||||
|---|-----------|-------|
|
||||
|`REDIS_DSN`| DSN du cluster Redis | `redis://rfs-sso-redis:26379?&redis_sentinel=mymaster`
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1alpha1
|
||||
kind: Component
|
||||
|
||||
resources:
|
||||
- ./resources/redis-failover.yaml
|
||||
|
||||
patches:
|
||||
- path: ./patches/hydra-apps.yaml
|
||||
target:
|
||||
kind: ConfigMap
|
||||
labelSelector: "com.cadoles.forge.sso-kustom/session=redis"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
- op: replace
|
||||
path: "/data/REDIS_DSN"
|
||||
value: "redis://rfs-sso-redis:26379?&redis_sentinel=mymaster"
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
apiVersion: databases.spotahome.com/v1
|
||||
kind: RedisFailover
|
||||
metadata:
|
||||
name: sso-redis
|
||||
spec:
|
||||
sentinel:
|
||||
replicas: 3
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
limits:
|
||||
memory: 100Mi
|
||||
redis:
|
||||
replicas: 3
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 100Mi
|
||||
limits:
|
||||
cpu: 400m
|
||||
memory: 500Mi
|
||||
|
|
@ -0,0 +1 @@
|
|||
# Documentation
|
||||
|
|
@ -15,7 +15,7 @@ L'exemple est actuellement déployé avec le composant `hydra-saml` uniquement.
|
|||
2. Déployer les opérateurs nécessaires au déploiement
|
||||
|
||||
```
|
||||
kubectl apply -k ./examples/k8s/kind/cluster --server-side
|
||||
kubectl kustomize --enable-helm ./examples/k8s/kind/cluster | kubectl apply -f -
|
||||
```
|
||||
|
||||
3. Déployer l'application
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: port-forwarder
|
||||
io.kompose.service: port-forwarder
|
||||
name: port-forwarder
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: port-forwarder
|
||||
io.kompose.service: port-forwarder
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: port-forwarder
|
||||
io.kompose.service: port-forwarder
|
||||
spec:
|
||||
containers:
|
||||
- image: hpello/tcp-proxy:latest
|
||||
|
|
@ -42,7 +42,7 @@ apiVersion: v1
|
|||
metadata:
|
||||
name: ssokustom
|
||||
labels:
|
||||
app.kubernetes.io/name: port-forwarder
|
||||
io.kompose.service: port-forwarder
|
||||
spec:
|
||||
ports:
|
||||
- name: https
|
||||
|
|
@ -52,4 +52,4 @@ spec:
|
|||
port: 80
|
||||
targetPort: 80
|
||||
selector:
|
||||
app.kubernetes.io/name: port-forwarder
|
||||
io.kompose.service: port-forwarder
|
||||
|
|
@ -2,19 +2,19 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: saml-idp
|
||||
io.kompose.service: saml-idp
|
||||
name: saml-idp
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: saml-idp
|
||||
io.kompose.service: saml-idp
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: saml-idp
|
||||
io.kompose.service: saml-idp
|
||||
spec:
|
||||
containers:
|
||||
- image: kristophjunge/test-saml-idp:1.15
|
||||
|
|
@ -35,7 +35,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: saml-idp
|
||||
io.kompose.service: saml-idp
|
||||
name: saml-idp
|
||||
spec:
|
||||
ports:
|
||||
|
|
@ -46,6 +46,6 @@ spec:
|
|||
port: 8443
|
||||
targetPort: 8443
|
||||
selector:
|
||||
app.kubernetes.io/name: saml-idp
|
||||
io.kompose.service: saml-idp
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
|
@ -3,7 +3,6 @@ kind: Kustomization
|
|||
resources:
|
||||
- https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml
|
||||
- https://forge.cadoles.com/CadolesKube/c-kustom//base/cloudnative-pg-operator?ref=develop
|
||||
- https://forge.cadoles.com/CadolesKube/c-kustom//base/redis?ref=develop
|
||||
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
|
||||
|
||||
patchesJson6902:
|
||||
|
|
|
|||
|
|
@ -15,4 +15,3 @@ components:
|
|||
- ../../components/hydra-saml
|
||||
- ../../components/hydra-sql
|
||||
- ../../components/oidc-test
|
||||
- ../../components/redis
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
[opcache]
|
||||
; Determines if Zend OPCache is enabled
|
||||
opcache.enable=1
|
||||
|
||||
; Determines if Zend OPCache is enabled for the CLI version of PHP
|
||||
opcache.enable_cli=1
|
||||
|
||||
; The OPcache shared memory storage size.
|
||||
opcache.memory_consumption=512
|
||||
|
||||
; The maximum number of keys (scripts) in the OPcache hash table.
|
||||
; Only numbers between 200 and 1000000 are allowed.
|
||||
opcache.max_accelerated_files=20000
|
||||
|
||||
; When disabled, you must reset the OPcache manually or restart the
|
||||
; webserver for changes to the filesystem to take effect.
|
||||
opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMP}
|
||||
|
||||
; How often (in seconds) to check file timestamps for changes to the shared
|
||||
; memory storage allocation. ("1" means validate once per second, but only
|
||||
; once per request. "0" means always validate)
|
||||
opcache.revalidate_freq=${OPCACHE_REVALIDATE_FREQ}
|
||||
|
|
@ -5,10 +5,6 @@ resources:
|
|||
- ./resources/hydra-dispatcher-deployment.yaml
|
||||
- ./resources/hydra-dispatcher-service.yaml
|
||||
|
||||
generatorOptions:
|
||||
labels:
|
||||
com.cadoles.forge.sso-kustom/session: redis
|
||||
|
||||
configMapGenerator:
|
||||
- name: hydra-dispatcher-env
|
||||
literals:
|
||||
|
|
@ -25,10 +21,6 @@ configMapGenerator:
|
|||
- COOKIE_PATH=/
|
||||
- DEFAULT_LOCALE=fr
|
||||
- APP_LOCALES=fr,en
|
||||
- REDIS_DSN="redis://redis:6379"
|
||||
- name: hydra-dispatcher-apps
|
||||
files:
|
||||
- apps.yaml=./files/hydra/default.yaml
|
||||
- name: hydra-dispatcher-php-ini
|
||||
files:
|
||||
- ./files/03_base.ini
|
||||
|
|
@ -2,23 +2,23 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-dispatcher
|
||||
io.kompose.service: hydra-dispatcher
|
||||
name: hydra-dispatcher
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: hydra-dispatcher
|
||||
io.kompose.service: hydra-dispatcher
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-dispatcher
|
||||
io.kompose.service: hydra-dispatcher
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-dispatcher-php-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
exec:
|
||||
|
|
@ -41,47 +41,29 @@ spec:
|
|||
value: 128m
|
||||
- name: PHP_FPM_MEMORY_LIMIT
|
||||
value: 128m
|
||||
- name: OPCACHE_VALIDATE_TIMESTAMP
|
||||
value: "0"
|
||||
- name: OPCACHE_REVALIDATE_FREQ
|
||||
value: "0"
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: hydra-dispatcher-env
|
||||
volumeMounts:
|
||||
- mountPath: /app/config/hydra
|
||||
name: hydra-dispatcher-apps
|
||||
- name: hydra-dispatcher-php-ini
|
||||
mountPath: /etc/php81/conf.d/03_base.ini
|
||||
subPath: 03_base.ini
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
- name: hydra-dispatcher-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
|
||||
|
||||
- image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359
|
||||
imagePullPolicy: Always
|
||||
args:
|
||||
[
|
||||
"/usr/sbin/caddy",
|
||||
"run",
|
||||
"--adapter",
|
||||
"caddyfile",
|
||||
"--config",
|
||||
"/etc/caddy/Caddyfile",
|
||||
]
|
||||
name: hydra-dispatcher-nginx
|
||||
args: ["/usr/sbin/nginx"]
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: 8080
|
||||
port: 80
|
||||
initialDelaySeconds: 5
|
||||
timeoutSeconds: 5
|
||||
periodSeconds: 10
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /health
|
||||
port: 8080
|
||||
port: 80
|
||||
initialDelaySeconds: 15
|
||||
timeoutSeconds: 5
|
||||
periodSeconds: 15
|
||||
|
|
@ -89,29 +71,21 @@ spec:
|
|||
- configMapRef:
|
||||
name: hydra-dispatcher-env
|
||||
env:
|
||||
- name: CADDY_APP_UPSTREAM_BACKEND_SERVER
|
||||
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
|
||||
value: 127.0.0.1:9000
|
||||
- name: CADDY_HTTPS_PORT
|
||||
value: "8443"
|
||||
- name: CADDY_HTTP_PORT
|
||||
value: "8080"
|
||||
- name: CADDY_DATA_FS
|
||||
value: "/tmp/caddy"
|
||||
- name: CADDY_APP_ROOT_PUBLIC
|
||||
value: "/app/public/"
|
||||
- name: NGINX_APP_ROOT
|
||||
value: "/public/"
|
||||
- name: NGINX_APP_PHP_INDEX
|
||||
value: "/index.php"
|
||||
- name: NGINX_ERROR_LOG_LEVEL
|
||||
value: "warn"
|
||||
- name: NGINX_APP_PHP_NON_FILE_PATTERN
|
||||
value: "^/index\\.php(/|$)"
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
name: http
|
||||
resources: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: hydra-dispatcher-apps
|
||||
configMap:
|
||||
name: hydra-dispatcher-apps
|
||||
- name: hydra-dispatcher-php-ini
|
||||
configMap:
|
||||
name: hydra-dispatcher-php-ini
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra-dispatcher
|
||||
io.kompose.service: hydra-dispatcher
|
||||
name: hydra-dispatcher
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
port: 80
|
||||
targetPort: http
|
||||
selector:
|
||||
app.kubernetes.io/name: hydra-dispatcher
|
||||
io.kompose.service: hydra-dispatcher
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
|
|
|||
|
|
@ -1,36 +1,30 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
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/hydra-deployment.yaml
|
||||
- ./resources/hydra-service.yaml
|
||||
- ./resources/hydra-role.yaml
|
||||
- ./resources/hydra-rolebinding.yaml
|
||||
- ./resources/hydra-serviceaccount.yaml
|
||||
- ./resources/hydra-migrate-job.yaml
|
||||
- ./resources/hydra-maester
|
||||
- ./resources/hydra-janitor-cronjob.yaml
|
||||
- ./resources/hydra-deployment.yaml
|
||||
- ./resources/hydra-service.yaml
|
||||
- ./resources/hydra-role.yaml
|
||||
- ./resources/hydra-rolebinding.yaml
|
||||
- ./resources/hydra-serviceaccount.yaml
|
||||
- ./resources/hydra-migrate-job.yaml
|
||||
- ./resources/hydra-maester
|
||||
- ./resources/hydra-janitor-cronjob.yaml
|
||||
- ./resources/hydra-hpa.yaml
|
||||
|
||||
secretGenerator:
|
||||
- name: hydra-secret
|
||||
- name: hydra-secret
|
||||
literals:
|
||||
- SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
|
||||
|
||||
configMapGenerator:
|
||||
- name: hydra-env
|
||||
- name: hydra-env
|
||||
literals:
|
||||
- URLS_SELF_ISSUER=http://localhost:4444
|
||||
- URLS_LOGIN=http://hydra-login-app/login
|
||||
- URLS_CONSENT=http://hydra-consent-app/consent
|
||||
- URLS_LOGOUT=http://hydra-logout-app/logout
|
||||
- HYDRA_SERVE_ALL_ARGS=--dev
|
||||
- HYDRA_DATABASE_MAX_CONN="10"
|
||||
- LOG_LEVEL=info
|
||||
|
||||
vars:
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@ apiVersion: apps/v1
|
|||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra
|
||||
io.kompose.service: hydra
|
||||
name: hydra
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: hydra
|
||||
io.kompose.service: hydra
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra
|
||||
io.kompose.service: hydra
|
||||
spec:
|
||||
serviceAccountName: hydra-sa
|
||||
initContainers:
|
||||
|
|
@ -55,6 +55,9 @@ spec:
|
|||
name: hydra-public
|
||||
- containerPort: 4445
|
||||
name: hydra-admin
|
||||
resources: {}
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
restartPolicy: Always
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
apiVersion: autoscaling/v2
|
||||
kind: HorizontalPodAutoscaler
|
||||
metadata:
|
||||
name: hydra
|
||||
labels:
|
||||
io.kompose.service: hydra
|
||||
spec:
|
||||
scaleTargetRef:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
name: hydra
|
||||
minReplicas: 1
|
||||
maxReplicas: 3
|
||||
metrics:
|
||||
- type: Resource
|
||||
resource:
|
||||
name: memory
|
||||
target:
|
||||
type: Utilization
|
||||
averageUtilization: 80
|
||||
- type: Resource
|
||||
resource:
|
||||
name: cpu
|
||||
target:
|
||||
type: Utilization
|
||||
averageUtilization: 80
|
||||
|
|
@ -2,11 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||
kind: Kustomization
|
||||
|
||||
resources:
|
||||
- ./resources/hydra-maester-deployment.yaml
|
||||
- ./resources/hydra-maester-rbac.yaml
|
||||
- ./resources/hydra-maester-deployment.yaml
|
||||
- ./resources/hydra-maester-rbac.yaml
|
||||
- https://raw.githubusercontent.com/ory/k8s/v0.28.2/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml
|
||||
|
||||
configMapGenerator:
|
||||
- name: hydra-maester-env
|
||||
- name: hydra-maester-env
|
||||
literals:
|
||||
- APP_ENV=prod
|
||||
- APP_DEBUG=false
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: hydra
|
||||
io.kompose.service: hydra
|
||||
name: hydra
|
||||
spec:
|
||||
ports:
|
||||
|
|
@ -13,6 +13,6 @@ spec:
|
|||
port: 4445
|
||||
targetPort: hydra-admin
|
||||
selector:
|
||||
app.kubernetes.io/name: hydra
|
||||
io.kompose.service: hydra
|
||||
status:
|
||||
loadBalancer: {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue