diff --git a/etc/base.yaml b/etc/base.yaml index 2c0cc6bd..b1e90a70 100644 --- a/etc/base.yaml +++ b/etc/base.yaml @@ -253,7 +253,7 @@ radar_appserver_postgresql: radar_appserver: _install: false - _chart_version: 0.5.0 + _chart_version: 0.5.1 _extra_timeout: 0 replicaCount: 1 managementportal_resource_name: res_AppServer diff --git a/helmfile.d/10-managementportal.yaml b/helmfile.d/10-managementportal.yaml deleted file mode 100644 index dd3bf0c4..00000000 --- a/helmfile.d/10-managementportal.yaml +++ /dev/null @@ -1,162 +0,0 @@ -bases: -- ../environments.yaml - ---- - -{{ readFile "../etc/helmfile-templates.yaml" }} - -releases: - - name: postgresql - chart: radar/postgresql - version: {{ .Values.postgresql._chart_version }} - installed: {{ .Values.postgresql._install }} - timeout: {{ add .Values.base_timeout .Values.postgresql._extra_timeout }} - <<: *logFailedRelease - values: - - "../etc/postgresql/values.yaml" - - {{ .Values.postgresql | toYaml | indent 8 | trim }} - - - name: management-portal - chart: radar/management-portal - version: {{ .Values.management_portal._chart_version }} - installed: {{ .Values.management_portal._install }} - timeout: {{ add .Values.base_timeout .Values.management_portal._extra_timeout }} - <<: *logFailedRelease - values: - - {{ .Values.management_portal | toYaml | indent 8 | trim }} - set: - - name: ingress.hosts - values: [{{ .Values.server_name }}] - - name: ingress_rate_limited.hosts - values: [{{ .Values.server_name }}] - - name: server_name - value: {{ .Values.server_name }} - - name: oauth_clients.radar_redcap_integrator.enable - value: {{ .Values.radar_integration._install }} - - name: oauth_clients.radar_upload_connect.enable - value: {{ .Values.radar_upload_source_connector._install }} - - name: oauth_clients.radar_upload_frontend.enable - value: {{ .Values.radar_upload_connect_frontend._install }} - - name: oauth_clients.radar_upload_backend.enable - value: {{ .Values.radar_upload_connect_backend._install }} - - name: oauth_clients.radar_rest_sources_authorizer.enable - value: {{ .Values.radar_rest_sources_authorizer._install }} - - name: oauth_clients.radar_rest_sources_auth_backend.enable - value: {{ .Values.radar_rest_sources_backend._install }} - - name: oauth_clients.radar_fitbit_connector.enable - value: {{ .Values.radar_fitbit_connector._install }} - - name: oauth_clients.radar_appconfig.enable - value: {{ .Values.app_config._install }} - - name: oauth_clients.appconfig_frontend.enable - value: {{ .Values.app_config_frontend._install }} - - name: oauth_clients.grafana_dashboard.enable - value: {{ .Values.radar_grafana._install }} - - name: oauth_clients.radar_push_endpoint.enable - value: {{ .Values.radar_push_endpoint._install }} - - name: oauth_clients.grafana_dashboard.redirect_uri - values: - - "https://dashboard.{{ .Values.server_name }}/login/generic_oauth" - - - name: app-config - chart: radar/app-config - version: {{ .Values.app_config._chart_version }} - installed: {{ .Values.app_config._install }} - timeout: {{ add .Values.base_timeout .Values.app_config._extra_timeout }} - <<: *logFailedRelease - values: - - {{ .Values.app_config | toYaml | indent 8 | trim }} - set: - - name: ingress.hosts - values: [{{ .Values.server_name }}] - - name: clientSecret - value: {{ .Values.management_portal.oauth_clients.radar_appconfig.client_secret }} - - - name: app-config-frontend - chart: radar/app-config-frontend - version: {{ .Values.app_config_frontend._chart_version }} - installed: {{ .Values.app_config_frontend._install }} - timeout: {{ add .Values.base_timeout .Values.app_config_frontend._extra_timeout }} - <<: *logFailedRelease - values: - - {{ .Values.app_config_frontend | toYaml | indent 8 | trim }} - set: - - name: ingress.hosts - values: [{{ .Values.server_name }}] - - name: authUrl - value: https://{{ .Values.server_name }}/managementportal/oauth - - name: authCallbackUrl - value: https://{{ .Values.server_name }}/appconfig/login - - - name: kratos - chart: radar/kratos - version: {{ .Values.kratos._chart_version }} - installed: {{ .Values.kratos._install }} - timeout: {{ add .Values.base_timeout .Values.kratos._extra_timeout }} - <<: *logFailedRelease - values: - - "../etc/kratos/values.yaml" - - {{ .Values.kratos | toYaml | indent 8 | trim }} - set: - - name: kratos.config.dsn - 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" }} - - name: kratos.config.courier.smtp.connection_uri - # Note: encoding of "/" in password is necessary for the smtp connection_uri because kratos is not able to handle this. - 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 }} - - name: kratos.config.serve.public.base_url - value: {{ default (printf "https://%s/kratos/" .Values.server_name) .Values.kratos.config.serve.public.base_url }} - - name: kratos.config.serve.admin.base_url - value: {{ default (printf "https://%s/admin/kratos/" .Values.server_name) .Values.kratos.config.serve.admin.base_url }} - - name: kratos.config.serve.public.cors.allowed_origins - values: - - {{ default (printf "https://%s/kratos-ui/" .Values.server_name) .Values.kratos.config.serve.public.cors.allowed_origins }} - - name: kratos.config.selfservice.default_browser_return_url - value: {{ default (printf "https://%s/managementportal" .Values.server_name) .Values.kratos.config.selfservice.default_browser_return_url }} - - name: kratos.config.selfservice.allowed_return_urls - values: - - {{ default (printf "https://%s/" .Values.server_name) .Values.kratos.config.selfservice.allowed_return_urls }} - - name: kratos.config.selfservice.flows.error.ui_url - value: {{ default (printf "https://%s/kratos-ui/error" .Values.server_name) .Values.kratos.config.selfservice.flows.error.ui_url }} - - name: kratos.config.selfservice.flows.recovery.ui_url - value: {{ default (printf "https://%s/kratos-ui/recovery" .Values.server_name) .Values.kratos.config.selfservice.flows.recovery.ui_url }} - - name: kratos.config.selfservice.flows.registration.ui_url - value: {{ default (printf "https://%s/kratos-ui/registration" .Values.server_name) .Values.kratos.config.selfservice.flows.registration.ui_url }} - - name: kratos.config.selfservice.flows.login.ui_url - value: {{ default (printf "https://%s/kratos-ui/login" .Values.server_name) .Values.kratos.config.selfservice.flows.login.ui_url }} - - name: kratos.config.selfservice.flows.logout.after.default_browser_return_url - value: {{ default (printf "https://%s/kratos-ui/login" .Values.server_name) .Values.kratos.config.selfservice.flows.logout.after.default_browser_return_url }} - - name: kratos.config.selfservice.flows.verification.ui_url - value: {{ default (printf "https://%s/kratos-ui/verification" .Values.server_name) .Values.kratos.config.selfservice.flows.verification.ui_url }} - - name: kratos.config.selfservice.flows.verification.after.default_browser_return_url - value: {{ default (printf "https://%s/kratos-ui" .Values.server_name) .Values.kratos.config.selfservice.flows.verification.after.default_browser_return_url }} - - name: kratos.config.selfservice.flows.settings.ui_url - value: {{ default (printf "https://%s/kratos-ui/settings" .Values.server_name) .Values.kratos.config.selfservice.flows.settings.ui_url }} - - name: ingress.public.hosts[0].host - value: {{ .Values.server_name }} - - name: ingress.admin.tls[0].hosts - values: - - {{ .Values.server_name }} - - name: ingress.admin.hosts[0].host - value: {{ .Values.server_name }} - - name: ingress.public.tls[0].hosts - values: - - {{ .Values.server_name }} - - - name: kratos-selfservice-ui-node - chart: radar/kratos-selfservice-ui-node - version: {{ .Values.kratos_ui._chart_version }} - installed: {{ .Values.kratos_ui._install }} - timeout: {{ add .Values.base_timeout .Values.kratos_ui._extra_timeout }} - <<: *logFailedRelease - values: - - "../etc/kratos_ui/values.yaml" - - {{ .Values.kratos_ui | toYaml | indent 8 | trim }} - set: - - name: ingress.hosts[0].host - value: {{ .Values.server_name }} - - name: ingress.tls[0].hosts - values: - - {{ .Values.server_name }} - - name: kratosPublicUrl - value: {{ default (printf "https://%s/kratos" .Values.server_name) .Values.kratos_ui.kratosPublicUrl }} - - name: kratosBrowserUrl - value: {{ default (printf "https://%s/kratos" .Values.server_name) .Values.kratos_ui.kratosBrowserUrl }}