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

Jump to bottom

[xray]Added support for service account annotations #1841

Merged
merged 2 commits into from
Oct 1, 2024
Merged

[xray]Added support for service account annotations #1841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c2423
Added support for service account annotations
Nov 16, 2023
839063b
Merge branch 'xray-3.105.x' into master
megha1906 Oct 1, 2024
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
3 changes: 3 additions & 0 deletions stable/xray/CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading