From 52e640ee073279edf33398fd48c79ff18d457239 Mon Sep 17 00:00:00 2001
From: Lee Briggs <lee@leebriggs.co.uk>
Date: Mon, 5 May 2025 10:49:11 -0700
Subject: [PATCH] run gofmt

Updates #15875

Signed-off-by: Lee Briggs <lee@leebriggs.co.uk>
---
 cmd/k8s-operator/tsrecorder.go       | 21 -----------
 cmd/k8s-operator/tsrecorder_specs.go | 56 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 49 deletions(-)

diff --git a/cmd/k8s-operator/tsrecorder.go b/cmd/k8s-operator/tsrecorder.go
index 568b58799..cf642d811 100644
--- a/cmd/k8s-operator/tsrecorder.go
+++ b/cmd/k8s-operator/tsrecorder.go
@@ -171,7 +171,6 @@ func (r *RecorderReconciler) maybeProvision(ctx context.Context, tsr *tsapi.Reco
 	}
 	// Create the ServiceAccount only if the user hasn't specified a custom name
 	if tsr.Spec.StatefulSet.Pod.ServiceAccountName == "" {
-<<<<<<< HEAD
 		sa := tsrServiceAccount(tsr, r.tsNamespace)
 		if _, err := createOrUpdate(ctx, r.Client, r.tsNamespace, sa, func(s *corev1.ServiceAccount) {
 			s.ObjectMeta.Labels = sa.ObjectMeta.Labels
@@ -181,26 +180,6 @@ func (r *RecorderReconciler) maybeProvision(ctx context.Context, tsr *tsapi.Reco
 			return fmt.Errorf("error creating ServiceAccount: %w", err)
 		}
 	}
-||||||| b03a2a323
-	sa := tsrServiceAccount(tsr, r.tsNamespace)
-	if _, err := createOrUpdate(ctx, r.Client, r.tsNamespace, sa, func(s *corev1.ServiceAccount) {
-		s.ObjectMeta.Labels = sa.ObjectMeta.Labels
-		s.ObjectMeta.Annotations = sa.ObjectMeta.Annotations
-		s.ObjectMeta.OwnerReferences = sa.ObjectMeta.OwnerReferences
-	}); err != nil {
-		return fmt.Errorf("error creating ServiceAccount: %w", err)
-	}
-=======
-        sa := tsrServiceAccount(tsr, r.tsNamespace)
-        if _, err := createOrUpdate(ctx, r.Client, r.tsNamespace, sa, func(s *corev1.ServiceAccount) {
-            s.ObjectMeta.Labels = sa.ObjectMeta.Labels
-            s.ObjectMeta.Annotations = sa.ObjectMeta.Annotations
-            s.ObjectMeta.OwnerReferences = sa.ObjectMeta.OwnerReferences
-        }); err != nil {
-            return fmt.Errorf("error creating ServiceAccount: %w", err)
-        }
-    }
->>>>>>> upstream/proxyclass/sa
 	role := tsrRole(tsr, r.tsNamespace)
 	if _, err := createOrUpdate(ctx, r.Client, r.tsNamespace, role, func(r *rbacv1.Role) {
 		r.ObjectMeta.Labels = role.ObjectMeta.Labels
diff --git a/cmd/k8s-operator/tsrecorder_specs.go b/cmd/k8s-operator/tsrecorder_specs.go
index 47086559e..d7a21c713 100644
--- a/cmd/k8s-operator/tsrecorder_specs.go
+++ b/cmd/k8s-operator/tsrecorder_specs.go
@@ -46,11 +46,11 @@ func tsrStatefulSet(tsr *tsapi.Recorder, namespace string) *appsv1.StatefulSet {
 
 						return tsr.Name
 					}(),
-					Affinity:           tsr.Spec.StatefulSet.Pod.Affinity,
-					SecurityContext:    tsr.Spec.StatefulSet.Pod.SecurityContext,
-					ImagePullSecrets:   tsr.Spec.StatefulSet.Pod.ImagePullSecrets,
-					NodeSelector:       tsr.Spec.StatefulSet.Pod.NodeSelector,
-					Tolerations:        tsr.Spec.StatefulSet.Pod.Tolerations,
+					Affinity:         tsr.Spec.StatefulSet.Pod.Affinity,
+					SecurityContext:  tsr.Spec.StatefulSet.Pod.SecurityContext,
+					ImagePullSecrets: tsr.Spec.StatefulSet.Pod.ImagePullSecrets,
+					NodeSelector:     tsr.Spec.StatefulSet.Pod.NodeSelector,
+					Tolerations:      tsr.Spec.StatefulSet.Pod.Tolerations,
 					Containers: []corev1.Container{
 						{
 							Name: "recorder",
@@ -150,30 +150,30 @@ func tsrRole(tsr *tsapi.Recorder, namespace string) *rbacv1.Role {
 }
 
 func tsrRoleBinding(tsr *tsapi.Recorder, namespace string) *rbacv1.RoleBinding {
-    saName := tsr.Spec.StatefulSet.Pod.ServiceAccountName
-    if saName == "" {
-        saName = tsr.Name
-    }
+	saName := tsr.Spec.StatefulSet.Pod.ServiceAccountName
+	if saName == "" {
+		saName = tsr.Name
+	}
 
-    return &rbacv1.RoleBinding{
-        ObjectMeta: metav1.ObjectMeta{
-            Name:            tsr.Name,
-            Namespace:       namespace,
-            Labels:          labels("recorder", tsr.Name, nil),
-            OwnerReferences: tsrOwnerReference(tsr),
-        },
-        Subjects: []rbacv1.Subject{
-            {
-                Kind:      "ServiceAccount",
-                Name:      saName,
-                Namespace: namespace,
-            },
-        },
-        RoleRef: rbacv1.RoleRef{
-            Kind: "Role",
-            Name: tsr.Name,
-        },
-    }
+	return &rbacv1.RoleBinding{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            tsr.Name,
+			Namespace:       namespace,
+			Labels:          labels("recorder", tsr.Name, nil),
+			OwnerReferences: tsrOwnerReference(tsr),
+		},
+		Subjects: []rbacv1.Subject{
+			{
+				Kind:      "ServiceAccount",
+				Name:      saName,
+				Namespace: namespace,
+			},
+		},
+		RoleRef: rbacv1.RoleRef{
+			Kind: "Role",
+			Name: tsr.Name,
+		},
+	}
 }
 
 func tsrAuthSecret(tsr *tsapi.Recorder, namespace string, authKey string) *corev1.Secret {