From 9fd8abc6fcb2257e5fc3a6d2221e6ccc90bbe2de Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Mon, 19 May 2025 12:31:14 -0600
Subject: [PATCH 1/3] Fix misplaced spaces on labels in serverAddress lookup

Change name to service.metadata.name

Use `eq` instead of `contains`
---
 charts/rstudio-library/Chart.yaml                    |  4 ++--
 charts/rstudio-library/NEWS.md                       |  4 ++++
 .../rstudio-library/templates/_chronicle-agent.tpl   | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/charts/rstudio-library/Chart.yaml b/charts/rstudio-library/Chart.yaml
index 35b003957..d3a060bbe 100644
--- a/charts/rstudio-library/Chart.yaml
+++ b/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.32
-appVersion: 0.1.32
+version: 0.1.33
+appVersion: 0.1.33
 
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 home: https://www.rstudio.com
diff --git a/charts/rstudio-library/NEWS.md b/charts/rstudio-library/NEWS.md
index c4b981890..ce90e86f0 100644
--- a/charts/rstudio-library/NEWS.md
+++ b/charts/rstudio-library/NEWS.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.33
+
+- Fixes to `rstudio-library.chronicle-agent.serverAddress` function.
+
 ## 0.1.32
 
 - Add `rstudio-library.chronicle-agent.image` and `rstudio-library.chronicle-agent.serverAddress` helper functions for
diff --git a/charts/rstudio-library/templates/_chronicle-agent.tpl b/charts/rstudio-library/templates/_chronicle-agent.tpl
index 74a59ffb6..3be369c51 100644
--- a/charts/rstudio-library/templates/_chronicle-agent.tpl
+++ b/charts/rstudio-library/templates/_chronicle-agent.tpl
@@ -17,7 +17,7 @@ Takes a dict:
 {{- 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 (contains "posit-chronicle" $name) (eq $component "server") }}
+{{- if and (eq $name "posit-chronicle") (eq $component "server") }}
 {{- $version = get $service.metadata.labels "app.kubernetes.io/version" }}
 {{- end }}
 {{- end }}
@@ -38,13 +38,13 @@ Takes a dict:
 */}}
 {{- define "rstudio-library.chronicle-agent.serverAddress" }}
 {{- if .chronicleAgent.serverAddress }}
-{{ .chronicleAgent.serverAddress}}
+{{ .chronicleAgent.serverAddress }}
 {{- else }}
 {{- 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 (contains "posit-chronicle" $name) (eq $component "server") }}
-{{ $name }}.{{ $service.metadata.namespace }}
+{{- $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") }}
+{{ $service.metadata.name }}.{{ $service.metadata.namespace }}
 {{- end }}
 {{- end }}
 {{- end }}

From bc455d6a21967daba87d80bc80988416d5c440a4 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Mon, 19 May 2025 18:34:04 +0000
Subject: [PATCH 2/3] Update helm-docs and README.md

---
 charts/rstudio-library/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/rstudio-library/README.md b/charts/rstudio-library/README.md
index b05d0147d..6e210d340 100644
--- a/charts/rstudio-library/README.md
+++ b/charts/rstudio-library/README.md
@@ -1,6 +1,6 @@
 # rstudio-library
 
-![Version: 0.1.32](https://img.shields.io/badge/Version-0.1.32-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.32](https://img.shields.io/badge/AppVersion-0.1.32-informational?style=flat-square)
+![Version: 0.1.33](https://img.shields.io/badge/Version-0.1.33-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.33](https://img.shields.io/badge/AppVersion-0.1.33-informational?style=flat-square)
 
 #### _Helm library helpers for use by official RStudio charts_
 

From 997dcb713f3cba895b1ae2af5a03bf3618036b00 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Mon, 19 May 2025 12:34:34 -0600
Subject: [PATCH 3/3] Trigger CI