From cdaa2b6d44d94e03395ad523af43c2bc55040bf7 Mon Sep 17 00:00:00 2001 From: Pauline Date: Wed, 16 Oct 2024 00:47:12 +0800 Subject: [PATCH 1/3] Allow setting of public key urls for token verification in radar-gateway --- charts/radar-gateway/Chart.yaml | 2 +- charts/radar-gateway/README.md | 3 ++- charts/radar-gateway/templates/configmap.yaml | 4 ++++ charts/radar-gateway/values.yaml | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/radar-gateway/Chart.yaml b/charts/radar-gateway/Chart.yaml index 9144ff9b..744741a3 100644 --- a/charts/radar-gateway/Chart.yaml +++ b/charts/radar-gateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.7.2" description: A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming participant data. It performs authentication, authorization, content validation and decompression. For more details of the configurations, see https://github.com/RADAR-base/RADAR-Gateway/blob/master/gateway.yml. name: radar-gateway -version: 1.2.1 +version: 1.2.2 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-gateway diff --git a/charts/radar-gateway/README.md b/charts/radar-gateway/README.md index 24932c6c..dcdb25c7 100644 --- a/charts/radar-gateway/README.md +++ b/charts/radar-gateway/README.md @@ -3,7 +3,7 @@ # radar-gateway [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-gateway)](https://artifacthub.io/packages/helm/radar-base/radar-gateway) -![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) +![Version: 1.2.2](https://img.shields.io/badge/Version-1.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming participant data. It performs authentication, authorization, content validation and decompression. For more details of the configurations, see https://github.com/RADAR-base/RADAR-Gateway/blob/master/gateway.yml. @@ -88,3 +88,4 @@ A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming partici | cc.apiSecret | string | `"ccApiSecret"` | Confluent Cloud cluster API secret | | cc.schemaRegistryApiKey | string | `"srApiKey"` | Confluent Cloud schema registry API key | | cc.schemaRegistryApiSecret | string | `"srApiSecret"` | Confluent Cloud schema registry API secret | +| public_key_endpoints | string | `nil` | | diff --git a/charts/radar-gateway/templates/configmap.yaml b/charts/radar-gateway/templates/configmap.yaml index 66a0ff5c..94a7d866 100644 --- a/charts/radar-gateway/templates/configmap.yaml +++ b/charts/radar-gateway/templates/configmap.yaml @@ -56,3 +56,7 @@ data: auth: managementPortalUrl: {{ .Values.managementportal_url }} checkSourceId: {{ .Values.checkSourceId }} + publicKeyUrls: + {{- range .Values.public_key_endpoints }} + - {{ . | quote }} + {{ end -}} \ No newline at end of file diff --git a/charts/radar-gateway/values.yaml b/charts/radar-gateway/values.yaml index fa1a53ae..dabfcf81 100644 --- a/charts/radar-gateway/values.yaml +++ b/charts/radar-gateway/values.yaml @@ -228,3 +228,7 @@ cc: schemaRegistryApiKey: srApiKey # -- Confluent Cloud schema registry API secret schemaRegistryApiSecret: srApiSecret + +public_key_endpoints: + # List of public key endpoints for token verification + # - https://localhost/managementportal/oauth/token_key \ No newline at end of file From 661b348f9ae4a4289bae644cedb501c43094bad4 Mon Sep 17 00:00:00 2001 From: Pauline Date: Wed, 16 Oct 2024 00:56:04 +0800 Subject: [PATCH 2/3] Fix lint errors --- charts/radar-gateway/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/radar-gateway/values.yaml b/charts/radar-gateway/values.yaml index dabfcf81..838c4f1a 100644 --- a/charts/radar-gateway/values.yaml +++ b/charts/radar-gateway/values.yaml @@ -231,4 +231,4 @@ cc: public_key_endpoints: # List of public key endpoints for token verification - # - https://localhost/managementportal/oauth/token_key \ No newline at end of file + # - https://localhost/managementportal/oauth/token_key From 6b1bf54129e6e9c9c04326b124a8120027bdfe6e Mon Sep 17 00:00:00 2001 From: yatharthranjan Date: Thu, 17 Oct 2024 20:46:49 +0530 Subject: [PATCH 3/3] fix defaults and doc --- charts/radar-gateway/README.md | 2 +- charts/radar-gateway/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/radar-gateway/README.md b/charts/radar-gateway/README.md index dcdb25c7..681dbfc7 100644 --- a/charts/radar-gateway/README.md +++ b/charts/radar-gateway/README.md @@ -88,4 +88,4 @@ A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming partici | cc.apiSecret | string | `"ccApiSecret"` | Confluent Cloud cluster API secret | | cc.schemaRegistryApiKey | string | `"srApiKey"` | Confluent Cloud schema registry API key | | cc.schemaRegistryApiSecret | string | `"srApiSecret"` | Confluent Cloud schema registry API secret | -| public_key_endpoints | string | `nil` | | +| public_key_endpoints | list | `[]` | List of public key endpoints for token verification | diff --git a/charts/radar-gateway/values.yaml b/charts/radar-gateway/values.yaml index 838c4f1a..056ac8c0 100644 --- a/charts/radar-gateway/values.yaml +++ b/charts/radar-gateway/values.yaml @@ -229,6 +229,6 @@ cc: # -- Confluent Cloud schema registry API secret schemaRegistryApiSecret: srApiSecret -public_key_endpoints: - # List of public key endpoints for token verification +# -- List of public key endpoints for token verification +public_key_endpoints: [] # - https://localhost/managementportal/oauth/token_key