User defined templates

charts/vc-authn-oidc/templates/configmap.yaml

@@ -8,14 +8,3 @@ data:
     {{ .Values.controller.sessionTimeout.config | toJson }}
   user_variable_substitution.py: |
     {{ .Values.controller.userVariableSubsitution | nindent 4 }}
----
-{{- if .Values.controller.htmlFileOverrides }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "global.fullname" . }}-template-overrides
-data:
-  {{- range $key, $value := .Values.controller.htmlFileOverrides }}
-  {{ $key }}: {{ $value | quote }}
-  {{- end }}
-{{- end }}

charts/vc-authn-oidc/templates/deployment.yaml

@@ -39,12 +39,12 @@ spec:
         - name: controller-config
           configMap:
             name: {{ include "global.fullname" . }}-controller-config
-        {{- if .Values.controller.htmlFileOverrides }}
+        {{- if (not (empty .Values.controller.customHtmlConfigMapName)) }}
         - name: controller-templates
           projected:
             sources:
               - configMap:
-                  name: {{ include "global.fullname" . }}-template-overrides
+                  name: {{ .Values.controller.customHtmlConfigMapName | quote }}
         {{- end }}
       containers:
         - name: {{ .Chart.Name }}
@@ -142,8 +142,12 @@ spec:
             - name: jwt-token
               mountPath: /opt/token
             - name: controller-config
-              mountPath: /etc/controller-config
-            {{- if .Values.controller.htmlFileOverrides }}
+              mountPath: /etc/controller-config/sessiontimeout.json
+              subPath: sessiontimeout.json
+            - name: controller-config
+              mountPath: /etc/controller-config/user_variable_substitution.py
+              subPath: user_variable_substitution.py
+            {{- if (not (empty .Values.controller.customHtmlConfigMapName)) }}
             - name: controller-templates
               mountPath: {{ .Values.controller.templateDirectory }}
             {{- end }}

charts/vc-authn-oidc/values.yaml

@@ -66,10 +66,8 @@ controller:
     # variable_substitution_map.add_variable_substitution(
     #     r"\$sub_days_plus_one_(\d+)", sub_days_plus_one
     # )
-  # htmlFileOverrides:
-  #   ver_config_explorer.html: ""
-  #   verified_credentials.html: ""
-  #   wallet_howto.html: ""
+  customHtmlConfigMapName: ""
+
 ## @param useHTTPS Prepend Agent and Admin URLs with `https`
 useHTTPS: true
 ## @param logLevel Accepts one of the following values: CRITICAL, ERROR, WARNING, INFO, DEBUG

docs/ConfigurationGuide.md

@@ -170,12 +170,36 @@ indication of this will also be logged
 ## ConfigMap Based Overrides
 
 By default the QR page shown to users uses OpenWallet branding users
-are capable of overriding any of these files using the
-`controller.htmlFileOverrides` value in
+are capable of overriding any of these files using a custom ConfigMap.
+
+Users can modify [configmap.yaml](charts/vc-authn-oidc/templates/configmap.yaml)
+and adding a new config map over riding any of the HTML files in [html-templates](../html-templates/). Specifically you can replace:
+- [verified_credentials.html](../html-templates/verified_credentials.html)
+- [wallet_howto.html](../html-templates/wallet_howto.html)
+- [ver_config_explorer.html](../html-templates/ver_config_explorer.html)
+
+One example of the new ConfigMap would be
+
+```yaml
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: user-template-overrides
+data:
+  verified_credentials.html: "<p>New contents of the verified_credentials.html page</p>"
+  wallet_howto.html: "<p>New contents of the wallet_howto.html page</p>"
+  ver_config_explorer.html: "<p>New contents of the ver_config_explorer.html page</p>"
+```
+
+The name of this new ConfigMap needs to be added to
+`controller.customHtmlConfigMapName` value in
 [values.yaml](charts/vc-authn-oidc/values.yaml).
+
 These files will override the existing files seen in
 [html-templates](../html-templates/).
 
+
 ## Complete Directory Overrides
 
 In addition, to allow for more flexibility users are welcome to build