lint issues fix

Author: AndrewChubatiuk

test/e2e/upgrade/upgrade_test.go

@@ -26,8 +26,6 @@ type vmAgentTestCase struct {
 	operatorVersion string
 	mod             func(*vmv1beta1.VMAgent)
 	depSpec         *appsv1.DeploymentSpec
-	dsSpec          *appsv1.DaemonSetSpec
-	stsSpec         *appsv1.StatefulSetSpec
 }
 
 type vmSingleTestCase struct {
@@ -101,7 +99,7 @@ var _ = Describe("operator upgrade", Serial, Label("upgrade"), func() {
 
 		removeOldOperator(ctx, k8sClient, namespace)
 
-		_, _ = startNewOperator(ctx)
+		startNewOperator(ctx)
 		DeferCleanup(func() {
 			defer GinkgoRecover()
 
@@ -204,7 +202,7 @@ var _ = Describe("operator upgrade", Serial, Label("upgrade"), func() {
 
 		removeOldOperator(ctx, k8sClient, namespace)
 
-		_, _ = startNewOperator(ctx)
+		startNewOperator(ctx)
 		DeferCleanup(func() {
 			defer GinkgoRecover()
 
@@ -347,7 +345,7 @@ var _ = Describe("operator upgrade", Serial, Label("upgrade"), func() {
 
 		removeOldOperator(ctx, k8sClient, namespace)
 
-		_, _ = startNewOperator(ctx)
+		startNewOperator(ctx)
 		DeferCleanup(func() {
 			defer GinkgoRecover()
 

test/e2e/upgrade/utils.go

@@ -226,12 +226,10 @@ func removeOldOperator(ctx context.Context, k8sClient client.Client, watchNamesp
 }
 
 var managerStarted bool
-var cancelManager context.CancelFunc
-var managerDone chan struct{}
 
-func startNewOperator(ctx context.Context) (context.CancelFunc, chan struct{}) {
+func startNewOperator(ctx context.Context) {
 	if managerStarted {
-		return cancelManager, managerDone
+		return
 	}
 	managerStarted = true
 
@@ -241,20 +239,17 @@ func startNewOperator(ctx context.Context) (context.CancelFunc, chan struct{}) {
 		"--health-probe-bind-address", "0",
 		"--controller.maxConcurrentReconciles", "30",
 	)
-	managerDone = make(chan struct{})
 	var managerCtx context.Context
-	managerCtx, cancelManager = context.WithCancel(ctx)
+	managerCtx, cancelManager := context.WithCancel(ctx)
 
 	go func() {
 		defer GinkgoRecover()
 		err := manager.RunManager(managerCtx)
 		if err != nil && !k8serrors.IsNotFound(err) {
 			fmt.Printf("manager returned error: %v\n", err)
 		}
-		close(managerDone)
+		cancelManager()
 	}()
-
-	return cancelManager, managerDone
 }
 
 func cleanupNamespace(ctx context.Context, k8sClient client.Client, watchNamespace string) {