From 35ec0773edfc82f4ba8a0fefb437a6182547800e Mon Sep 17 00:00:00 2001
From: Nick Blaskey <nick.blaskey@hpe.com>
Date: Mon, 29 Jul 2024 11:38:07 -0400
Subject: [PATCH] chore: add 'masterService.annotations' to Helm (#9697)

---
 docs/reference/deploy/helm-config-reference.rst      | 4 ++++
 helm/charts/determined/templates/master-service.yaml | 3 +++
 helm/charts/determined/values.yaml                   | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/docs/reference/deploy/helm-config-reference.rst b/docs/reference/deploy/helm-config-reference.rst
index 536a2ea3f1c..a751e9e119e 100644
--- a/docs/reference/deploy/helm-config-reference.rst
+++ b/docs/reference/deploy/helm-config-reference.rst
@@ -220,6 +220,10 @@
 -  ``imagePullSecretName``: Specifies the image pull secret for pulling the Determined master image.
    Required when using the enterprise edition.
 
+-  ``masterService``: Specifies the configuration applied to the service for the Determined master.
+
+   -  ``annotations``: Enables adding custom annotations to the Determined master service.
+
 -  ``telemetry``: Specifies whether we collect anonymous information about the usage of Determined.
 
    -  ``enabled``: Whether collection is enabled. Defaults to ``true``.
diff --git a/helm/charts/determined/templates/master-service.yaml b/helm/charts/determined/templates/master-service.yaml
index 9618a85c03a..44238edcba0 100644
--- a/helm/charts/determined/templates/master-service.yaml
+++ b/helm/charts/determined/templates/master-service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: determined-master-{{ .Release.Name }}
     determined.ai/master-service: "true"
     release: {{ .Release.Name }}
+  {{- if (.Values.masterService).annotations }}
+  annotations: {{- toYaml .Values.masterService.annotations | nindent 4 }}
+  {{- end }}
 spec:
   ports:
   - port: {{ required "A valid Values.masterPort entry required!" .Values.masterPort }}
diff --git a/helm/charts/determined/values.yaml b/helm/charts/determined/values.yaml
index 8c3a035cc8a..4ad3b9b20e1 100644
--- a/helm/charts/determined/values.yaml
+++ b/helm/charts/determined/values.yaml
@@ -76,6 +76,11 @@ createNonNamespacedObjects: true
 # load-balancer.
 useNodePortForMaster: false
 
+# Allow specifying annotations that will be put on the master service.
+# masterService:
+  # annotations:
+  #   a: b
+
 # Enable route support for Openshift by setting enabled to true. Configure tls termination (i.e edge) if needed.
 # openshiftRoute:
   # enabled: