From 89c9bdff6d5eae037075b7875b37651efebf2af9 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 1 Oct 2024 03:59:33 -0400 Subject: [PATCH] Added support for service account annotations (#1841) Co-authored-by: Evan Shoshan Co-authored-by: Megha Bansal --- stable/xray/CHANGELOG.md | 2 +- stable/xray/Chart.yaml | 2 +- stable/xray/templates/xray-serviceaccount.yaml | 4 ++++ stable/xray/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md index 78a4ab283..b4cd098fd 100644 --- a/stable/xray/CHANGELOG.md +++ b/stable/xray/CHANGELOG.md @@ -903,4 +903,4 @@ All changes to this chart will be documented in this file. ## [0.4.0] - Aug 22, 2018 * Enabled RBAC support * Added ingress support -* Updated Xray version to 2.2.4 +* Updated Xray version to 2.2.4 \ No newline at end of file diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml index e54688bf1..408224700 100644 --- a/stable/xray/Chart.yaml +++ b/stable/xray/Chart.yaml @@ -24,4 +24,4 @@ name: xray sources: - https://github.com/jfrog/charts type: application -version: 103.104.8 +version: 103.104.8 \ No newline at end of file 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 1932e2f25..bc57875af 100644 --- a/stable/xray/values.yaml +++ b/stable/xray/values.yaml @@ -356,6 +356,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