Merge pull request #48 from rstudio/fix-rsw

Fix rsw
rstudio · Sep 10, 2021 · 62a7490 · 62a7490
2 parents bf49d98 + 4f80b2e
commit 62a7490
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/charts/rstudio-workbench/Chart.yaml b/charts/rstudio-workbench/Chart.yaml
@@ -1,6 +1,6 @@
 name: rstudio-workbench
 description: Official Helm chart for RStudio Workbench
-version: 0.4.2
+version: 0.4.3
 apiVersion: v2
 appVersion: 1.4.1717-3
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png

diff --git a/charts/rstudio-workbench/NEWS.md b/charts/rstudio-workbench/NEWS.md
@@ -1,3 +1,14 @@
+# 0.4.3
+
+- BUGFIX: The load-balancer sidecar container was not selecting app labels properly. This is now fixed. It could have been causing issues in load-balanced setups
+
+# 0.4.2
+
+- BUGFIX: session configuration is now mounted to the proper location on session pods
+- BUGFIX: Prometheus annotations are now properly defined (they were using the wrong port)
+- BUGFIX: The Graphite Exporter regex had a bug that did not handle certain hostnames
+- Customizing the graphite exporter "mapping.yaml" is now configurable by defining `.Values.prometheusExporter.mappingYaml`
+
 # 0.4.1
 
 - Update docs

diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md
@@ -1,6 +1,6 @@
 # RStudio Workbench
 
-![Version: 0.4.2](https://img.shields.io/badge/Version-0.4.2-informational?style=flat-square) ![AppVersion: 1.4.1717-3](https://img.shields.io/badge/AppVersion-1.4.1717--3-informational?style=flat-square)
+![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![AppVersion: 1.4.1717-3](https://img.shields.io/badge/AppVersion-1.4.1717--3-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Workbench_
 
@@ -23,11 +23,11 @@ As a result, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.4.2:
+To install the chart with the release name `my-release` at version 0.4.3:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm install my-release rstudio/rstudio-workbench --version=0.4.2
+helm install my-release rstudio/rstudio-workbench --version=0.4.3
 ```
 
 ## Required Configuration

diff --git a/charts/rstudio-workbench/templates/_helpers.tpl b/charts/rstudio-workbench/templates/_helpers.tpl
@@ -164,7 +164,7 @@ containers:
     {{- toYaml .Values.loadBalancer.env | nindent 2 }}
   {{- end }}
   args:
-    - "{{ include "rstudio-workbench.fullname" . }}"
+    - "{{ include "rstudio-workbench.name" . }}"
     - "{{ $.Release.Namespace }}"
     - "/mnt/load-balancer/rstudio/"
     - "{{ .Values.loadBalancer.sleepDuration }}"
@@ -343,7 +343,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ end }}
 
 {{- define "rstudio-workbench.annotations" -}}
-{{- range $key,$value := $.Values.service.annotations -}}
+{{- range $key,$value := .Values.service.annotations -}}
 {{ $key }}: {{ $value | quote }}
 {{ end }}
 {{- end -}}