From 7d1073f7f6e52be4ab5841675d1dface24a79403 Mon Sep 17 00:00:00 2001 From: Mark Tucker Date: Tue, 2 Apr 2024 15:14:53 -0400 Subject: [PATCH] merge from main --- charts/rstudio-pm/Chart.yaml | 2 +- charts/rstudio-pm/NEWS.md | 10 +++------- charts/rstudio-pm/README.md | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/charts/rstudio-pm/Chart.yaml b/charts/rstudio-pm/Chart.yaml index 45a1fbf2..1ea78855 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.21 +version: 0.5.22 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 6c62d0b8..9c6da5a8 100644 --- a/charts/rstudio-pm/NEWS.md +++ b/charts/rstudio-pm/NEWS.md @@ -1,18 +1,14 @@ -<<<<<<< HEAD -# 0.5.21 +# Changelog -- Add documentation on running the Chronicle Agent on version 2024.03.0 as a sidecar container +## 0.5.22 -# 0.5.20 -======= -# Changelog +- Add documentation on running the Chronicle Agent on version 2024.03.0 as a sidecar container ## 0.5.21 - Updates to support standalone documentation site ## 0.5.20 ->>>>>>> origin/main - 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/README.md b/charts/rstudio-pm/README.md index 539984c5..a9a8355b 100644 --- a/charts/rstudio-pm/README.md +++ b/charts/rstudio-pm/README.md @@ -1,6 +1,6 @@ # Posit Package Manager -![Version: 0.5.21](https://img.shields.io/badge/Version-0.5.21-informational?style=flat-square) ![AppVersion: 2023.12.0](https://img.shields.io/badge/AppVersion-2023.12.0-informational?style=flat-square) +![Version: 0.5.22](https://img.shields.io/badge/Version-0.5.22-informational?style=flat-square) ![AppVersion: 2023.12.0](https://img.shields.io/badge/AppVersion-2023.12.0-informational?style=flat-square) #### _Official Helm chart for RStudio Package Manager_ @@ -21,11 +21,11 @@ To ensure a stable production deployment, please: ## Installing the Chart -To install the chart with the release name `my-release` at version 0.5.21: +To install the chart with the release name `my-release` at version 0.5.22: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.21 +helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.22 ``` To explore other chart versions, take a look at: