From 89600626ee9e2bbd1a02e95a8bd90acf4c7f870c Mon Sep 17 00:00:00 2001
From: Erik Rasmussen <ecr.referee@hotmail.com>
Date: Tue, 9 Jan 2024 16:35:42 -0600
Subject: [PATCH] Rebase conflict

---
 pkg/controller/controlled-cloudflared-connector.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/controller/controlled-cloudflared-connector.go b/pkg/controller/controlled-cloudflared-connector.go
index 1145892..86a4ebf 100644
--- a/pkg/controller/controlled-cloudflared-connector.go
+++ b/pkg/controller/controlled-cloudflared-connector.go
@@ -12,7 +12,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -66,6 +65,7 @@ func CreateControlledCloudflaredIfNotExist(
 	deployment := cloudflaredConnectDeploymentTemplating(
 		token,
 		namespace,
+		int32(replicas),
 		controllerPod.Spec.Volumes,
 		controllerVolumeMounts,
 	)
@@ -80,7 +80,7 @@ func CreateControlledCloudflaredIfNotExist(
 func cloudflaredConnectDeploymentTemplating(
 	token string,
 	namespace string,
-  replicas int32,
+	replicas int32,
 	extraVolumes []v1.Volume,
 	extraVolumeMounts []v1.VolumeMount,
 ) *appsv1.Deployment {
@@ -127,11 +127,11 @@ func cloudflaredConnectDeploymentTemplating(
 								"--token",
 								token,
 							},
-							VolumeMounts: volumeMounts,
+							VolumeMounts: extraVolumeMounts,
 						},
 					},
 					RestartPolicy: v1.RestartPolicyAlways,
-					Volumes:       volumes,
+					Volumes:       extraVolumes,
 				},
 			},
 		},