Merge pull request #774 from fluxcd/fix-differ-sa

controller: use `DefaultServiceAccount` in differ
fluxcd · Sep 18, 2023 · b1d3ad3 · b1d3ad3
2 parents 6240012 + 2465cb4
commit b1d3ad3
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -79,16 +79,15 @@ type HelmReleaseReconciler struct {
 	client.Client
 	helper.Metrics
 
-	Config                *rest.Config
-	Scheme                *runtime.Scheme
-	EventRecorder         kuberecorder.EventRecorder
-	DefaultServiceAccount string
-	NoCrossNamespaceRef   bool
-	ClientOpts            runtimeClient.Options
-	KubeConfigOpts        runtimeClient.KubeConfigOptions
-	StatusPoller          *polling.StatusPoller
-	PollingOpts           polling.Options
-	ControllerName        string
+	Config              *rest.Config
+	Scheme              *runtime.Scheme
+	EventRecorder       kuberecorder.EventRecorder
+	NoCrossNamespaceRef bool
+	ClientOpts          runtimeClient.Options
+	KubeConfigOpts      runtimeClient.KubeConfigOptions
+	StatusPoller        *polling.StatusPoller
+	PollingOpts         polling.Options
+	ControllerName      string
 
 	httpClient        *retryablehttp.Client
 	requeueDependency time.Duration
@@ -325,7 +324,7 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
 				r.PollingOpts,
 				hr.Spec.KubeConfig,
 				r.KubeConfigOpts,
-				r.DefaultServiceAccount,
+				kube.DefaultServiceAccountName,
 				hr.Spec.ServiceAccountName,
 				hr.GetNamespace(),
 			), r.ControllerName)