From 2dd283b21b9c6c6c20c9ba1b1c7875f35a361947 Mon Sep 17 00:00:00 2001
From: Vitor Rodrigo Vezani <vitor.vezani@fairwinds.com>
Date: Mon, 14 Oct 2024 11:17:17 -0300
Subject: [PATCH] =?UTF-8?q?[stable/insights-agent]=20Add=20support=20for?=
 =?UTF-8?q?=20`SERVICE=5FACCOUNT=5FANNOTATIONS`=20environment=20variable?=
 =?UTF-8?q?=20on=E2=80=A6=20(#1535)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add support for `SERVICE_ACCOUNT_ANNOTATIONS` environment variable on trivy

* bump patch version
---
 stable/insights-agent/CHANGELOG.md                 | 3 +++
 stable/insights-agent/Chart.yaml                   | 2 +-
 stable/insights-agent/templates/trivy/cronjob.yaml | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/stable/insights-agent/CHANGELOG.md b/stable/insights-agent/CHANGELOG.md
index 249fc0452..52455cfc3 100644
--- a/stable/insights-agent/CHANGELOG.md
+++ b/stable/insights-agent/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.4.13
+* Add support for `SERVICE_ACCOUNT_ANNOTATIONS` environment variable on trivy
+
 ## 4.4.12
 * bumped nova to 3.11
 
diff --git a/stable/insights-agent/Chart.yaml b/stable/insights-agent/Chart.yaml
index 256535aca..bd7bfd45d 100644
--- a/stable/insights-agent/Chart.yaml
+++ b/stable/insights-agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to run the Fairwinds Insights agent
 name: insights-agent
-version: 4.4.12
+version: 4.4.13
 appVersion: 9.2.1
 kubeVersion: ">= 1.22.0-0"
 icon: https://raw.githubusercontent.com/FairwindsOps/charts/master/stable/insights-agent/icon.png
diff --git a/stable/insights-agent/templates/trivy/cronjob.yaml b/stable/insights-agent/templates/trivy/cronjob.yaml
index d36f51941..d1e27d2af 100644
--- a/stable/insights-agent/templates/trivy/cronjob.yaml
+++ b/stable/insights-agent/templates/trivy/cronjob.yaml
@@ -75,6 +75,10 @@ spec:
             {{- end }}
             - name: NAMESPACE_ALLOWLIST
               value: {{ join "," .Values.trivy.namespaceAllowlist | lower }}
+            - name: SERVICE_ACCOUNT_ANNOTATIONS
+              value: >
+                {{- $annotations := .Values.trivy.serviceAccount.annotations }}
+                {{ $annotations | toJson }}
             {{ include "security-context" . | indent 12 | trim }}
           {{ include "uploaderContainer" . | indent 10 | trim }}
 {{- end -}}