Fix #1379: fix lint

apache · Mar 30, 2020 · 5c97ab4 · 5c97ab4
1 parent 7c32ff7
commit 5c97ab4
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go
@@ -138,13 +138,6 @@ func Run() {
 		os.Exit(1)
 	}
 
-	// Try to register the OpenShift CLI Download link if possible
-	installCtx, _ := context.WithTimeout(context.TODO(), 30 * time.Second)
-	if err := install.OpenShiftConsoleDownloadLink(installCtx, c); err != nil {
-		log.Info("Cannot install OpenShift CLI download link: skipping.")
-		log.V(8).Info("Error while installing OpenShift CLI download link", "error", err)
-	}
-
 	log.Info("Registering Components.")
 
 	// Setup Scheme for all resources
@@ -153,6 +146,14 @@ func Run() {
 		os.Exit(1)
 	}
 
+	// Try to register the OpenShift CLI Download link if possible
+	installCtx, installCancel := context.WithTimeout(context.TODO(), 30*time.Second)
+	defer installCancel()
+	if err := install.OpenShiftConsoleDownloadLink(installCtx, c); err != nil {
+		log.Info("Cannot install OpenShift CLI download link: skipping.")
+		log.V(8).Info("Error while installing OpenShift CLI download link", "error", err)
+	}
+
 	// Setup all Controllers
 	if err := controller.AddToManager(mgr); err != nil {
 		log.Error(err, "")