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

Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 65 commits from unstable into master
pull from: unstable
merge into: CadolesKube:master
Conversation 0 Commits 65 Files Changed 36 +456 -277
36 changed files with 456 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/hydra-cnpg-database/kustomization.yaml
View File

@ -7,28 +7,6 @@ configurations:
resources: resources:
- ./resources/hydra-cnpg-cluster.yaml - ./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: patches:
- target: - target:
group: apps group: apps

14
components/hydra-cnpg-database/patches/hydra-deployment.yaml
View File

@ -4,7 +4,7 @@
name: HYDRA_DATABASE_USER name: HYDRA_DATABASE_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: username key: username
- op: add - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
@ -12,10 +12,18 @@
name: HYDRA_DATABASE_PASSWORD name: HYDRA_DATABASE_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: password 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 - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
value: value:
name: DSN name: DSN
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable" value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable&max_conns=$(HYDRA_DATABASE_MAX_CONN)"

14
components/hydra-cnpg-database/patches/hydra-janitor-cronjob.yaml
View File

@ -4,7 +4,7 @@
name: HYDRA_DATABASE_USER name: HYDRA_DATABASE_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: username key: username
- op: add - op: add
path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-" path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
@ -12,10 +12,18 @@
name: HYDRA_DATABASE_PASSWORD name: HYDRA_DATABASE_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: password 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 - op: add
path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-" path: "/spec/jobTemplate/spec/template/spec/containers/0/env/-"
value: value:
name: DSN name: DSN
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable" value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"

14
components/hydra-cnpg-database/patches/hydra-migrate-job.yaml
View File

@ -4,7 +4,7 @@
name: HYDRA_DATABASE_USER name: HYDRA_DATABASE_USER
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: username key: username
- op: add - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
@ -12,10 +12,18 @@
name: HYDRA_DATABASE_PASSWORD name: HYDRA_DATABASE_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: hydra-postgres-user name: hydra-postgres-app
key: password 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 - op: add
path: "/spec/template/spec/containers/0/env/-" path: "/spec/template/spec/containers/0/env/-"
value: value:
name: DSN name: DSN
value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME)-rw:5432/hydra?sslmode=disable" value: "postgres://$(HYDRA_DATABASE_USER):$(HYDRA_DATABASE_PASSWORD)@$(HYDRA_DATABASE_SERVICE_NAME):5432/hydra?sslmode=disable"

4
components/hydra-cnpg-database/resources/hydra-cnpg-cluster.yaml
View File

@ -5,13 +5,9 @@ metadata:
spec: spec:
instances: 3 instances: 3
primaryUpdateStrategy: unsupervised primaryUpdateStrategy: unsupervised
superuserSecret:
name: hydra-postgres-admin
bootstrap: bootstrap:
initdb: initdb:
database: hydra database: hydra
owner: hydra owner: hydra
secret:
name: hydra-postgres-user
storage: storage:
size: 2Gi size: 2Gi

1
components/hydra-ldap/resources/deployment.yaml
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"

2
components/hydra-ldap/resources/service.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra-ldap app.kubernetes.io/name: hydra-ldap
name: hydra-ldap name: hydra-ldap
spec: spec:
type: ClusterIP type: ClusterIP

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

@ -2,11 +2,16 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component kind: Component
resources: resources:
- ./resources/hydra-oidc-deployment.yaml - ./resources/hydra-oidc-deployment.yaml
- ./resources/hydra-oidc-service.yaml - ./resources/hydra-oidc-service.yaml
generatorOptions:
labels:
com.cadoles.forge.sso-kustom/session: redis
configMapGenerator: configMapGenerator:
- name: hydra-oidc-env - name: hydra-oidc-env
behavior: create
literals: literals:
- APP_ENV=prod - APP_ENV=prod
- APP_DEBUG=false - APP_DEBUG=false
@ -26,14 +31,7 @@ configMapGenerator:
- CLIENT_SECRET_FC=MyClientSecret - CLIENT_SECRET_FC=MyClientSecret
- COOKIE_PATH=/ - COOKIE_PATH=/
- TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
# - name: hydra-dispatcher-apps - REDIS_DSN="redis://redis:6379"
# behavior: merge - HYDRA_DISPATCHER_OIDC_LOGIN_URL="http://hydra-oidc/login"
# files: - HYDRA_DISPATCHER_OIDC_CONSENT_URL="http://hydra-oidc/consent"
# - apps.yaml=./files/hydra/oidc.yaml - HYDRA_DISPATCHER_OIDC_LOGOUT_URL="http://hydra-oidc/logout"
patchesJson6902:
- target:
version: v1
kind: ConfigMap
name: hydra-dispatcher-env
path: patches/hydra-dispatcher-env.yaml

9
components/hydra-oidc/patches/hydra-dispatcher-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

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

@ -2,23 +2,23 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: hydra-oidc app.kubernetes.io/name: hydra-oidc
name: hydra-oidc name: hydra-oidc
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: hydra-oidc app.kubernetes.io/name: hydra-oidc
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: hydra-oidc app.kubernetes.io/name: hydra-oidc
spec: spec:
containers: containers:
- name: hydra-oidc-php-fpm - 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:2024.4.2-develop.1349.c4711f6
imagePullPolicy: Always imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
@ -46,41 +46,57 @@ spec:
- configMapRef: - configMapRef:
name: hydra-oidc-env name: hydra-oidc-env
resources: {} resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
- image: reg.cadoles.com/cadoles/hydra-oidc-base:2023.11.17-develop.1657.761e035 - name: hydra-oidc-caddy
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
imagePullPolicy: Always imagePullPolicy: Always
name: hydra-oidc-nginx args:
args: ["/usr/sbin/nginx"] [
"/usr/sbin/caddy",
"run",
"--adapter",
"caddyfile",
"--config",
"/etc/caddy/Caddyfile",
]
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
ports:
- containerPort: 8080
name: http
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-oidc-env name: hydra-oidc-env
env: env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000 value: 127.0.0.1:9000
- name: NGINX_APP_ROOT - name: CADDY_HTTPS_PORT
value: "/public/" value: "8443"
- name: NGINX_APP_PHP_INDEX - name: CADDY_HTTP_PORT
value: "/index.php" value: "8080"
- name: NGINX_ERROR_LOG_LEVEL - name: CADDY_DATA_FS
value: "warn" value: "/tmp/caddy"
- name: NGINX_APP_PHP_NON_FILE_PATTERN - name: CADDY_APP_ROOT_PUBLIC
value: "^/index\\.php(/|$)" value: "/app/public/"
ports:
- containerPort: 8080
resources: {} resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
restartPolicy: Always restartPolicy: Always

7
components/hydra-oidc/resources/hydra-oidc-service.yaml
View File

@ -2,13 +2,14 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra-oidc app.kubernetes.io/name: hydra-oidc
name: hydra-oidc name: hydra-oidc
spec: spec:
ports: ports:
- name: hydra-oidc - name: http
port: 80 port: 80
targetPort: http
selector: selector:
io.kompose.service: hydra-oidc app.kubernetes.io/name: hydra-oidc
status: status:
loadBalancer: {} loadBalancer: {}

15
components/hydra-saml/resources/hydra-saml-remote-user.yaml
View File

@ -2,28 +2,28 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: hydra-saml-remote-user app.kubernetes.io/name: hydra-saml-remote-user
name: hydra-saml-remote-user name: hydra-saml-remote-user
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: hydra-saml-remote-user app.kubernetes.io/name: hydra-saml-remote-user
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: hydra-saml-remote-user app.kubernetes.io/name: hydra-saml-remote-user
spec: spec:
containers: containers:
- name: hydra-saml-remote-user - name: hydra-saml-remote-user
image: reg.cadoles.com/cadoles/hydra-remote-user-v1:v0.0.0-233-g64fcacc image: reg.cadoles.com/cadoles/hydra-remote-user-base:2023.12.11-develop.1523.5f14595
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-saml-env name: hydra-saml-env
ports: ports:
- containerPort: 80 - containerPort: 8080
resources: {} resources: {}
restartPolicy: Always restartPolicy: Always
--- ---
@ -31,13 +31,14 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra-saml-remote-user app.kubernetes.io/name: hydra-saml-remote-user
name: hydra-saml-remote-user name: hydra-saml-remote-user
spec: spec:
ports: ports:
- name: http - name: http
port: 80 port: 80
targetPort: 8080
selector: selector:
io.kompose.service: hydra-saml-remote-user app.kubernetes.io/name: hydra-saml-remote-user
status: status:
loadBalancer: {} loadBalancer: {}

12
components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml
View File

@ -2,25 +2,25 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: hydra-saml-shibboleth-sp app.kubernetes.io/name: hydra-saml-shibboleth-sp
name: hydra-saml-shibboleth-sp name: hydra-saml-shibboleth-sp
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: hydra-saml-shibboleth-sp app.kubernetes.io/name: hydra-saml-shibboleth-sp
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: hydra-saml-shibboleth-sp app.kubernetes.io/name: hydra-saml-shibboleth-sp
spec: spec:
securityContext: securityContext:
fsGroup: 102 fsGroup: 102
containers: containers:
- name: hydra-saml-shibboleth-sp - name: hydra-saml-shibboleth-sp
image: reg.cadoles.com/cadoles/shibboleth-sp-v3:v0.0.0-233-g64fcacc image: reg.cadoles.com/cadoles/shibboleth-sp-v3:2023.12.12-develop.1039.49b85e1
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-saml-env name: hydra-saml-env
@ -41,14 +41,14 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra-saml app.kubernetes.io/name: hydra-saml
name: hydra-saml name: hydra-saml
spec: spec:
ports: ports:
- name: http - name: http
port: 80 port: 80
selector: selector:
io.kompose.service: hydra-saml-shibboleth-sp app.kubernetes.io/name: hydra-saml-shibboleth-sp
status: status:
loadBalancer: {} loadBalancer: {}

22
components/hydra-sql/files/03_base.ini Normal file
View File

@ -0,0 +1,22 @@
[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}

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

@ -5,8 +5,13 @@ resources:
- ./resources/hydra-sql-service.yaml - ./resources/hydra-sql-service.yaml
- ./resources/hydra-sql-deployment.yaml - ./resources/hydra-sql-deployment.yaml
generatorOptions:
labels:
com.cadoles.forge.sso-kustom/session: redis
configMapGenerator: configMapGenerator:
- name: hydra-sql-env - name: hydra-sql-env
behavior: create
literals: literals:
- ISSUER_URL="http://localhost:8000" - ISSUER_URL="http://localhost:8000"
- BASE_URL='http://localhost:8080' - BASE_URL='http://localhost:8080'
@ -17,7 +22,11 @@ configMapGenerator:
- DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql" - DSN_REMOTE_DATABASE="pgsql:host='postgres';port=5432;dbname=lasql"
- DB_USER="makeMeASecret" - DB_USER="makeMeASecret"
- DB_PASSWORD="makeMeASecret" - DB_PASSWORD="makeMeASecret"
- REDIS_DSN="redis://redis:6379"
- PEPPER="MakeMeABigSecret" - PEPPER="MakeMeABigSecret"
- name: sql-login-config - name: sql-login-config
files: files:
- ./files/sql_login.yaml - ./files/sql_login.yaml
- name: hydra-sql-php-ini
files:
- ./files/03_base.ini

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

@ -2,23 +2,26 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: hydra-sql app.kubernetes.io/name: hydra-sql
name: hydra-sql name: hydra-sql
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: hydra-sql app.kubernetes.io/name: hydra-sql
strategy: strategy:
type: Recreate type: RollingUpdate
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: hydra-sql app.kubernetes.io/name: hydra-sql
spec: spec:
containers: containers:
- name: hydra-sql-fpm - name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1 image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
imagePullPolicy: Always imagePullPolicy: Always
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
@ -36,6 +39,10 @@ spec:
initialDelaySeconds: 10 initialDelaySeconds: 10
periodSeconds: 30 periodSeconds: 30
resources: {} resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-sql-env name: hydra-sql-env
@ -48,15 +55,22 @@ spec:
value: 128m value: 128m
- name: PHP_FPM_LOG_LEVEL - name: PHP_FPM_LOG_LEVEL
value: warning value: warning
- name: OPCACHE_VALIDATE_TIMESTAMP
value: "0"
- name: OPCACHE_REVALIDATE_FREQ
value: "0"
volumeMounts: volumeMounts:
- name: sql-login-config - name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml" mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
subPath: "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-nginx - name: hydra-sql-caddy
image: reg.cadoles.com/cadoles/hydra-sql-base:0.0.1 image: reg.cadoles.com/cadoles/hydra-sql-base:2024.11.6-develop.1113.075be9b
imagePullPolicy: Always imagePullPolicy: Always
args: ["/usr/sbin/nginx"] args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /health
@ -75,19 +89,24 @@ spec:
- configMapRef: - configMapRef:
name: hydra-sql-env name: hydra-sql-env
env: env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000 value: 127.0.0.1:9000
- name: NGINX_APP_ROOT - name: CADDY_HTTPS_PORT
value: "/public" value: "8443"
- name: NGINX_APP_PHP_INDEX - name: CADDY_HTTP_PORT
value: "/index.php" value: "8080"
- name: NGINX_ERROR_LOG_LEVEL - name: CADDY_DATA_FS
value: "warn" value: "/tmp/caddy"
- name: NGINX_APP_PHP_NON_FILE_PATTERN - name: CADDY_APP_ROOT_PUBLIC
value: "^/index\\.php(/|$)" value: "/app/public/"
resources: {} resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: http
volumeMounts: volumeMounts:
- name: sql-login-config - name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml" mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
@ -96,5 +115,8 @@ spec:
- name: sql-login-config - name: sql-login-config
configMap: configMap:
name: sql-login-config name: sql-login-config
- name: hydra-sql-php-ini
configMap:
name: hydra-sql-php-ini
restartPolicy: Always restartPolicy: Always

9
components/hydra-sql/resources/hydra-sql-service.yaml
View File

@ -2,13 +2,14 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra-sql app.kubernetes.io/name: hydra-sql
name: hydra-sql name: hydra-sql
spec: spec:
ports: ports:
- name: hydra-sql - name: http
port: 8080 port: 80
targetPort: http
selector: selector:
io.kompose.service: hydra-sql app.kubernetes.io/name: hydra-sql
status: status:
loadBalancer: {} loadBalancer: {}

22
components/redis/README.md Normal file
View File

@ -0,0 +1,22 @@
# 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`

11
components/redis/kustomization.yaml Normal file
View File

@ -0,0 +1,11 @@
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"

3
components/redis/patches/hydra-apps.yaml Normal file
View File

@ -0,0 +1,3 @@
- op: replace
path: "/data/REDIS_DSN"
value: "redis://rfs-sso-redis:26379?&redis_sentinel=mymaster"

21
components/redis/resources/redis-failover.yaml Normal file
View File

@ -0,0 +1,21 @@
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

1
doc/README.md
View File

@ -1 +0,0 @@
# Documentation

2
examples/authenticated-app/README.md
View File

@ -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 2. Déployer les opérateurs nécessaires au déploiement
``` ```
kubectl kustomize --enable-helm ./examples/k8s/kind/cluster | kubectl apply -f - kubectl apply -k ./examples/k8s/kind/cluster --server-side
``` ```
3. Déployer l'application 3. Déployer l'application

10
examples/authenticated-app/resources/port-forwarder.yaml
View File

@ -2,19 +2,19 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: port-forwarder app.kubernetes.io/name: port-forwarder
name: port-forwarder name: port-forwarder
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: port-forwarder app.kubernetes.io/name: port-forwarder
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: port-forwarder app.kubernetes.io/name: port-forwarder
spec: spec:
containers: containers:
- image: hpello/tcp-proxy:latest - image: hpello/tcp-proxy:latest
@ -42,7 +42,7 @@ apiVersion: v1
metadata: metadata:
name: ssokustom name: ssokustom
labels: labels:
io.kompose.service: port-forwarder app.kubernetes.io/name: port-forwarder
spec: spec:
ports: ports:
- name: https - name: https
@ -52,4 +52,4 @@ spec:
port: 80 port: 80
targetPort: 80 targetPort: 80
selector: selector:
io.kompose.service: port-forwarder app.kubernetes.io/name: port-forwarder

10
examples/authenticated-app/resources/saml-idp.yaml
View File

@ -2,19 +2,19 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: saml-idp app.kubernetes.io/name: saml-idp
name: saml-idp name: saml-idp
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: saml-idp app.kubernetes.io/name: saml-idp
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: saml-idp app.kubernetes.io/name: saml-idp
spec: spec:
containers: containers:
- image: kristophjunge/test-saml-idp:1.15 - image: kristophjunge/test-saml-idp:1.15
@ -35,7 +35,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: saml-idp app.kubernetes.io/name: saml-idp
name: saml-idp name: saml-idp
spec: spec:
ports: ports:
@ -46,6 +46,6 @@ spec:
port: 8443 port: 8443
targetPort: 8443 targetPort: 8443
selector: selector:
io.kompose.service: saml-idp app.kubernetes.io/name: saml-idp
status: status:
loadBalancer: {} loadBalancer: {}

1
examples/k8s/kind/cluster/kustomization.yaml
View File

@ -3,6 +3,7 @@ kind: Kustomization
resources: resources:
- https://github.com/jetstack/cert-manager/releases/download/v1.13.2/cert-manager.yaml - 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/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 - https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
patchesJson6902: patchesJson6902:

1
overlays/full/kustomization.yaml
View File

@ -15,3 +15,4 @@ components:
- ../../components/hydra-saml - ../../components/hydra-saml
- ../../components/hydra-sql - ../../components/hydra-sql
- ../../components/oidc-test - ../../components/oidc-test
- ../../components/redis

22
resources/hydra-dispatcher/files/03_base.ini Normal file
View File

@ -0,0 +1,22 @@
[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}

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

@ -5,6 +5,10 @@ resources:
- ./resources/hydra-dispatcher-deployment.yaml - ./resources/hydra-dispatcher-deployment.yaml
- ./resources/hydra-dispatcher-service.yaml - ./resources/hydra-dispatcher-service.yaml
generatorOptions:
labels:
com.cadoles.forge.sso-kustom/session: redis
configMapGenerator: configMapGenerator:
- name: hydra-dispatcher-env - name: hydra-dispatcher-env
literals: literals:
@ -21,6 +25,10 @@ configMapGenerator:
- COOKIE_PATH=/ - COOKIE_PATH=/
- DEFAULT_LOCALE=fr - DEFAULT_LOCALE=fr
- APP_LOCALES=fr,en - APP_LOCALES=fr,en
- REDIS_DSN="redis://redis:6379"
- name: hydra-dispatcher-apps - name: hydra-dispatcher-apps
files: files:
- apps.yaml=./files/hydra/default.yaml - apps.yaml=./files/hydra/default.yaml
- name: hydra-dispatcher-php-ini
files:
- ./files/03_base.ini

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

@ -2,23 +2,23 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: hydra-dispatcher app.kubernetes.io/name: hydra-dispatcher
name: hydra-dispatcher name: hydra-dispatcher
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: hydra-dispatcher app.kubernetes.io/name: hydra-dispatcher
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: hydra-dispatcher app.kubernetes.io/name: hydra-dispatcher
spec: spec:
containers: containers:
- name: hydra-dispatcher-php-fpm - name: hydra-dispatcher-php-fpm
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359 image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
args: ["/usr/sbin/php-fpm81", "-F", "-e"] args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe: readinessProbe:
exec: exec:
@ -41,29 +41,47 @@ spec:
value: 128m value: 128m
- name: PHP_FPM_MEMORY_LIMIT - name: PHP_FPM_MEMORY_LIMIT
value: 128m value: 128m
- name: OPCACHE_VALIDATE_TIMESTAMP
value: "0"
- name: OPCACHE_REVALIDATE_FREQ
value: "0"
envFrom: envFrom:
- configMapRef: - configMapRef:
name: hydra-dispatcher-env name: hydra-dispatcher-env
volumeMounts: volumeMounts:
- mountPath: /app/config/hydra - mountPath: /app/config/hydra
name: hydra-dispatcher-apps name: hydra-dispatcher-apps
- name: hydra-dispatcher-php-ini
mountPath: /etc/php81/conf.d/03_base.ini
subPath: 03_base.ini
resources: {} resources: {}
securityContext:
- image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2023.11.17-develop.1408.ad93359 runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
- name: hydra-dispatcher-caddy
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2024.9.24-develop.1122.f88a5eb
imagePullPolicy: Always imagePullPolicy: Always
name: hydra-dispatcher-nginx args:
args: ["/usr/sbin/nginx"] [
"/usr/sbin/caddy",
"run",
"--adapter",
"caddyfile",
"--config",
"/etc/caddy/Caddyfile",
]
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
@ -71,21 +89,29 @@ spec:
- configMapRef: - configMapRef:
name: hydra-dispatcher-env name: hydra-dispatcher-env
env: env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER - name: CADDY_APP_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000 value: 127.0.0.1:9000
- name: NGINX_APP_ROOT - name: CADDY_HTTPS_PORT
value: "/public/" value: "8443"
- name: NGINX_APP_PHP_INDEX - name: CADDY_HTTP_PORT
value: "/index.php" value: "8080"
- name: NGINX_ERROR_LOG_LEVEL - name: CADDY_DATA_FS
value: "warn" value: "/tmp/caddy"
- name: NGINX_APP_PHP_NON_FILE_PATTERN - name: CADDY_APP_ROOT_PUBLIC
value: "^/index\\.php(/|$)" value: "/app/public/"
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: http
resources: {} resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
restartPolicy: Always restartPolicy: Always
volumes: volumes:
- name: hydra-dispatcher-apps - name: hydra-dispatcher-apps
configMap: configMap:
name: hydra-dispatcher-apps name: hydra-dispatcher-apps
- name: hydra-dispatcher-php-ini
configMap:
name: hydra-dispatcher-php-ini

5
resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
View File

@ -2,13 +2,14 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra-dispatcher app.kubernetes.io/name: hydra-dispatcher
name: hydra-dispatcher name: hydra-dispatcher
spec: spec:
ports: ports:
- name: http - name: http
port: 80 port: 80
targetPort: http
selector: selector:
io.kompose.service: hydra-dispatcher app.kubernetes.io/name: hydra-dispatcher
status: status:
loadBalancer: {} loadBalancer: {}

27
resources/hydra/kustomization.yaml
View File

@ -1,29 +1,36 @@
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
- ./resources/hydra-role.yaml - ./resources/hydra-role.yaml
- ./resources/hydra-rolebinding.yaml - ./resources/hydra-rolebinding.yaml
- ./resources/hydra-serviceaccount.yaml - ./resources/hydra-serviceaccount.yaml
- ./resources/hydra-migrate-job.yaml - ./resources/hydra-migrate-job.yaml
- ./resources/hydra-maester - ./resources/hydra-maester
- ./resources/hydra-janitor-cronjob.yaml - ./resources/hydra-janitor-cronjob.yaml
secretGenerator: secretGenerator:
- name: hydra-secret - name: hydra-secret
literals: literals:
- SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged - SECRETS_SYSTEM=ThisShouldBeAbsolutelyChanged
configMapGenerator: configMapGenerator:
- name: hydra-env - name: hydra-env
literals: literals:
- URLS_SELF_ISSUER=http://localhost:4444 - URLS_SELF_ISSUER=http://localhost:4444
- URLS_LOGIN=http://hydra-login-app/login - URLS_LOGIN=http://hydra-login-app/login
- URLS_CONSENT=http://hydra-consent-app/consent - URLS_CONSENT=http://hydra-consent-app/consent
- URLS_LOGOUT=http://hydra-logout-app/logout - URLS_LOGOUT=http://hydra-logout-app/logout
- HYDRA_SERVE_ALL_ARGS=--dev - HYDRA_SERVE_ALL_ARGS=--dev
- HYDRA_DATABASE_MAX_CONN="10"
- LOG_LEVEL=info - LOG_LEVEL=info
vars: vars:

6
resources/hydra/resources/hydra-deployment.yaml
View File

@ -2,19 +2,19 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
io.kompose.service: hydra app.kubernetes.io/name: hydra
name: hydra name: hydra
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
io.kompose.service: hydra app.kubernetes.io/name: hydra
strategy: strategy:
type: Recreate type: Recreate
template: template:
metadata: metadata:
labels: labels:
io.kompose.service: hydra app.kubernetes.io/name: hydra
spec: spec:
serviceAccountName: hydra-sa serviceAccountName: hydra-sa
initContainers: initContainers:

7
resources/hydra/resources/hydra-maester/kustomization.yaml
View File

@ -2,12 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization 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
literals: literals:
- APP_ENV=prod - APP_ENV=prod
- APP_DEBUG=false - APP_DEBUG=false

4
resources/hydra/resources/hydra-service.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
io.kompose.service: hydra app.kubernetes.io/name: hydra
name: hydra name: hydra
spec: spec:
ports: ports:
@ -13,6 +13,6 @@ spec:
port: 4445 port: 4445
targetPort: hydra-admin targetPort: hydra-admin
selector: selector:
io.kompose.service: hydra app.kubernetes.io/name: hydra
status: status:
loadBalancer: {} loadBalancer: {}