Skip to content
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

Resolve issue so subPath: true works correctly #429

Merged
merged 11 commits into from
Oct 25, 2023
+151 −37
Merged

Resolve issue so subPath: true works correctly #429

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fbb37dd
Resolve issue so subPath: true works correctly
tnederlof Oct 23, 2023
212744a
Update helm-docs and README.md
actions-user Oct 23, 2023
1f4815c
Remove whitespace
tnederlof Oct 23, 2023
c03088d
Merge branch 'main' into tn-fix-secret-subpath
tnederlof Oct 24, 2023
3e73ba0
Bump all products to use rstudio-library 0.1.27
tnederlof Oct 24, 2023
4767533
Update helm-docs and README.md
actions-user Oct 24, 2023
0bb613f
Update Chart.lock for each product
tnederlof Oct 24, 2023
db4ceb5
Update rstudio-launcher-rbac to latest rstudio-library
tnederlof Oct 24, 2023
9d1652c
Update helm-docs and README.md
actions-user Oct 24, 2023
ad63956
Update rbac yaml
actions-user Oct 24, 2023
942eff3
Add final newline
tnederlof Oct 25, 2023
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.26
appVersion: 0.1.26
version: 0.1.27
appVersion: 0.1.27

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,3 +1,7 @@
# 0.1.27

- Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true` ([#427](https://github.com/rstudio/helm/issues/427)).

# 0.1.26

- Add the capability to add labels to service accounts
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.26](https://img.shields.io/badge/Version-0.1.26-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.26](https://img.shields.io/badge/AppVersion-0.1.26-informational?style=flat-square)
![Version: 0.1.27](https://img.shields.io/badge/Version-0.1.27-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.27](https://img.shields.io/badge/AppVersion-0.1.27-informational?style=flat-square)

#### _Helm library helpers for use by Official RStudio charts_

Expand Down
7 changes: 6 additions & 1 deletion charts/rstudio-library/templates/_license-mount.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
{{- define "rstudio-library.license-mount" -}}
{{- if or .license.file.contents .license.file.secret }}
- name: license-file
mountPath: {{ .license.file.mountPath | quote }}
{{- if .license.file.mountSubPath }}
mountPath: "{{ .license.file.mountPath }}/{{ .license.file.secretKey }}"
subPath: {{ .license.file.secretKey | quote }}
{{ else }}
mountPath: {{ .license.file.mountPath | quote }}
{{- end }}
{{- end }}
{{- end -}}{{- /* end define template */ -}}



tnederlof marked this conversation as resolved.
Show resolved Hide resolved