Skip to content

Commit

Permalink
Added support for service account annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Shoshan committed Nov 16, 2023
1 parent b087778 commit 65c2423
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions stable/xray/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# JFrog Xray Chart Changelog
All changes to this chart will be documented in this file.

## [103.85.6] - Sep 16, 2023
* Added support for `serviceAccount.annotations`to be passed to chart

## [103.85.5] - Sep 15,2023
* Fixed - Support to configure privateRegistry for pre-upgrade-hook

Expand Down
2 changes: 1 addition & 1 deletion stable/xray/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 3.85.5
appVersion: 3.85.6
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand Down
4 changes: 4 additions & 0 deletions stable/xray/templates/xray-serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
apiVersion: v1
kind: ServiceAccount
metadata:
{{- with .Values.serviceAccount.annotations }}
annotations:
{{ tpl (toYaml .) $ | indent 4 }}
{{- end }}
labels:
app: {{ template "xray.name" . }}
chart: {{ template "xray.chart" . }}
Expand Down
2 changes: 2 additions & 0 deletions stable/xray/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ serviceAccount:
## The name of the ServiceAccount to use.
## If not set and create is true, a name is generated using the fullname template
name:
## Service Account annotations
annotations: {}
## Explicitly mounts the API credentials for the Service Account
automountServiceAccountToken: true

Expand Down

0 comments on commit 65c2423

Please sign in to comment.