From 9a04c1971363bb7f9c0ace46613eaa6f0b3d19d2 Mon Sep 17 00:00:00 2001
From: Ishan Sharma <38211728+ishuar@users.noreply.github.com>
Date: Mon, 8 Jul 2024 22:16:07 +0100
Subject: [PATCH] fix: service account naming (#530)

Use the service account name template for its naming. Update chart version.

Fixes https://github.com/pulumi/pulumi-kubernetes-operator/issues/529.

---------

Co-authored-by: Bryce Lampe <bryce@pulumi.com>
---
 CHANGELOG.md                                  | 5 +++++
 deploy/helm/pulumi-operator/Chart.yaml        | 3 +--
 deploy/helm/pulumi-operator/templates/sa.yaml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bc99c39..3336cd51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ CHANGELOG
 =========
 
 ## HEAD (unreleased)
+
+### Fixed
+- Respect `serviceAccount.name` in Helm chart values. [#530](https://github.com/pulumi/pulumi-kubernetes-operator/pull/530)
+
+### Changed
 - Update pulumi/pulumi to v3.115.2. [#580](https://github.com/pulumi/pulumi-kubernetes-operator/pull/580)
 - Regenerate CRDs with controller-gen v0.15.0. [#581](https://github.com/pulumi/pulumi-kubernetes-operator/pull/581)
 
diff --git a/deploy/helm/pulumi-operator/Chart.yaml b/deploy/helm/pulumi-operator/Chart.yaml
index 5f869aee..652da240 100755
--- a/deploy/helm/pulumi-operator/Chart.yaml
+++ b/deploy/helm/pulumi-operator/Chart.yaml
@@ -9,8 +9,7 @@ icon: https://www.pulumi.com/logos/brand/avatar-on-white.svg
 
 type: application
 
-
-version: 0.7.3
+version: 0.7.4
 appVersion: 1.14.0
 
 keywords:
diff --git a/deploy/helm/pulumi-operator/templates/sa.yaml b/deploy/helm/pulumi-operator/templates/sa.yaml
index 8b585e9a..970d76d6 100644
--- a/deploy/helm/pulumi-operator/templates/sa.yaml
+++ b/deploy/helm/pulumi-operator/templates/sa.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "pulumi-kubernetes-operator.fullname" . }}
+  name: {{ include "pulumi-kubernetes-operator.serviceAccountName" . }}
   labels:
   {{- include "pulumi-kubernetes-operator.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}