From e796e4965047073f32e067b229159e597a4cde74 Mon Sep 17 00:00:00 2001
From: Matthew Ahrenstein <ahrenstein@users.noreply.github.com>
Date: Fri, 21 Jun 2024 15:25:40 -0400
Subject: [PATCH] Add fleet license as an optional helm value (#19923)

---
 charts/fleet/Chart.yaml                | 2 +-
 charts/fleet/templates/deployment.yaml | 7 +++++++
 charts/fleet/values.yaml               | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index 99680b3527..9fb4886fe1 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -4,7 +4,7 @@ name: fleet
 keywords:
   - fleet
   - osquery
-version: v6.0.2
+version: v6.0.3
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
diff --git a/charts/fleet/templates/deployment.yaml b/charts/fleet/templates/deployment.yaml
index 8b4a4d3fa0..734fbe416e 100644
--- a/charts/fleet/templates/deployment.yaml
+++ b/charts/fleet/templates/deployment.yaml
@@ -96,6 +96,13 @@ spec:
             value: "{{ .Values.fleet.carving.s3.stsAssumeRoleARN }}"
           {{- end }}
           {{- end }}
+          {{- if .Values.fleet.license.secretName }}
+          - name: FLEET_LICENSE_KEY
+            valueFrom:
+              secretKeyRef:
+                key: {{ .Values.fleet.license.licenseKey }}
+                name: {{ .Values.fleet.license.secretName }}
+          {{- end }}
           ## END FLEET SECTION
           ## BEGIN MYSQL SECTION
           - name: FLEET_MYSQL_ADDRESS
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index 394798ea00..0327a52cce 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -90,6 +90,9 @@ fleet:
       accessKeyID: ""
       secretKey: s3-bucket
       stsAssumeRoleARN: ""
+  license:
+    secretName: ""
+    licenseKey: license-key
   extraVolumes: []
   extraVolumeMounts: []