Merge pull request #331 from RADAR-base/fix-kratos-ui

Fix kratos ui configs
RADAR-base · Jan 27, 2025 · 234248e · 234248e
2 parents 04cfc1d + 629782a
commit 234248e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/etc/hydra/values.yaml b/etc/hydra/values.yaml
@@ -8,7 +8,7 @@ ingress:
     hosts:
       - host: localhost
         paths:
-          - path: "/admin/hydra(/|$)(.*)" 
+          - path: "/admin/hydra(/|$)(.*)"
             pathType: ImplementationSpecific
     tls:
       - secretName: radar-base-tls
@@ -52,6 +52,8 @@ hydra:
     oauth2:
       allowed_top_level_claims: [scope,roles,authorities,sources,user_name]
       mirror_top_level_claims: false
+      client_credentials:
+        default_grant_allowed_scope: true
 
     serve:
       public:

diff --git a/etc/kratos-ui/values.yaml b/etc/kratos-ui/values.yaml
@@ -5,7 +5,6 @@ ingress:
   enabled: true
   className: "nginx"
   annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
     cert-manager.io/cluster-issuer: letsencrypt-prod
   hosts:
     - host: localhost
@@ -36,4 +35,10 @@ projectName: "SecureApp"
 deployment:
   extraEnv:
     - name: HYDRA_ADMIN_URL
-      value: http://hydra-admin
+      value: http://hydra-admin
+
+livenessProbe:
+  enabled: false
+
+readinessProbe:
+  enabled: false
diff --git a/helmfile.d/10-services.yaml b/helmfile.d/10-services.yaml
@@ -393,11 +393,11 @@ releases:
       - name: hydra.config.urls.self.issuer
         value: https://{{ .Values.server_name }}/hydra/
       - name: hydra.config.urls.login
-        value: https://{{ .Values.server_name }}/kratos-ui/login
+        value: https://{{ .Values.server_name }}/kratos-ui/auth/oauth-login
       - name: hydra.config.urls.logout
-        value: https://{{ .Values.server_name }}/kratos-ui/logout
+        value: https://{{ .Values.server_name }}/kratos-ui/auth/logout
       - name: hydra.config.urls.consent
-        value: https://{{ .Values.server_name }}/kratos-ui/consent
+        value: https://{{ .Values.server_name }}/kratos-ui/auth/consent
       - name: ingress.public.hosts[0].host
         value: {{ .Values.server_name }}
       - name: ingress.admin.tls[0].hosts