From cb9d72ebd7edc382b678187e94d1a630101d0a5b Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Thu, 26 Oct 2023 14:19:59 -0400 Subject: [PATCH 1/3] switch back to kilo version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8ea99f559..7f2e97617 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.30 +2.4.0-kilo From d42b5ef901c0aef7ea8a9c2b175bca5a541e3232 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 27 Oct 2023 11:18:56 -0400 Subject: [PATCH 2/3] remove unused url props to avoid kratos complaining about invalid urls when they're blank --- salt/kratos/map.jinja | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/salt/kratos/map.jinja b/salt/kratos/map.jinja index a2477098d..a603d813a 100644 --- a/salt/kratos/map.jinja +++ b/salt/kratos/map.jinja @@ -23,4 +23,16 @@ {% if KRATOSMERGED.oidc.enabled and 'oidc' in salt['pillar.get']('features') %} {% do KRATOSMERGED.config.selfservice.methods.update({'oidc': {'enabled': true, 'config': {'providers': [KRATOSMERGED.oidc.config]}}}) %} -{% endif %} \ No newline at end of file +{% endif %} + +{% if KRATOSMERGED.oidc.config.auth_url is defined and not KRATOSMERGED.oidc.config.auth_url.strip() | length %} +{% do KRATOSMERGED.oidc.config.pop('auth_url') %} +{% endif %} + +{% if KRATOSMERGED.oidc.config.issuer_url is defined and not KRATOSMERGED.oidc.config.issuer_url.strip() | length %} +{% do KRATOSMERGED.oidc.config.pop('issuer_url') %} +{% endif %} + +{% if KRATOSMERGED.oidc.config.token_url is defined and not KRATOSMERGED.oidc.config.token_url.strip() | length %} +{% do KRATOSMERGED.oidc.config.pop('token_url') %} +{% endif %} From 3a83c526608450c9b102a9340fb2a58f393d0727 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 27 Oct 2023 11:20:05 -0400 Subject: [PATCH 3/3] minor updates --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7f2e97617..8ea99f559 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.0-kilo +2.4.30