Skip to content

Fixes to chronicle-agent helper functions #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianpittwood merged 3 commits into from
May 19, 2025
Merged

Fixes to chronicle-agent helper functions #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fd8abc
Fix misplaced spaces on labels in serverAddress lookup
ianpittwood May 19, 2025
bc455d6
Update helm-docs and README.md
actions-user May 19, 2025
997dcb7
Trigger CI
ianpittwood May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/rstudio-library/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions charts/rstudio-library/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/rstudio-library/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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_

Expand Down
12 changes: 6 additions & 6 deletions charts/rstudio-library/templates/_chronicle-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down