Only enabled Quarto by default if launcher enabled

rstudio · Apr 26, 2024 · a6a80a8 · a6a80a8
1 parent dc71b08
commit a6a80a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/charts/rstudio-connect/templates/_helpers.tpl b/charts/rstudio-connect/templates/_helpers.tpl
@@ -76,6 +76,9 @@ app.kubernetes.io/instance: {{ .Release.Name }}
     {{- $pythonSettingsDict := dict "Enabled" ("true") }}
     {{- $pythonDict := dict "Python" ( $pythonSettingsDict ) }}
     {{- $defaultConfig = merge $defaultConfig $launcherDict $pythonDict }}
+    {{- $quartoSettingsDict := dict "Enabled" ("true") }}
+    {{- $quartoDict := dict "Quarto" ( $quartoSettingsDict ) }}
+    {{- $defaultConfig = merge $defaultConfig $launcherDict $quartoDict }}
   {{- end }}
   {{- /* default licensing configuration */}}
   {{- if .Values.license.server }}

diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml
@@ -335,8 +335,6 @@ config:
     DataDir: /var/lib/rstudio-connect
   Scheduler:
     InitTimeout: 5m
-  Quarto:
-    Enabled: true
   Logging:
     ServiceLog: STDOUT
     ServiceLogLevel: INFO    # INFO, WARNING or ERROR
@@ -349,3 +347,5 @@ config:
     GraphiteHost: 127.0.0.1
     GraphitePort: 9109
     GraphiteClientId: rsconnect
+  # Note: Quarto and Python are both enabled automatically when launcher.enabled: true
+  # https://github.com/rstudio/helm/blob/main/charts/rstudio-connect/templates/_helpers.tpl