From 5b8120501f2af35922485a4dae3c758f0e6ca6df Mon Sep 17 00:00:00 2001
From: Alex Mapley <al.mapley@posit.co>
Date: Wed, 27 Mar 2024 13:00:10 -0400
Subject: [PATCH] add chronicle example for ppm, update chart values

---
 README.md                            | 1 +
 charts/posit-chronicle/Chart.yaml    | 2 +-
 charts/posit-chronicle/NEWS.md       | 4 +++-
 charts/posit-chronicle/values.yaml   | 9 +++++----
 charts/rstudio-pm/Chart.yaml         | 2 +-
 charts/rstudio-pm/NEWS.md            | 4 ++++
 charts/rstudio-pm/ci/all-values.yaml | 9 +++++++++
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 32cf71fb..9e53a054 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Individual helm charts have their own documentation
 - [Posit Connect](./charts/rstudio-connect)
 - [Posit Workbench](./charts/rstudio-workbench)
 - [Posit Package Manager](./charts/rstudio-pm)
+- [Posit Chronicle](./charts/posit-chronicle)
 
 Examples:
 
diff --git a/charts/posit-chronicle/Chart.yaml b/charts/posit-chronicle/Chart.yaml
index 8dd801d0..d3075872 100644
--- a/charts/posit-chronicle/Chart.yaml
+++ b/charts/posit-chronicle/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: posit-chronicle
 description: Official Helm chart for Posit Chronicle Server
-version: 0.2.2
+version: 0.3.0
 appVersion: 2024.03.0
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 home: https://www.posit.co
diff --git a/charts/posit-chronicle/NEWS.md b/charts/posit-chronicle/NEWS.md
index 1e52d848..473315b2 100644
--- a/charts/posit-chronicle/NEWS.md
+++ b/charts/posit-chronicle/NEWS.md
@@ -1,6 +1,8 @@
-# 0.2.2
+# 0.3.0
 
 - Bump Chronicle to version 2024.03.0
+- Moves `pod.NodeSelector` value to the top level as `NodeSelector`, in line with other charts
+- Disable local storage by default
 
 # 0.2.1
 
diff --git a/charts/posit-chronicle/values.yaml b/charts/posit-chronicle/values.yaml
index 17b4fefd..9d747ba8 100644
--- a/charts/posit-chronicle/values.yaml
+++ b/charts/posit-chronicle/values.yaml
@@ -26,6 +26,9 @@ service:
 # -- The number of replica pods to maintain for this service
 replicas: 1
 
+# -- A map used verbatim as the pod's "nodeSelector" definition
+nodeSelector: {}
+
 pod:
   # -- The command and args to run in the chronicle-server container
   command: "/chronicle"
@@ -40,8 +43,6 @@ pod:
   selectorLabels: {}
   # -- A map used verbatim as the pod's "affinity" definition
   affinity: {}
-  # -- A map used verbatim as the pod's "nodeSelector" definition
-  nodeSelector: {}
   # -- An array used verbatim as the pod's "tolerations" definition
   tolerations: []
   # -- The termination grace period seconds allowed for the pod before shutdown
@@ -69,9 +70,9 @@ config:
     ServiceLogLevel: "INFO"
     ServiceLogFormat: "TEXT"
   LocalStorage:
-    # If localStorage.enabled=false, the chronicle stateful-set
+    # By default when localStorage.enabled=false, the chronicle stateful-set
     # won't submit a volume claim or be bound to a persistent volume
-    Enabled: true
+    Enabled: false
     Location: "./chronicle-data"
     RetentionPeriod: "30d"
   S3Storage:
diff --git a/charts/rstudio-pm/Chart.yaml b/charts/rstudio-pm/Chart.yaml
index 0df9b410..84df305a 100644
--- a/charts/rstudio-pm/Chart.yaml
+++ b/charts/rstudio-pm/Chart.yaml
@@ -1,6 +1,6 @@
 name: rstudio-pm
 description: Official Helm chart for RStudio Package Manager
-version: 0.5.20
+version: 0.5.21
 apiVersion: v2
 appVersion: 2023.12.0
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
diff --git a/charts/rstudio-pm/NEWS.md b/charts/rstudio-pm/NEWS.md
index 0adce82f..55af4357 100644
--- a/charts/rstudio-pm/NEWS.md
+++ b/charts/rstudio-pm/NEWS.md
@@ -1,3 +1,7 @@
+# 0.5.21
+
+- Add documentation on running the Chronicle Agent on version 2024.03.0 as a sidecar container
+
 # 0.5.20
 
 - Removed`config.Server.RVersion` from the values.yaml. This does not need to be configured, R version auto-detection will be used ([#473](https://github.com/rstudio/helm/issues/473)).
diff --git a/charts/rstudio-pm/ci/all-values.yaml b/charts/rstudio-pm/ci/all-values.yaml
index 6df3a720..efa2c9b8 100644
--- a/charts/rstudio-pm/ci/all-values.yaml
+++ b/charts/rstudio-pm/ci/all-values.yaml
@@ -75,3 +75,12 @@ pod:
   labels:
     onelabel.com: value
 priorityClassName: someval
+
+# Testing with the chronicle-agent sidecar container
+extraContainers:
+  - name: chronicle-agent
+    image: ghcr.io/rstudio/chronicle-agent:2024.03.0
+    imagePullPolicy: Always
+    env:
+    - name: CHRONICLE_SERVER_ADDRESS
+      value: "http://chronicle-server.default"