diff --git a/charts/rstudio-pm/Chart.yaml b/charts/rstudio-pm/Chart.yaml index aee75c8db..50d458ff3 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 Posit Package Manager -version: 0.5.53 +version: 0.20.0 apiVersion: v2 appVersion: 2025.12.0 icon: https://raw.githubusercontent.com/rstudio/helm/main/images/posit-icon-fullcolor.svg @@ -18,8 +18,8 @@ dependencies: repository: https://helm.rstudio.com annotations: artifacthub.io/images: | - - name: rstudio-package-manager - image: rstudio/rstudio-package-manager:ubuntu2204-2025.12.0 + - name: package-manager + image: posit/package-manager:2025.12.0-ubuntu-24.04 artifacthub.io/license: MIT artifacthub.io/links: | - name: RStudio Community diff --git a/charts/rstudio-pm/NEWS.md b/charts/rstudio-pm/NEWS.md index cf526007f..84f70433f 100644 --- a/charts/rstudio-pm/NEWS.md +++ b/charts/rstudio-pm/NEWS.md @@ -1,5 +1,11 @@ # Changelog +## 0.20.0 + +- BREAKING: Default images now use `posit/package-manager` instead of `rstudio/rstudio-package-manager` +- BREAKING: Image tag format changed from `{os}{version}` (e.g. `ubuntu2204-2025.12.0`) to `{version}-{os}` (e.g. `2025.12.0-ubuntu-24.04`) +- BREAKING: `image.tagPrefix` replaced by `image.os` + ## 0.5.53 - Update chart icon to Posit icon diff --git a/charts/rstudio-pm/README.md b/charts/rstudio-pm/README.md index cd7805a8d..2393677f5 100644 --- a/charts/rstudio-pm/README.md +++ b/charts/rstudio-pm/README.md @@ -1,6 +1,6 @@ # Posit Package Manager -![Version: 0.5.53](https://img.shields.io/badge/Version-0.5.53-informational?style=flat-square) ![AppVersion: 2025.12.0](https://img.shields.io/badge/AppVersion-2025.12.0-informational?style=flat-square) +![Version: 0.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![AppVersion: 2025.12.0](https://img.shields.io/badge/AppVersion-2025.12.0-informational?style=flat-square) #### _Official Helm chart for Posit Package Manager_ @@ -24,11 +24,11 @@ To ensure a stable production deployment: ## Installing the chart -To install the chart with the release name `my-release` at version 0.5.53: +To install the chart with the release name `my-release` at version 0.20.0: ```{.bash} helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.53 +helm upgrade --install my-release rstudio/rstudio-pm --version=0.20.0 ``` To explore other chart versions, look at: @@ -209,9 +209,9 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config | fullnameOverride | string | `""` | the full name of the release (can be overridden) | | image.imagePullPolicy | string | `"IfNotPresent"` | the imagePullPolicy for the main pod image | | image.imagePullSecrets | list | `[]` | an array of kubernetes secrets for pulling the main pod image from private registries | -| image.repository | string | `"rstudio/rstudio-package-manager"` | the repository to use for the main pod image | -| image.tag | string | `""` | the tag to use for the main pod image | -| image.tagPrefix | string | `"ubuntu2204-"` | A tag prefix for the server image (common selection: ubuntu2204-). Only used if tag is not defined | +| image.os | string | `"ubuntu-24.04"` | The OS version for the image tag (e.g. ubuntu-24.04, ubuntu-22.04). Only used if tag is not defined | +| image.repository | string | `"posit/package-manager"` | the repository to use for the main pod image | +| image.tag | string | `""` | the tag to use for the main pod image. Overrides os and appVersion | | ingress.annotations | object | `{}` | | | ingress.enabled | bool | `false` | | | ingress.hosts | string | `nil` | | diff --git a/charts/rstudio-pm/templates/deployment.yaml b/charts/rstudio-pm/templates/deployment.yaml index e5e38a1ec..f404d3190 100644 --- a/charts/rstudio-pm/templates/deployment.yaml +++ b/charts/rstudio-pm/templates/deployment.yaml @@ -80,7 +80,7 @@ spec: containers: - name: rspm {{- $defaultVersion := .Values.versionOverride | default $.Chart.AppVersion }} - {{- $imageTag := .Values.image.tag | default (printf "%s%s" .Values.image.tagPrefix $defaultVersion )}} + {{- $imageTag := .Values.image.tag | default (printf "%s-%s" $defaultVersion .Values.image.os )}} image: "{{ .Values.image.repository }}:{{ $imageTag }}" env: {{- include "rstudio-library.license-env" (dict "license" ( .Values.license ) "product" ("rstudio-pm") "envVarPrefix" ("RSPM") "fullName" (include "rstudio-pm.fullname" .)) | nindent 8 }} diff --git a/charts/rstudio-pm/values.yaml b/charts/rstudio-pm/values.yaml index d1f9a38ca..fa2e832e2 100644 --- a/charts/rstudio-pm/values.yaml +++ b/charts/rstudio-pm/values.yaml @@ -33,10 +33,10 @@ sharedStorage: image: # -- the repository to use for the main pod image - repository: rstudio/rstudio-package-manager - # -- A tag prefix for the server image (common selection: ubuntu2204-). Only used if tag is not defined - tagPrefix: ubuntu2204- - # -- the tag to use for the main pod image + repository: posit/package-manager + # -- The OS version for the image tag (e.g. ubuntu-24.04, ubuntu-22.04). Only used if tag is not defined + os: "ubuntu-24.04" + # -- the tag to use for the main pod image. Overrides os and appVersion tag: "" # -- the imagePullPolicy for the main pod image imagePullPolicy: IfNotPresent