Merge pull request #702 from rstudio/chronicle-server-address-discovery-fixes

Chronicle agent server address fixes

Author: matt-urbina

charts/rstudio-connect/Chart.yaml

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

charts/rstudio-connect/NEWS.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.8.10
+
+- Skip `rstudio-library` template call when `chronicleAgent.autoDiscovery=false`. Require `chronicleAgent.serverAddress`
+  to be set instead.
+
 ## 0.8.9
 
 - Bump Connect version to 2025.09.0

charts/rstudio-connect/README.md

@@ -1,6 +1,6 @@
 # Posit Connect
 
-![Version: 0.8.9](https://img.shields.io/badge/Version-0.8.9-informational?style=flat-square) ![AppVersion: 2025.09.0](https://img.shields.io/badge/AppVersion-2025.09.0-informational?style=flat-square)
+![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![AppVersion: 2025.09.0](https://img.shields.io/badge/AppVersion-2025.09.0-informational?style=flat-square)
 
 #### _Official Helm chart for Posit Connect_
 
@@ -30,11 +30,11 @@ To ensure reproducibility in your environment and insulate yourself from future
 
 ## Installing the chart
 
-To install the chart with the release name `my-release` at version 0.8.9:
+To install the chart with the release name `my-release` at version 0.8.10:
 
 ```{.bash}
 helm repo add rstudio https://helm.rstudio.com
-helm upgrade --install my-release rstudio/rstudio-connect --version=0.8.9
+helm upgrade --install my-release rstudio/rstudio-connect --version=0.8.10
 ```
 
 To explore other chart versions, look at:

charts/rstudio-connect/templates/deployment.yaml

@@ -118,7 +118,11 @@ spec:
         {{- end }}
         env:
           - name: CHRONICLE_SERVER_ADDRESS
+            {{- if .Values.chronicleAgent.autoDiscovery }}
             value: {{ include "rstudio-library.chronicle-agent.serverAddress" (dict "chronicleAgent" .Values.chronicleAgent "Release" .Release) | trim | quote }}
+            {{- else }}
+            value: {{ required "chronicleAgent.serverAddress must be specified if autoDiscovery is disabled." .Values.chronicleAgent.serverAddress | quote }}
+            {{- end }}
           - name: CHRONICLE_CONNECT_APIKEY
             {{- if .Values.chronicleAgent.connectApiKey.valueFrom }}
             valueFrom:

charts/rstudio-library/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: rstudio-library
 description: Helm library helpers for use by official RStudio charts
 type: library
-version: 0.1.34
-appVersion: 0.1.34
+version: 0.1.35
+appVersion: 0.1.35
 
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 home: https://www.rstudio.com

charts/rstudio-library/NEWS.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 0.1.35
+
+- Fix `rstudio-library.chronicle-agent.serverAddress` failure when lookup returns none.
+- Fail `rstudio-library.chronicle-agent.serverAddress` if no server address could be resolved.
+
 ## 0.1.34
 
 - Add HTTP/HTTPS protocol prefix to `rstudio-library.chronicle-agent.serverAddress` function return.

charts/rstudio-library/README.md

@@ -1,6 +1,6 @@
 # rstudio-library
 
-![Version: 0.1.34](https://img.shields.io/badge/Version-0.1.34-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.34](https://img.shields.io/badge/AppVersion-0.1.34-informational?style=flat-square)
+![Version: 0.1.35](https://img.shields.io/badge/Version-0.1.35-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.35](https://img.shields.io/badge/AppVersion-0.1.35-informational?style=flat-square)
 
 #### _Helm library helpers for use by official RStudio charts_
 

charts/rstudio-library/templates/_chronicle-agent.tpl

@@ -39,13 +39,15 @@ Takes a dict:
 {{- define "rstudio-library.chronicle-agent.serverAddress" }}
 {{- if .chronicleAgent.serverAddress }}
 {{- .chronicleAgent.serverAddress }}
-{{- else }}
+{{- else if lookup "v1" "Service" (default .Release.Namespace .chronicleAgent.serverNamespace) "" }}
 {{- range $index, $service := (lookup "v1" "Service" (default .Release.Namespace .chronicleAgent.serverNamespace) "").items }}
 {{- $name := get $service.metadata.labels "app.kubernetes.io/name" }}
 {{- $component := get $service.metadata.labels "app.kubernetes.io/component" }}
 {{- if and (eq $name "posit-chronicle") (eq $component "server") }}
 {{- (index $service.spec.ports 0).name }}://{{ $service.metadata.name }}.{{ $service.metadata.namespace }}
 {{- end }}
 {{- end }}
+{{- else }}
+{{- fail "Unable to resolve a Chronicle server address for Chronicle agent. Ensure that a Chronicle server is deployed in the same namespace as this chart or the namespace is specfied with chronicleAgent.serverNamespace when using chronicleAgent.autoDiscovery=true. Alternatively, specify chronicleAgent.serverAddress in the values.yaml file." }}
 {{- end }}
 {{- end }}

charts/rstudio-workbench/Chart.yaml

@@ -1,6 +1,6 @@
 name: rstudio-workbench
 description: Official Helm chart for Posit Workbench
-version: 0.9.13
+version: 0.9.14
 apiVersion: v2
 appVersion: 2025.09.1
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png

charts/rstudio-workbench/NEWS.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.9.14
+
+- Skip `rstudio-library` template call when `chronicleAgent.autoDiscovery=false`. Require `chronicleAgent.serverAddress`
+  to be set instead.
+
 ## 0.9.13
 
 - Bump Workbench version to 2025.09.1