From 1ac79c5e67a8993a1392cc8c5df7710d85505de2 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Thu, 9 Dec 2021 11:25:07 +0100
Subject: [PATCH] Update flux healthcheck to reflect kratos replacing
userbackend
TRIGGER_JOBS='enable-nextcloud,enable-wekan'
---
flux2/cluster/base/single-sign-on.yaml | 4 +-
.../single-sign-on-values-configmap.yaml | 42 +++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/flux2/cluster/base/single-sign-on.yaml b/flux2/cluster/base/single-sign-on.yaml
index 78133014d..e5efa49f8 100644
--- a/flux2/cluster/base/single-sign-on.yaml
+++ b/flux2/cluster/base/single-sign-on.yaml
@@ -30,11 +30,11 @@ spec:
namespace: stackspin
- apiVersion: apps/v1
kind: Deployment
- name: single-sign-on-userbackend
+ name: single-sign-on-hydra
namespace: stackspin
- apiVersion: apps/v1
kind: Deployment
- name: single-sign-on-hydra
+ name: single-sign-on-kratos
namespace: stackspin
- apiVersion: apps/v1
kind: Deployment
diff --git a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
index 5c3093301..7710445ea 100644
--- a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
+++ b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
@@ -59,27 +59,27 @@ data:
kratos:
config:
dsn: "postgres://kratos:${kratos_postgresql_password}@single-sign-on-postgresql:5432/kratos"
- courier:
- smtp:
- connection_uri: smtp://${outgoing_mail_smtp_user}:${outgoing_mail_smtp_password}@${outgoing_mail_smtp_host}:${outgoing_mail_smtp_port}/
- from_address: ${outgoing_mail_from_address}
- serve:
- public:
- base_url: https://sso.${domain}/api/
- secrets:
- session:
- - "${kratos_session_secret}"
- selfservice:
- flows:
- recovery:
- ui_url: https://sso.${domain}/login/recovery
- login:
- ui_url: https://sso.${domain}/login/login
- settings:
- ui_url: https://sso.${domain}/login/settings
- registration:
- ui_url: https://sso.${domain}/login/registration
- default_browser_return_url: https://dashboard.${domain}/
+ serve:
+ public:
+ base_url: https://sso.${domain}/api/
+ courier:
+ smtp:
+ connection_uri: smtp://${outgoing_mail_smtp_user}:${outgoing_mail_smtp_password}@${outgoing_mail_smtp_host}:${outgoing_mail_smtp_port}/
+ from_address: ${outgoing_mail_from_address}
+ secrets:
+ session:
+ - "${kratos_session_secret}"
+ selfservice:
+ default_browser_return_url: https://dashboard.${domain}/
+ flows:
+ recovery:
+ ui_url: https://sso.${domain}/login/recovery
+ login:
+ ui_url: https://sso.${domain}/login/login
+ settings:
+ ui_url: https://sso.${domain}/login/settings
+ registration:
+ ui_url: https://sso.${domain}/login/registration
oAuthClients:
--
GitLab