Merge pull request 'feature/sso' (#8) from feature/sso into master
Some checks are pending
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/labhelper) (push) Waiting to run
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/labhelper-data-loader) (push) Waiting to run
Some checks are pending
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/labhelper) (push) Waiting to run
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/labhelper-data-loader) (push) Waiting to run
Reviewed-on: #8
This commit is contained in:
@@ -14,8 +14,11 @@ data:
|
||||
STATIC_URL: "/static/"
|
||||
MEDIA_URL: "/media/"
|
||||
CSRF_TRUSTED_ORIGINS: "https://labhelper.adebaumann.com"
|
||||
LOGIN_URL: "login"
|
||||
LOGIN_URL: "oidc_authentication_init"
|
||||
OIDC_OP_BASE_URL: "https://sso.baumann.gr/realms/homelab"
|
||||
OIDC_RP_CLIENT_ID: "labhelper"
|
||||
LOGIN_REDIRECT_URL: "index"
|
||||
LOGOUT_REDIRECT_URL: "login"
|
||||
LOGOUT_REDIRECT_URL: "/login/"
|
||||
OIDC_AUTHENTICATION_FAILURE_REDIRECT_URL: "/login/"
|
||||
GUNICORN_OPTS: "--access-logfile -"
|
||||
IMAGE_TAG: "0.076"
|
||||
IMAGE_TAG: "0.079"
|
||||
|
||||
@@ -27,7 +27,7 @@ spec:
|
||||
mountPath: /data
|
||||
containers:
|
||||
- name: web
|
||||
image: git.baumann.gr/adebaumann/labhelper:0.076
|
||||
image: git.baumann.gr/adebaumann/labhelper:0.082
|
||||
imagePullPolicy: Always
|
||||
ports:
|
||||
- containerPort: 8000
|
||||
@@ -92,6 +92,21 @@ spec:
|
||||
configMapKeyRef:
|
||||
name: django-config
|
||||
key: LOGIN_URL
|
||||
- name: OIDC_OP_BASE_URL
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: django-config
|
||||
key: OIDC_OP_BASE_URL
|
||||
- name: OIDC_RP_CLIENT_ID
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: django-config
|
||||
key: OIDC_RP_CLIENT_ID
|
||||
- name: OIDC_RP_CLIENT_SECRET
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: django-secret
|
||||
key: oidc-client-secret
|
||||
- name: LOGIN_REDIRECT_URL
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
@@ -102,6 +117,11 @@ spec:
|
||||
configMapKeyRef:
|
||||
name: django-config
|
||||
key: LOGOUT_REDIRECT_URL
|
||||
- name: OIDC_AUTHENTICATION_FAILURE_REDIRECT_URL
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: django-config
|
||||
key: OIDC_AUTHENTICATION_FAILURE_REDIRECT_URL
|
||||
- name: GUNICORN_OPTS
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
@@ -117,7 +137,7 @@ spec:
|
||||
mountPath: /app/data
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
path: /health/
|
||||
port: 8000
|
||||
initialDelaySeconds: 5
|
||||
periodSeconds: 10
|
||||
@@ -125,7 +145,7 @@ spec:
|
||||
failureThreshold: 6
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
path: /health/
|
||||
port: 8000
|
||||
initialDelaySeconds: 20
|
||||
periodSeconds: 20
|
||||
|
||||
Reference in New Issue
Block a user