From 3f0d6e2d211e3e1ef869ec985ac45f7b8a313c6a Mon Sep 17 00:00:00 2001 From: Miroslav Bauer Date: Mon, 20 Feb 2023 17:42:46 +0100 Subject: [PATCH 1/4] generate reva configuration from Values --- revad/files/revad.toml.tpl | 12 +++++++ revad/templates/configmap.yaml | 2 +- revad/values.yaml | 58 ++++++++++++++++++++-------------- 3 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 revad/files/revad.toml.tpl diff --git a/revad/files/revad.toml.tpl b/revad/files/revad.toml.tpl new file mode 100644 index 0000000..d67b92f --- /dev/null +++ b/revad/files/revad.toml.tpl @@ -0,0 +1,12 @@ +{{- /* vim: set filetype=mustache: */ -}} +{{- with .Values -}} +{{- $gatewaySvcHost := "0.0.0.0" -}} +{{- $grpcPort := .service.grpc.port -}} + +{{- /* Computed defaults for shared section */ -}} +{{- $sharedDefaults := dict "gatewaysvc" (printf "%s:%d" $gatewaySvcHost ($grpcPort | int)) -}} +{{- $sharedOptions := merge .config.shared $sharedDefaults -}} + +{{- toToml .config -}} + +{{- end -}} \ No newline at end of file diff --git a/revad/templates/configmap.yaml b/revad/templates/configmap.yaml index c018b69..112461b 100644 --- a/revad/templates/configmap.yaml +++ b/revad/templates/configmap.yaml @@ -8,6 +8,6 @@ metadata: data: {{- range $filename, $fileContents := .Values.configFiles }} {{ $filename }}: |- -{{ $fileContents | indent 4 }} +{{ tpl $fileContents $ | indent 4 }} {{- end }} {{- end }} diff --git a/revad/values.yaml b/revad/values.yaml index be258bd..3e7a9c8 100644 --- a/revad/values.yaml +++ b/revad/values.yaml @@ -4,8 +4,7 @@ image: repository: cs3org/revad tag: v1.21.0 pullPolicy: Always - pullSecrets: - [] + pullSecrets: [] service: type: ClusterIP @@ -73,6 +72,38 @@ envFrom: # - secretRef: # name: reva-secrets +## Main Reva configuration compiled into revad.toml file +config: + shared: + jwt_secret: CHANGE-ME!!! + grpc: + services: + appprovider: {} + appregistry: {} + authregistry: {} + gateway: {} + ocmcore: {} + ocminvitemanager: {} + ocmproviderauthorizer: {} + ocmshareprovider: {} + preferences: {} + publicshareprovider: {} + storageregistry: {} + userprovider: {} + usershareprovider: {} + http: + services: + datagateway: {} + dataprovider: {} + prometheus: {} + ocmd: {} + ocdav: {} + ocs: {} + providerauthorizer: {} + middlewares: + - providerauthorizer + - cors + ingress: enabled: false services: @@ -105,27 +136,8 @@ ingress: # https://reva.link/docs/config/ configFiles: - revad.toml: | - [grpc.services.gateway] - [grpc.services.storageregistry] - [grpc.services.storageprovider] - [grpc.services.authprovider] - [grpc.services.authregistry] - [grpc.services.userprovider] - [grpc.services.groupprovider] - [grpc.services.usershareprovider] - [grpc.services.publicshareprovider] - [grpc.services.ocmcore] - [grpc.services.ocmshareprovider] - [grpc.services.ocminvitemanager] - [grpc.services.ocmproviderauthorizer] - - [http.services.datagateway] - [http.services.dataprovider] - [http.services.prometheus] - [http.services.ocmd] - [http.services.ocdav] - [http.services.ocs] + revad.toml: |- + {{ tpl (.Files.Get "files/revad.toml.tpl") $ }} users.json: | [ From 0ff986014ef1ac313d247747012b7746c20a2e48 Mon Sep 17 00:00:00 2001 From: Miroslav Bauer Date: Tue, 21 Feb 2023 09:35:14 +0100 Subject: [PATCH 2/4] Update Chart and README --- README.md | 20 ++++++++++---------- revad/Chart.yaml | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index fdcdc7c..ad617e0 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ Verify it's available and searh for charts: ```bash $ helm repo list -NAME URL -cs3org https://cs3org.github.io/charts/ +NAME URL +cs3org https://cs3org.github.io/charts/ $ helm search repo cs3org -NAME CHART VERSION APP VERSION DESCRIPTION -cs3org/revad 0.1.6 0.1.0 The Reva daemon (revad) helm chart +NAME CHART VERSION APP VERSION DESCRIPTION +cs3org/revad 0.1.6 0.1.0 The Reva daemon (revad) helm chart ``` ## Examples @@ -36,16 +36,16 @@ $ cat << EOF > custom-values.yaml service: http: port: 20001 -configFiles: - revad.toml: | - [http] - address = "0.0.0.0:20001" - - [http.services.helloworld] +config: + http: + services: + # Adds Reva HTTP service named "helloworld" + helloworld: {} EOF $ helm install custom-reva cs3org/revad -f custom-values.yaml ``` + or ```console diff --git a/revad/Chart.yaml b/revad/Chart.yaml index 8f9d10b..a46eebf 100644 --- a/revad/Chart.yaml +++ b/revad/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: revad description: The Reva daemon (revad) helm chart type: application -version: 1.5.0 +version: 1.6.0 appVersion: v1.21.0 kubeVersion: '>= 1.19.0' icon: https://reva.link/logo.svg @@ -24,10 +24,10 @@ keywords: annotations: artifacthub.io/changes: | - kind: changed - description: Bump revad version to v.1.21.0 + description: Generate reva configuration file from chart Values links: - - name: cs3org/reva#3524 - url: https://github.com/cs3org/reva/pull/3524 + - name: cs3org/charts#48 + url: https://github.com/cs3org/charts/pull/48 artifacthub.io/images: | - name: revad image: cs3org/revad:v1.21.0 From 4f090cb2f1051acaee19e1770a20a0cbbf8baacd Mon Sep 17 00:00:00 2001 From: Miroslav Bauer Date: Tue, 21 Feb 2023 09:51:33 +0100 Subject: [PATCH 3/4] align values with previous revad.toml config --- revad/files/revad.toml.tpl | 3 +-- revad/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/revad/files/revad.toml.tpl b/revad/files/revad.toml.tpl index d67b92f..634f8a8 100644 --- a/revad/files/revad.toml.tpl +++ b/revad/files/revad.toml.tpl @@ -5,8 +5,7 @@ {{- /* Computed defaults for shared section */ -}} {{- $sharedDefaults := dict "gatewaysvc" (printf "%s:%d" $gatewaySvcHost ($grpcPort | int)) -}} -{{- $sharedOptions := merge .config.shared $sharedDefaults -}} - +{{- $_ := set .config "shared" (merge (.config.shared | default $sharedDefaults) $sharedDefaults) -}} {{- toToml .config -}} {{- end -}} \ No newline at end of file diff --git a/revad/values.yaml b/revad/values.yaml index 3e7a9c8..113fdaf 100644 --- a/revad/values.yaml +++ b/revad/values.yaml @@ -74,20 +74,21 @@ envFrom: ## Main Reva configuration compiled into revad.toml file config: - shared: - jwt_secret: CHANGE-ME!!! grpc: services: appprovider: {} appregistry: {} + authprovider: {} authregistry: {} gateway: {} + groupprovider: {} ocmcore: {} ocminvitemanager: {} ocmproviderauthorizer: {} ocmshareprovider: {} preferences: {} publicshareprovider: {} + storageprovider: {} storageregistry: {} userprovider: {} usershareprovider: {} @@ -99,7 +100,6 @@ config: ocmd: {} ocdav: {} ocs: {} - providerauthorizer: {} middlewares: - providerauthorizer - cors From b8ecd50643798ba6be1b2134f5378e0d0f1bf968 Mon Sep 17 00:00:00 2001 From: Miroslav Bauer Date: Tue, 21 Feb 2023 10:11:49 +0100 Subject: [PATCH 4/4] remove default middlewares --- revad/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/revad/values.yaml b/revad/values.yaml index 113fdaf..c2365ee 100644 --- a/revad/values.yaml +++ b/revad/values.yaml @@ -100,9 +100,6 @@ config: ocmd: {} ocdav: {} ocs: {} - middlewares: - - providerauthorizer - - cors ingress: enabled: false