Merge pull request #50 from rstudio/kegs-connect-python-config

remove/update python configurations in example connect values

charts/rstudio-connect/Chart.yaml

@@ -1,6 +1,6 @@
 name: rstudio-connect
 description: Official Helm chart for RStudio Connect
-version: 0.2.3
+version: 0.2.4
 apiVersion: v2
 appVersion: 2021.08.2
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png

charts/rstudio-connect/NEWS.md

@@ -1,13 +1,19 @@
+# 0.2.4
+
+- Enabled Python support in Connect by default when `launcher.enabled=true`
+- Any values defined in the `config` section now take precendence over
+  those that are set by the Helm chart's logic.
+
 # 0.2.3
 
 - Update default RStudio Connect version to 2021.08.2
 
 # 0.2.2
 
-- Added a new parameter `rbac.clusterRoleCreate` to `values.yaml` to allow for disabling the creation of the 
+- Added a new parameter `rbac.clusterRoleCreate` to `values.yaml` to allow for disabling the creation of the
   `ClusterRole` that allows for access to the nodes API. This API is used to ensure that all of the IP addresses
-  for nodes are available when reporting the addresses of the node that is running a particular job so that 
-  clients can connect to it. This is generally not a needed permission for the Launcher as the internal IP is 
+  for nodes are available when reporting the addresses of the node that is running a particular job so that
+  clients can connect to it. This is generally not a needed permission for the Launcher as the internal IP is
   usually sufficient, so it is disabled by default.
 
 # 0.2.1
@@ -33,7 +39,7 @@
 - Change default configuration when launcher is enabled
 - Add the ability to more easily customize `launcher.kubernetes.profiles.conf`
   - Set up the profiles defaults to include the init container
-- Allow more easily mounting a named PVC that was not created by the chart  
+- Allow more easily mounting a named PVC that was not created by the chart
 - Make the "target" launcher namespace configurable
 - Add a default value for `service.port: 80`
 

charts/rstudio-connect/README.md

@@ -1,6 +1,6 @@
 # RStudio Connect
 
-![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![AppVersion: 2021.08.2](https://img.shields.io/badge/AppVersion-2021.08.2-informational?style=flat-square)
+![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![AppVersion: 2021.08.2](https://img.shields.io/badge/AppVersion-2021.08.2-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Connect_
 
@@ -23,11 +23,11 @@ As a result, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.2.3:
+To install the chart with the release name `my-release` at version 0.2.4:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm install my-release rstudio/rstudio-connect --version=0.2.3
+helm install my-release rstudio/rstudio-connect --version=0.2.4
 ```
 
 ## Required Configuration

charts/rstudio-connect/templates/_helpers.tpl

@@ -64,14 +64,16 @@ app.kubernetes.io/instance: {{ .Release.Name }}
     {{- $namespace := default $.Release.Namespace .Values.launcher.namespace }}
     {{- $launcherSettingsDict := dict "Enabled" ("true") "Kubernetes" ("true") "ClusterDefinition" (list "/etc/rstudio-connect/runtime.yaml") "KubernetesNamespace" ($namespace) "KubernetesProfilesConfig" ("/etc/rstudio-connect/launcher.kubernetes.profiles.conf") }}
     {{- $launcherDict := dict "Launcher" ( $launcherSettingsDict ) }}
-    {{- $defaultConfig = merge $defaultConfig $launcherDict }}
+    {{- $pythonSettingsDict := dict "Enabled" ("true") }}
+    {{- $pythonDict := dict "Python" ( $pythonSettingsDict ) }}
+    {{- $defaultConfig = merge $defaultConfig $launcherDict $pythonDict }}
   {{- end }}
   {{- /* default licensing configuration */}}
   {{- if .Values.license.server }}
     {{- $licenseDict := dict "Licensing" ( dict "LicenseType" ("Remote") ) }}
     {{- $defaultConfig = merge $defaultConfig $licenseDict }}
   {{- end }}
-  {{- include "rstudio-library.config.gcfg" (merge .Values.config $defaultConfig) }}
+  {{- include "rstudio-library.config.gcfg" ( mergeOverwrite $defaultConfig .Values.config ) }}
 {{- end -}}
 
 {{- define "rstudio-connect.annotations" -}}

examples/connect/high-availability-nginx-launcher/values.yaml

@@ -75,15 +75,6 @@ config:
     # Note: `DataDir` has the same value as `pod.volumeMounts.mountPath`.
     DataDir: "/var/lib/rstudio-connect"
 
-  # Enables building and executing Python content.
-  Python:
-    Enabled: true
-    # Note: this setting will no longer be required in a future version of Connect.
-    #   When running Connect with launcher enabled, Python installations should be defined in
-    #   runtime.yaml files, specified by Launcher.ClusterDefinition.
-    Executable:
-      - "/opt/python/3.9.5/bin/python"
-
   Database:
     Provider: "Postgres"
 

examples/connect/high-availability-traefik/values.yaml

@@ -80,12 +80,10 @@ config:
     # Note: `DataDir` has the same value as `pod.volumeMounts.mountPath`.
     DataDir: "/var/lib/rstudio-connect"
 
-  # Enables building and executing Python content.
+  # Enables building and executing Python content
   Python:
     Enabled: true
-    # Note: this setting will no longer be required in a future version of Connect.
-    #   When running Connect with launcher enabled, Python installations should be defined in
-    #   runtime.yaml files, specified by Launcher.ClusterDefinition.
+    # An executable path must be provided when using local execution
     Executable:
       - "/opt/python/3.9.5/bin/python"
 

examples/connect/standalone/values.yaml

@@ -23,7 +23,7 @@ config:
   Python:
     Enabled: true
     Executable:
-      - /opt/python/3.6.5/bin/python
+      - /opt/python/3.9.5/bin/python
   'RPackageRepository "CRAN"':
     URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
   'RPackageRepository "RSPM"':