Merge branch 'develop' into clarification-about-contributions

ScilifelabDataCentre · May 2, 2024 · 0a6bd48 · 0a6bd48
2 parents 5a4f64e + 8b0a988
commit 0a6bd48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/apps/shinyproxy/Chart.yaml b/apps/shinyproxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: shinyproxy
 description: A Helm chart to install Shinyproxy
 type: application
-version: 1.0.0
+version: 1.1.0
 appVersion: "0.1"
 maintainers:
   - name: Team Whale

diff --git a/apps/shinyproxy/templates/configmap.yaml b/apps/shinyproxy/templates/configmap.yaml
@@ -14,8 +14,9 @@ data:
     proxy:
       authentication: none
       container-backend: kubernetes
-      heartbeat-rate: 10000
-      heartbeat-timeout: 60000
+      heartbeat-rate: {{ .Values.appconfig.proxyheartbeatrate | default 10000 }}
+      heartbeat-timeout: {{ .Values.appconfig.proxyheartbeattimeout | default 60000 }}
+      container-wait-time: {{ .Values.appconfig.proxycontainerwaittime | default 30000 }}
       kubernetes:
         internal-networking: true
         namespace: {{ .Release.Namespace }}
@@ -37,8 +38,8 @@ data:
         container-memory-request: {{ .Values.flavor.requests.memory }}
         port: {{ .Values.appconfig.port }}
         id:  {{ .Release.Name }}
-        display-name: {{ .Values.app_name }}
-        description: {{ .Values.app_description }}
+        display-name: {{ .Values.app_name | quote }}
+        description: {{ .Values.app_description | quote }}
         labels:
           sp.instance: {{ .Release.Name }}
           allow-internet-egress: "true"