From 65c242382ff0ed9ff680cb60291c6722f3394af9 Mon Sep 17 00:00:00 2001 From: Evan Shoshan Date: Thu, 16 Nov 2023 14:48:59 -0500 Subject: [PATCH] Added support for service account annotations --- stable/xray/CHANGELOG.md | 3 +++ stable/xray/Chart.yaml | 2 +- stable/xray/templates/xray-serviceaccount.yaml | 4 ++++ stable/xray/values.yaml | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md index f895c1514..2aa5335bd 100644 --- a/stable/xray/CHANGELOG.md +++ b/stable/xray/CHANGELOG.md @@ -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 diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml index 6edd30228..80ec93732 100644 --- a/stable/xray/Chart.yaml +++ b/stable/xray/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 3.85.5 +appVersion: 3.85.6 dependencies: - condition: postgresql.enabled name: postgresql diff --git a/stable/xray/templates/xray-serviceaccount.yaml b/stable/xray/templates/xray-serviceaccount.yaml index bdc545321..f2e7fec02 100644 --- a/stable/xray/templates/xray-serviceaccount.yaml +++ b/stable/xray/templates/xray-serviceaccount.yaml @@ -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" . }} diff --git a/stable/xray/values.yaml b/stable/xray/values.yaml index 310c24ec0..d0527d2ce 100644 --- a/stable/xray/values.yaml +++ b/stable/xray/values.yaml @@ -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