From ed36a5b712e6d28f9c527a39433c259664978983 Mon Sep 17 00:00:00 2001 From: Pauline Date: Mon, 24 Mar 2025 22:00:47 +0000 Subject: [PATCH 1/3] feat: update sep app version and add config updates --- charts/radar-self-enrolment-ui/Chart.yaml | 4 ++-- charts/radar-self-enrolment-ui/README.md | 8 ++++---- charts/radar-self-enrolment-ui/templates/deployment.yaml | 2 +- charts/radar-self-enrolment-ui/values.yaml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml index 88f5ba08..31805033 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.2 +version: 0.2.3 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 b0a90413..908553f2 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.2](https://img.shields.io/badge/Version-0.2.2-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.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.2](https://img.shields.io/badge/AppVersion-0.0.2-informational?style=flat-square) A Helm chart for RADAR-base Self Enrolment UI @@ -53,7 +53,7 @@ A Helm chart for RADAR-base Self Enrolment UI | secret.hashSumEnabled | bool | `true` | switch to false to prevent checksum annotations being maintained and propagated to the pods | | ingress.enabled | bool | `true` | Enable ingress controller resource | | ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer | -| ingress.path | string | `"/kratos-ui"` | Path within the url structure | +| ingress.path | string | `"/kratos-ui(/|$)(.*)"` | Path within the url structure | | ingress.pathType | string | `"ImplementationSpecific"` | Ingress Path type | | ingress.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from | @@ -87,7 +87,7 @@ 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 | `"http://kratos-public:80"` | 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:4445/admin"` | Set this to ORY Hydra's Admin URL | @@ -99,7 +99,7 @@ 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 | +| 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 bf9cbff9..a4cef4fb 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 95ec9627..af1b60a2 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -73,7 +73,7 @@ ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-prod # -- Path within the url structure - path: /kratos-ui + path: "/kratos-ui(/|$)(.*)" # -- Ingress Path type pathType: ImplementationSpecific # -- IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) @@ -224,7 +224,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: "http://kratos-public:80" @@ -260,7 +260,7 @@ sepClientSecret: "" githubAuthToken: "" # -- The basePath -basePath: "/kratos-ui" +basePath: "kratos-ui" test: # -- use a busybox image from another repository From 4d7771bc502a48c6574b1bd96f41942da2fa3112 Mon Sep 17 00:00:00 2001 From: Pauline Date: Tue, 25 Mar 2025 14:54:00 +0000 Subject: [PATCH 2/3] fix: update serverName config --- charts/radar-self-enrolment-ui/README.md | 1 + charts/radar-self-enrolment-ui/templates/deployment.yaml | 4 ++-- charts/radar-self-enrolment-ui/values.yaml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/radar-self-enrolment-ui/README.md b/charts/radar-self-enrolment-ui/README.md index 908553f2..cea11fdd 100644 --- a/charts/radar-self-enrolment-ui/README.md +++ b/charts/radar-self-enrolment-ui/README.md @@ -99,6 +99,7 @@ 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) | +| 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 | diff --git a/charts/radar-self-enrolment-ui/templates/deployment.yaml b/charts/radar-self-enrolment-ui/templates/deployment.yaml index a4cef4fb..e79b7316 100644 --- a/charts/radar-self-enrolment-ui/templates/deployment.yaml +++ b/charts/radar-self-enrolment-ui/templates/deployment.yaml @@ -61,9 +61,9 @@ spec: - name: SEP_CLIENT_SECRET value: {{ .Values.sepClientSecret | quote }} - name: NEXT_PUBLIC_ARMT_REDIRECT_URI - value: https://{{ .Values.server_name }}/{{ .Values.basePath }}/connect/armt + value: https://{{ .Values.serverName }}/{{ .Values.basePath }}/connect/armt - name: NEXT_PUBLIC_SEP_REDIRECT_URI - value: https://{{ .Values.server_name }}/{{ .Values.basePath }}/connect/sep + value: https://{{ .Values.serverName }}/{{ .Values.basePath }}/connect/sep - name: GITHUB_AUTH_TOKEN value: {{ .Values.githubAuthToken | quote }} - name: GATEWAY_URL diff --git a/charts/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml index af1b60a2..671bd728 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -259,6 +259,9 @@ 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" From e5712479d18a3e792e4a1a807522523501cff6cf Mon Sep 17 00:00:00 2001 From: Pauline Date: Wed, 9 Apr 2025 11:57:41 +0100 Subject: [PATCH 3/3] chore: bump chart version --- charts/radar-self-enrolment-ui/Chart.yaml | 2 +- charts/radar-self-enrolment-ui/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml index be9ac3d5..1403963c 100644 --- a/charts/radar-self-enrolment-ui/Chart.yaml +++ b/charts/radar-self-enrolment-ui/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 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 f49257bb..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.2](https://img.shields.io/badge/AppVersion-0.0.2-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