Skip to content

Commit cf30788

Browse files
pvannieroppvannierop
committed
Move kratos definitions to 10-managementportal.yaml
1 parent fb94c71 commit cf30788

File tree

3 files changed

+98
-98
lines changed

3 files changed

+98
-98
lines changed

‎etc/base.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,6 @@ radar_home:
158158
_chart_version: 0.2.2
159159
_extra_timeout: 0
160160

161-
kratos:
162-
_install: true
163-
_chart_version: 0.43.1
164-
_extra_timeout: 0
165-
jdbc:
166-
database: kratos
167-
kratos:
168-
courier:
169-
smtp:
170-
from_address: [email protected]
171-
172-
kratos_ui:
173-
_install: true
174-
_chart_version: 0.43.1
175-
_extra_timeout: 0
176-
177161
# --------------------------------------------------------- 10-managementportal.yaml ---------------------------------------------------------
178162

179163
# This Postgresql is used for Management Portal and App config, postgres password should be same in them
@@ -214,6 +198,22 @@ management_portal:
214198
password: secret
215199
host: localhost
216200

201+
kratos:
202+
_install: true
203+
_chart_version: 0.43.1
204+
_extra_timeout: 0
205+
jdbc:
206+
database: kratos
207+
kratos:
208+
courier:
209+
smtp:
210+
from_address: [email protected]
211+
212+
kratos_ui:
213+
_install: true
214+
_chart_version: 0.43.1
215+
_extra_timeout: 0
216+
217217
app_config:
218218
_install: true
219219
_chart_version: 1.1.1

‎helmfile.d/10-base.yaml‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -113,85 +113,3 @@ releases:
113113
value: {{ dig "logging" "enabled" .Values.graylog._install .Values.radar_home }}
114114
- name: logging.url
115115
value: {{ dig "logging" "url" (printf "https://graylog.%s/" .Values.server_name) .Values.radar_home }}
116-
117-
- name: kratos
118-
chart: radar/kratos
119-
version: {{ .Values.kratos._chart_version }}
120-
installed: {{ .Values.kratos._install }}
121-
timeout: {{ add .Values.base_timeout .Values.kratos._extra_timeout }}
122-
<<: *logFailedRelease
123-
values:
124-
- "../etc/kratos/values.yaml"
125-
- {{ .Values.kratos | toYaml | indent 8 | trim }}
126-
set:
127-
- name: serverName
128-
value: {{ .Values.server_name }}
129-
- name: kratos.config.dsn
130-
value: postgres://{{ .Values.management_portal.postgres.user }}:{{ .Values.management_portal.postgres.password }}@{{ .Values.management_portal.postgres.host }}:{{ .Values.management_portal.postgres.port }}/{{ .Values | get "kratos.jdbc.database" "kratos" }}
131-
- name: kratos.config.courier.smtp.connection_uri
132-
# Note: encoding of "/" in password is necessary for the smtp connection_uri because kratos is not able to handle this.
133-
value: smtp://{{ .Values.management_portal.smtp.username }}:{{ replace "/" "%2F" .Values.management_portal.smtp.password }}@{{ .Values.management_portal.smtp.host }}:{{ .Values | get "management_portal.smtp.port" 587 }}
134-
- name: kratos.config.serve.public.base_url
135-
value: https://{{ .Values.server_name }}/kratos/
136-
- name: kratos.config.serve.admin.base_url
137-
value: https://{{ .Values.server_name }}/admin/kratos/
138-
- name: kratos.config.serve.public.cors.allowed_origins
139-
values:
140-
- https://{{ .Values.server_name }}/kratos-ui/
141-
- name: kratos.config.selfservice.default_browser_return_url
142-
value: https://{{ .Values.server_name }}/managementportal
143-
- name: kratos.config.selfservice.allowed_return_urls
144-
values:
145-
- https://{{ .Values.server_name }}/
146-
# FIXME: http://localhost/ is not a valid return URL for production
147-
- http://{{ .Values.server_name }}/
148-
- name: kratos.config.selfservice.flows.error.ui_url
149-
value: https://{{ .Values.server_name }}/kratos-ui/error
150-
- name: kratos.config.selfservice.flows.settings.ui_url
151-
value: https://{{ .Values.server_name }}/kratos-ui/settings
152-
- name: kratos.config.selfservice.flows.recovery.ui_url
153-
value: https://{{ .Values.server_name }}/kratos-ui/recovery
154-
- name: kratos.config.selfservice.flows.registration.ui_url
155-
value: https://{{ .Values.server_name }}/kratos-ui/registration
156-
- name: kratos.config.selfservice.flows.login.ui_url
157-
value: https://{{ .Values.server_name }}/kratos-ui/login
158-
- name: kratos.config.selfservice.flows.logout.after.default_browser_return_url
159-
value: https://{{ .Values.server_name }}/kratos-ui/login
160-
- name: kratos.config.selfservice.flows.verification.ui_url
161-
value: https://{{ .Values.server_name }}/kratos-ui/verification
162-
- name: kratos.config.selfservice.flows.verification.after.default_browser_return_url
163-
value: https://{{ .Values.server_name }}/kratos-ui
164-
- name: kratos.config.selfservice.flows.settings.ui_url
165-
value: https://{{ .Values.server_name }}/kratos-ui/settings
166-
- name: ingress.public.hosts[0].host
167-
value: {{ .Values.server_name }}
168-
- name: ingress.admin.tls[0].hosts
169-
values:
170-
- {{ .Values.server_name }}
171-
- name: ingress.admin.hosts[0].host
172-
value: {{ .Values.server_name }}
173-
- name: ingress.public.tls[0].hosts
174-
values:
175-
- {{ .Values.server_name }}
176-
177-
- name: kratos-selfservice-ui-node
178-
chart: radar/kratos-selfservice-ui-node
179-
version: {{ .Values.kratos_ui._chart_version }}
180-
installed: {{ .Values.kratos_ui._install }}
181-
timeout: {{ add .Values.base_timeout .Values.kratos_ui._extra_timeout }}
182-
<<: *logFailedRelease
183-
values:
184-
- "../etc/kratos_ui/values.yaml"
185-
- {{ .Values.kratos_ui | toYaml | indent 8 | trim }}
186-
set:
187-
- name: serverName
188-
value: {{ .Values.server_name }}
189-
- name: ingress.hosts[0].host
190-
value: {{ .Values.server_name }}
191-
- name: ingress.tls[0].hosts
192-
values:
193-
- {{ .Values.server_name }}
194-
- name: kratosPublicUrl
195-
value: https://{{ .Values.server_name }}/kratos
196-
- name: kratosBrowserUrl
197-
value: https://{{ .Values.server_name }}/kratos

‎helmfile.d/10-managementportal.yaml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,85 @@ releases:
8686
value: https://{{ .Values.server_name }}/managementportal/oauth
8787
- name: authCallbackUrl
8888
value: https://{{ .Values.server_name }}/appconfig/login
89+
90+
- name: kratos
91+
chart: radar/kratos
92+
version: {{ .Values.kratos._chart_version }}
93+
installed: {{ .Values.kratos._install }}
94+
timeout: {{ add .Values.base_timeout .Values.kratos._extra_timeout }}
95+
<<: *logFailedRelease
96+
values:
97+
- "../etc/kratos/values.yaml"
98+
- {{ .Values.kratos | toYaml | indent 8 | trim }}
99+
set:
100+
- name: serverName
101+
value: {{ .Values.server_name }}
102+
- name: kratos.config.dsn
103+
value: postgres://{{ .Values.management_portal.postgres.user }}:{{ .Values.management_portal.postgres.password }}@{{ .Values.management_portal.postgres.host }}:{{ .Values.management_portal.postgres.port }}/{{ .Values | get "kratos.jdbc.database" "kratos" }}
104+
- name: kratos.config.courier.smtp.connection_uri
105+
# Note: encoding of "/" in password is necessary for the smtp connection_uri because kratos is not able to handle this.
106+
value: smtp://{{ .Values.management_portal.smtp.username }}:{{ replace "/" "%2F" .Values.management_portal.smtp.password }}@{{ .Values.management_portal.smtp.host }}:{{ .Values | get "management_portal.smtp.port" 587 }}
107+
- name: kratos.config.serve.public.base_url
108+
value: https://{{ .Values.server_name }}/kratos/
109+
- name: kratos.config.serve.admin.base_url
110+
value: https://{{ .Values.server_name }}/admin/kratos/
111+
- name: kratos.config.serve.public.cors.allowed_origins
112+
values:
113+
- https://{{ .Values.server_name }}/kratos-ui/
114+
- name: kratos.config.selfservice.default_browser_return_url
115+
value: https://{{ .Values.server_name }}/managementportal
116+
- name: kratos.config.selfservice.allowed_return_urls
117+
values:
118+
- https://{{ .Values.server_name }}/
119+
# FIXME: http://localhost/ is not a valid return URL for production
120+
- http://{{ .Values.server_name }}/
121+
- name: kratos.config.selfservice.flows.error.ui_url
122+
value: https://{{ .Values.server_name }}/kratos-ui/error
123+
- name: kratos.config.selfservice.flows.settings.ui_url
124+
value: https://{{ .Values.server_name }}/kratos-ui/settings
125+
- name: kratos.config.selfservice.flows.recovery.ui_url
126+
value: https://{{ .Values.server_name }}/kratos-ui/recovery
127+
- name: kratos.config.selfservice.flows.registration.ui_url
128+
value: https://{{ .Values.server_name }}/kratos-ui/registration
129+
- name: kratos.config.selfservice.flows.login.ui_url
130+
value: https://{{ .Values.server_name }}/kratos-ui/login
131+
- name: kratos.config.selfservice.flows.logout.after.default_browser_return_url
132+
value: https://{{ .Values.server_name }}/kratos-ui/login
133+
- name: kratos.config.selfservice.flows.verification.ui_url
134+
value: https://{{ .Values.server_name }}/kratos-ui/verification
135+
- name: kratos.config.selfservice.flows.verification.after.default_browser_return_url
136+
value: https://{{ .Values.server_name }}/kratos-ui
137+
- name: kratos.config.selfservice.flows.settings.ui_url
138+
value: https://{{ .Values.server_name }}/kratos-ui/settings
139+
- name: ingress.public.hosts[0].host
140+
value: {{ .Values.server_name }}
141+
- name: ingress.admin.tls[0].hosts
142+
values:
143+
- {{ .Values.server_name }}
144+
- name: ingress.admin.hosts[0].host
145+
value: {{ .Values.server_name }}
146+
- name: ingress.public.tls[0].hosts
147+
values:
148+
- {{ .Values.server_name }}
149+
150+
- name: kratos-selfservice-ui-node
151+
chart: radar/kratos-selfservice-ui-node
152+
version: {{ .Values.kratos_ui._chart_version }}
153+
installed: {{ .Values.kratos_ui._install }}
154+
timeout: {{ add .Values.base_timeout .Values.kratos_ui._extra_timeout }}
155+
<<: *logFailedRelease
156+
values:
157+
- "../etc/kratos_ui/values.yaml"
158+
- {{ .Values.kratos_ui | toYaml | indent 8 | trim }}
159+
set:
160+
- name: serverName
161+
value: {{ .Values.server_name }}
162+
- name: ingress.hosts[0].host
163+
value: {{ .Values.server_name }}
164+
- name: ingress.tls[0].hosts
165+
values:
166+
- {{ .Values.server_name }}
167+
- name: kratosPublicUrl
168+
value: https://{{ .Values.server_name }}/kratos
169+
- name: kratosBrowserUrl
170+
value: https://{{ .Values.server_name }}/kratos

0 commit comments

Comments
 (0)