diff --git a/charts/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml index ad74eaab..1403963c 100644 --- a/charts/radar-self-enrolment-ui/Chart.yaml +++ b/charts/radar-self-enrolment-ui/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "0.0.1" +appVersion: "0.0.2" description: A Helm chart for RADAR-base Self Enrolment UI name: radar-self-enrolment-ui -version: 0.2.3 +version: 0.2.4 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-self-enrolment-ui diff --git a/charts/radar-self-enrolment-ui/README.md b/charts/radar-self-enrolment-ui/README.md index 189ecbbd..db43e07d 100644 --- a/charts/radar-self-enrolment-ui/README.md +++ b/charts/radar-self-enrolment-ui/README.md @@ -2,7 +2,7 @@ # radar-self-enrolment-ui -![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-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) +![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.2](https://img.shields.io/badge/AppVersion-0.0.2-informational?style=flat-square) A Helm chart for RADAR-base Self Enrolment UI @@ -76,7 +76,7 @@ A Helm chart for RADAR-base Self Enrolment UI | podSecurityContext.runAsGroup | int | `10000` | | | podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | | | deployment.resources | object | `{}` | | -| 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 | +| deployment.extraEnv | list | `[]` | Array of extra envs to be passed to the deployment. Kubernetes format is expected - name: FOO value: BAR | | deployment.extraVolumes | list | `[]` | If you want to mount external volume For example, mount a secret containing Certificate root CA to verify database TLS connection. | | deployment.extraVolumeMounts | list | `[]` | | | deployment.nodeSelector | object | `{}` | Node labels for pod assignment. | @@ -89,10 +89,10 @@ A Helm chart for RADAR-base Self Enrolment UI | deployment.terminationGracePeriodSeconds | int | `60` | | | affinity | object | `{}` | | | networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to | -| kratosAdminUrl | string | `"http://kratos-admin:80/admin"` | Set this to ORY Kratos's Admin URL | +| kratosAdminUrl | string | `"http://kratos-admin/admin"` | Set this to ORY Kratos's Admin URL | | kratosPublicUrl | string | `"https://localhost/kratos"` | Set this to ORY Kratos's public URL | | kratosBrowserUrl | string | `"https://localhost/kratos"` | Set this to ORY Kratos's public URL accessible from the outside world. | -| hydraAdminUrl | string | `"http://hydra-admin"` | Set this to ORY Hydra's Admin URL | +| hydraAdminUrl | string | `"http://hydra-admin:4445/admin"` | Set this to ORY Hydra's Admin URL | | hydraPublicUrl | string | `"http://hydra-public:4444"` | Set this to ORY Hydra's public URL | | restSourceBackendUrl | string | `"http://radar-rest-sources-backend:8080/rest-sources/backend"` | Set this to the REST source backend service URL | | gatewayUrl | string | `"http://radar-gateway:8080"` | Set this to the RADAR Gateway service URL | @@ -101,7 +101,8 @@ A Helm chart for RADAR-base Self Enrolment UI | sepClientId | string | `"SEP"` | Client ID for SEP authentication | | sepClientSecret | string | `""` | Client secret for SEP authentication | | githubAuthToken | string | `""` | GitHub authentication token for API access (leave empty if not used) | -| basePath | string | `"/kratos-ui"` | The basePath | +| serverName | string | `"localhost"` | Server name or domain name | +| basePath | string | `"kratos-ui"` | The basePath | | test.busybox | object | `{"repository":"busybox","tag":1}` | use a busybox image from another repository | | customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | | livenessProbe.enabled | bool | `false` | Enable livenessProbe | diff --git a/charts/radar-self-enrolment-ui/templates/deployment.yaml b/charts/radar-self-enrolment-ui/templates/deployment.yaml index 9e9196a6..ff4c9b92 100644 --- a/charts/radar-self-enrolment-ui/templates/deployment.yaml +++ b/charts/radar-self-enrolment-ui/templates/deployment.yaml @@ -49,7 +49,7 @@ spec: - name: RSA_BACKEND_URL value: {{ .Values.restSourceBackendUrl | quote }} - name: BASE_PATH - value: {{ .Values.basePath | quote }} + value: /{{ .Values.basePath | quote }} - name: SECURITY_MODE value: {{ .Values.securityMode | quote }} - name: ARMT_CLIENT_ID diff --git a/charts/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml index 6d85fd5c..71beda9d 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -136,9 +136,7 @@ deployment: # -- Array of extra envs to be passed to the deployment. Kubernetes format is expected # - name: FOO # value: BAR - extraEnv: - - name: HYDRA_ADMIN_URL - value: http://hydra-admin + extraEnv: [] # -- If you want to mount external volume # For example, mount a secret containing Certificate root CA to verify database # TLS connection. @@ -234,7 +232,7 @@ networkpolicy: protocol: TCP # -- Set this to ORY Kratos's Admin URL -kratosAdminUrl: "http://kratos-admin:80/admin" +kratosAdminUrl: "http://kratos-admin/admin" # -- Set this to ORY Kratos's public URL kratosPublicUrl: "https://localhost/kratos" @@ -243,7 +241,7 @@ kratosPublicUrl: "https://localhost/kratos" kratosBrowserUrl: "https://localhost/kratos" # -- Set this to ORY Hydra's Admin URL -hydraAdminUrl: "http://hydra-admin" +hydraAdminUrl: "http://hydra-admin:4445/admin" # -- Set this to ORY Hydra's public URL hydraPublicUrl: "http://hydra-public:4444" @@ -269,8 +267,11 @@ sepClientSecret: "" # -- GitHub authentication token for API access (leave empty if not used) githubAuthToken: "" +# -- Server name or domain name +serverName: localhost + # -- The basePath -basePath: "/kratos-ui" +basePath: "kratos-ui" test: # -- use a busybox image from another repository