NO-JIRA: Fix new gosimple minor issues in the code

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>

Author: jparrill

Diff for: cmd/cluster/core/dump.go

@@ -12,11 +12,6 @@ import (
 	"strings"
 	"time"
 
-	configv1 "github.com/openshift/api/config/v1"
-	imagev1 "github.com/openshift/api/image/v1"
-	routev1 "github.com/openshift/api/route/v1"
-	securityv1 "github.com/openshift/api/security/v1"
-	agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
 	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	scheduling "github.com/openshift/hypershift/api/scheduling/v1alpha1"
 	"github.com/openshift/hypershift/cmd/log"
@@ -28,6 +23,12 @@ import (
 	supportforwarder "github.com/openshift/hypershift/support/forwarder"
 	supportutil "github.com/openshift/hypershift/support/util"
 
+	configv1 "github.com/openshift/api/config/v1"
+	imagev1 "github.com/openshift/api/image/v1"
+	routev1 "github.com/openshift/api/route/v1"
+	securityv1 "github.com/openshift/api/security/v1"
+	agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
+
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"

Diff for: control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go

@@ -1664,7 +1664,7 @@ func TestIncludeServingCertificates(t *testing.T) {
 
 			fakeClient := fake.NewClientBuilder().WithObjects(rootCA).Build()
 			for _, secret := range tc.servingSecrets {
-				fakeClient.Create(ctx, secret)
+				_ = fakeClient.Create(ctx, secret)
 			}
 
 			newRootCA, err := includeServingCertificates(ctx, fakeClient, hcp, rootCA)

Diff for: support/forwarder/forwarder.go

@@ -7,11 +7,13 @@ import (
 	"net/http"
 
 	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/transport/spdy"
+
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 

Diff for: support/forwarder/forwarder_test.go

@@ -5,13 +5,14 @@ import (
 	"strings"
 	"testing"
 
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-
-	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 func TestGetRunningKubeAPIServerPod(t *testing.T) {

Diff for: support/util/util.go

@@ -686,9 +686,5 @@ func HostFromURL(addr string) (string, error) {
 
 // EnableIfCustomKubeconfig returns true if the hosted control plane has a custom kubeconfig defined
 func EnableIfCustomKubeconfig(hcp *hyperv1.HostedControlPlane) bool {
-	if len(hcp.Spec.KubeAPIServerDNSName) > 0 {
-		return true
-	}
-
-	return false
+	return len(hcp.Spec.KubeAPIServerDNSName) > 0
 }

Diff for: test/e2e/util/util.go

@@ -64,6 +64,7 @@ import (
 	prometheusv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 	"go.uber.org/zap/zaptest"
+	"k8s.io/client-go/util/retry"
 )
 
 var expectedKasManagementComponents = []string{
@@ -1461,7 +1462,9 @@ func EnsureKubeAPIDNSName(t *testing.T, ctx context.Context, mgmtClient crclient
 	hc := entryHostedCluster.DeepCopy()
 	hc.Spec.KubeAPIServerDNSName = customApiServerHost
 	t.Log("Updating hosted cluster with KubeAPIDNSName")
-	err = mgmtClient.Update(ctx, hc)
+	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		return mgmtClient.Update(ctx, hc)
+	})
 	g.Expect(err).NotTo(HaveOccurred(), "failed to update hosted cluster")
 
 	customApiServerURL := fmt.Sprintf("https://%s:%s", customApiServerHost, forwardedLocalPort)
@@ -1542,7 +1545,9 @@ func EnsureKubeAPIDNSName(t *testing.T, ctx context.Context, mgmtClient crclient
 
 	// removing KubeAPIDNSName from HC
 	hc.Spec.KubeAPIServerDNSName = ""
-	err = mgmtClient.Update(ctx, hc)
+	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		return mgmtClient.Update(ctx, hc)
+	})
 	g.Expect(err).NotTo(HaveOccurred(), "failed to update hosted control plane")
 
 	EventuallyObject(t, ctx, "the KAS custom kubeconfig secret to be deleted",