From 5348c20fcb0be7b4799af470143eadafbdbd6dcc Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 24 Jan 2022 11:54:50 +0200
Subject: [PATCH] feat(guacmole-client): Add extension-priority setting (#1772)

* feat(guacmole-client): Add extension-priority setting

* feat(guacmole-client): Add extension-priority setting

* bump
---
 charts/stable/guacamole-client/Chart.yaml       |  2 +-
 charts/stable/guacamole-client/questions.yaml   | 17 +++++++++++++++--
 .../guacamole-client/templates/_configmap.tpl   |  4 ++++
 charts/stable/guacamole-client/values.yaml      |  3 +++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/charts/stable/guacamole-client/Chart.yaml b/charts/stable/guacamole-client/Chart.yaml
index 0493a033201..23bc1a88282 100644
--- a/charts/stable/guacamole-client/Chart.yaml
+++ b/charts/stable/guacamole-client/Chart.yaml
@@ -25,7 +25,7 @@ sources:
 - https://hub.docker.com/r/guacamole/guacamole
 - http://guacamole.incubator.apache.org/doc/gug/introduction.html
 type: application
-version: 1.0.5
+version: 1.0.6
 annotations:
   truecharts.org/catagories: |
     - utilities
diff --git a/charts/stable/guacamole-client/questions.yaml b/charts/stable/guacamole-client/questions.yaml
index 29edbadec30..2f84958fcd1 100644
--- a/charts/stable/guacamole-client/questions.yaml
+++ b/charts/stable/guacamole-client/questions.yaml
@@ -93,13 +93,26 @@ questions:
             default: ""
         - variable: GUACD_PORT
           label: "Guacd Port"
-          description: "The port that Guacamole should use when connecting to guacd."
+          description: "The port that Guacamole should use when connecting to guacd"
           schema:
             type: int
             required: true
             default: 4822
 
 # Include{containerConfig}
+  - variable: general
+    group: "App Configuration"
+    label: "General Configuration"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: EXTENSION_PRIORITY
+          label: "Extension Priority (Leave blank for default)"
+          description: "A comma-separated list of the namespaces of all extensions that should be loaded in a specific order"
+          schema:
+            type: string
+            default: ""
   - variable: api
     group: "App Configuration"
     label: "API Configuration"
@@ -818,7 +831,7 @@ questions:
             default: 1001
         - variable: fsGroup
           label: "fsGroup"
-          description: "The group that should own ALL storage."
+          description: "The group that should own ALL storage"
           schema:
             type: int
             default: 568
diff --git a/charts/stable/guacamole-client/templates/_configmap.tpl b/charts/stable/guacamole-client/templates/_configmap.tpl
index 99f95ae0160..0133805277a 100644
--- a/charts/stable/guacamole-client/templates/_configmap.tpl
+++ b/charts/stable/guacamole-client/templates/_configmap.tpl
@@ -6,6 +6,10 @@ kind: ConfigMap
 metadata:
   name: guacamole-client-env
 data:
+  {{/*  GENERAL */}}
+  {{- if .Values.general.EXTENSION_PRIORITY }}
+  EXTENSION_PRIORITY: {{ .Values.general.EXTENSION_PRIORITY | quote }}
+  {{- end }}
   {{/*  API */}}
   {{- if .Values.api.API_SESSION_TIMEOUT }}
   API_SESSION_TIMEOUT: {{ .Values.api.API_SESSION_TIMEOUT | quote }}
diff --git a/charts/stable/guacamole-client/values.yaml b/charts/stable/guacamole-client/values.yaml
index 3fca5e11dfd..689867bef4d 100644
--- a/charts/stable/guacamole-client/values.yaml
+++ b/charts/stable/guacamole-client/values.yaml
@@ -42,6 +42,9 @@ header:
 api: {}
   # API_SESSION_TIMEOUT: "60"
 
+general: {}
+  # EXTENSION_PRIORITY: "openid"
+
 json: {}
   # JSON_SECRET_KEY: "random32charkey"
   # JSON_TRUSTED_NETWORKS: "127.0.0.0/8, 10.0.0.0/8"