Generate reva configuration from Helm Values

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

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

revad/files/revad.toml.tpl

@@ -0,0 +1,11 @@
+{{- /* 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)) -}}
+{{- $_ := set .config "shared" (merge (.config.shared | default $sharedDefaults) $sharedDefaults) -}}
+{{- toToml .config -}}
+
+{{- end -}}

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 }}

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,35 @@ envFrom:
   # - secretRef:
   #     name: reva-secrets
 
+## Main Reva configuration compiled into revad.toml file
+config:
+  grpc:
+    services:
+      appprovider: {}
+      appregistry: {}
+      authprovider: {}
+      authregistry: {}
+      gateway: {}
+      groupprovider: {}
+      ocmcore: {}
+      ocminvitemanager: {}
+      ocmproviderauthorizer: {}
+      ocmshareprovider: {}
+      preferences: {}
+      publicshareprovider: {}
+      storageprovider: {}
+      storageregistry: {}
+      userprovider: {}
+      usershareprovider: {}
+  http:
+    services:
+      datagateway: {}
+      dataprovider: {}
+      prometheus: {}
+      ocmd: {}
+      ocdav: {}
+      ocs: {}
+
 ingress:
   enabled: false
   services:
@@ -105,27 +133,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: |
     [