Skip to content

Commit 31b1d86

Browse files
pvannieroppvannierop
committed
fix: update SEP chart for self-enrolment-portal login
1 parent fa4ad36 commit 31b1d86

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎charts/radar-self-enrolment-ui/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: "0.0.1"
33
description: A Helm chart for RADAR-base Self Enrolment UI
44
name: radar-self-enrolment-ui
5-
version: 0.3.0
5+
version: 0.4.0
66
icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
77
sources:
88
- https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-self-enrolment-ui

‎charts/radar-self-enrolment-ui/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# radar-self-enrolment-ui
44

5-
![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
5+
![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
66

77
A Helm chart for RADAR-base Self Enrolment UI
88

@@ -76,7 +76,7 @@ A Helm chart for RADAR-base Self Enrolment UI
7676
| podSecurityContext.runAsGroup | int | `10000` | |
7777
| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
7878
| deployment.resources | object | `{}` | |
79-
| deployment.extraEnv | list | `[{"name":"HYDRA_ADMIN_URL","value":"http://hydra-admin"}]` | Array of extra envs to be passed to the deployment. Kubernetes format is expected - name: FOO value: BAR |
79+
| deployment.extraEnv | list | `[{"name":"NEXT_PUBLIC_HYDRA_PUBLIC_URL","value":"http://localhost/hydra"}]` | Array of extra envs to be passed to the deployment. Kubernetes format is expected - name: FOO value: BAR |
8080
| deployment.extraVolumes | list | `[]` | If you want to mount external volume For example, mount a secret containing Certificate root CA to verify database TLS connection. |
8181
| deployment.extraVolumeMounts | list | `[]` | |
8282
| deployment.nodeSelector | object | `{}` | Node labels for pod assignment. |
@@ -103,26 +103,26 @@ A Helm chart for RADAR-base Self Enrolment UI
103103
| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe |
104104
| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe |
105105
| customStartupProbe | object | `{}` | Custom startupProbe that overrides the default one |
106-
| startupProbe.enabled | bool | `true` | Enable startupProbe |
106+
| startupProbe.enabled | bool | `false` | Enable startupProbe |
107107
| startupProbe.initialDelaySeconds | int | `5` | Initial delay seconds for startupProbe |
108108
| startupProbe.periodSeconds | int | `10` | Period seconds for startupProbe |
109109
| startupProbe.timeoutSeconds | int | `10` | Timeout seconds for startupProbe |
110110
| startupProbe.successThreshold | int | `1` | Success threshold for startupProbe |
111111
| startupProbe.failureThreshold | int | `30` | Failure threshold for startupProbe |
112112
| networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to |
113-
| kratosAdminUrl | string | `"http://kratos-admin:80/admin"` | Set this to ORY Kratos's Admin URL |
114-
| kratosPublicUrl | string | `"https://localhost/kratos"` | Set this to ORY Kratos's public URL |
115-
| kratosBrowserUrl | string | `"https://localhost/kratos"` | Set this to ORY Kratos's public URL accessible from the outside world. |
116-
| hydraAdminUrl | string | `"http://hydra-admin"` | Set this to ORY Hydra's Admin URL |
117-
| hydraPublicUrl | string | `"http://hydra-public:4444"` | Set this to ORY Hydra's public URL |
113+
| kratosAdminUrl | string | `"http://radar-kratos-admin/admin"` | Set this to ORY Kratos's Admin URL |
114+
| kratosPublicUrl | string | `"http://radar-kratos-public"` | Set this to ORY Kratos's public URL |
115+
| kratosBrowserUrl | string | `"{{ .Values.advertised_protocol }}://{{ .Values.server_name }}/kratos"` | Set this to ORY Kratos's public URL accessible from the outside world. |
116+
| hydraAdminUrl | string | `"http://radar-hydra-admin:4445/admin"` | Set this to ORY Hydra's Admin URL |
117+
| hydraPublicUrl | string | `"http://radar-hydra-public:4444"` | Set this to ORY Hydra's public URL |
118118
| restSourceBackendUrl | string | `"http://radar-rest-sources-backend:8080/rest-sources/backend"` | Set this to the REST source backend service URL |
119119
| gatewayUrl | string | `"http://radar-gateway:8080"` | Set this to the RADAR Gateway service URL |
120120
| armtClientId | string | `"aRMT"` | Client ID for ARMT authentication |
121121
| armtClientSecret | string | `""` | Client secret for ARMT authentication |
122122
| sepClientId | string | `"SEP"` | Client ID for SEP authentication |
123123
| sepClientSecret | string | `""` | Client secret for SEP authentication |
124124
| githubAuthToken | string | `""` | GitHub authentication token for API access (leave empty if not used) |
125-
| basePath | string | `"/kratos-ui"` | The basePath |
125+
| basePath | string | `"kratos-ui"` | The basePath |
126126
| test.busybox | object | `{"repository":"busybox","tag":1}` | use a busybox image from another repository |
127127

128128
----------------------------------------------

‎charts/radar-self-enrolment-ui/templates/deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ spec:
3939
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
4040
env:
4141
- name: KRATOS_INTERNAL_URL
42-
value: {{ .Values.kratosPublicUrl | quote }}
42+
value: {{ tpl .Values.kratosPublicUrl . | quote }}
4343
- name: KRATOS_ADMIN_URL
4444
value: {{ .Values.kratosAdminUrl | quote }}
4545
- name: HYDRA_ADMIN_URL
4646
value: {{ .Values.hydraAdminUrl | quote }}
4747
- name: HYDRA_PUBLIC_URL
48-
value: {{ .Values.hydraPublicUrl | quote }}
48+
value: {{ tpl .Values.hydraPublicUrl . | quote }}
4949
- name: RSA_BACKEND_URL
5050
value: {{ .Values.restSourceBackendUrl | quote }}
5151
- name: BASE_PATH
52-
value: {{ .Values.basePath | quote }}
52+
value: /{{ .Values.basePath | quote }}
5353
- name: SECURITY_MODE
5454
value: {{ .Values.securityMode | quote }}
5555
- name: ARMT_CLIENT_ID

‎charts/radar-self-enrolment-ui/values.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ deployment:
137137
# - name: FOO
138138
# value: BAR
139139
extraEnv:
140-
- name: HYDRA_ADMIN_URL
141-
value: http://hydra-admin
140+
- name: NEXT_PUBLIC_HYDRA_PUBLIC_URL
141+
value: http://localhost/hydra
142142
# -- If you want to mount external volume
143143
# For example, mount a secret containing Certificate root CA to verify database
144144
# TLS connection.
@@ -231,7 +231,7 @@ customStartupProbe: {}
231231

232232
startupProbe:
233233
# -- Enable startupProbe
234-
enabled: true
234+
enabled: false
235235
# -- Initial delay seconds for startupProbe
236236
initialDelaySeconds: 5
237237
# -- Period seconds for startupProbe
@@ -264,7 +264,7 @@ networkpolicy:
264264
kubernetes.io/metadata.name: '{{ .Release.Namespace }}'
265265
podSelector:
266266
matchLabels:
267-
app.kubernetes.io/name: kratos-admin
267+
app.kubernetes.io/name: kratos
268268
- namespaceSelector:
269269
matchLabels:
270270
kubernetes.io/metadata.name: '{{ .Release.Namespace }}'
@@ -285,19 +285,19 @@ networkpolicy:
285285
protocol: TCP
286286

287287
# -- Set this to ORY Kratos's Admin URL
288-
kratosAdminUrl: "http://kratos-admin:80/admin"
288+
kratosAdminUrl: "http://radar-kratos-admin/admin"
289289

290290
# -- Set this to ORY Kratos's public URL
291-
kratosPublicUrl: "https://localhost/kratos"
291+
kratosPublicUrl: 'http://radar-kratos-public'
292292

293293
# -- Set this to ORY Kratos's public URL accessible from the outside world.
294-
kratosBrowserUrl: "https://localhost/kratos"
294+
kratosBrowserUrl: '{{ .Values.advertised_protocol }}://{{ .Values.server_name }}/kratos'
295295

296296
# -- Set this to ORY Hydra's Admin URL
297-
hydraAdminUrl: "http://hydra-admin"
297+
hydraAdminUrl: "http://radar-hydra-admin:4445/admin"
298298

299299
# -- Set this to ORY Hydra's public URL
300-
hydraPublicUrl: "http://hydra-public:4444"
300+
hydraPublicUrl: "http://radar-hydra-public:4444"
301301

302302
# -- Set this to the REST source backend service URL
303303
restSourceBackendUrl: "http://radar-rest-sources-backend:8080/rest-sources/backend"
@@ -321,7 +321,7 @@ sepClientSecret: ""
321321
githubAuthToken: ""
322322

323323
# -- The basePath
324-
basePath: "/kratos-ui"
324+
basePath: "kratos-ui"
325325

326326
test:
327327
# -- use a busybox image from another repository

0 commit comments

Comments
 (0)