Merge pull request #1328 from hongkailiu/openshift-goimports

NO-JIRA: Sort and verify imports

Author: openshift-merge-bot[bot]

Makefile

@@ -34,14 +34,20 @@ format:
 	go fmt ./...
 .PHONY: format
 
+imports:
+	which goimports || go install -mod=mod golang.org/x/tools/cmd/goimports@latest
+	go list ./... | sed "s|^github.com/openshift/cluster-version-operator/||" | xargs goimports -w -local "k8s.io,github.com/openshift"
+	go list ./... | sed "s|^github.com/openshift/cluster-version-operator/||" | xargs goimports -w -local "github.com/openshift/cluster-version-operator"
+.PHONY: imports
+
 verify: verify-yaml verify-update
 .PHONY: verify
 
 verify-yaml:
 	hack/verify-yaml.sh
 .PHONY: verify-yaml
 
-verify-update: update
+verify-update: imports update
 	git diff --exit-code HEAD
 .PHONY: verify-update
 

cmd/cluster-version-operator/image.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"

cmd/cluster-version-operator/main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/klog/v2"
 )
 

cmd/cluster-version-operator/render.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"

cmd/cluster-version-operator/start.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-version-operator/pkg/start"

cmd/cluster-version-operator/version.go

@@ -3,8 +3,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/openshift/cluster-version-operator/pkg/version"
 	"github.com/spf13/cobra"
+
+	"github.com/openshift/cluster-version-operator/pkg/version"
 )
 
 var (

hack/cluster-version-util/main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/klog/v2"
 )
 

hack/cluster-version-util/task_graph.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"

lib/capability/capability_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	configv1 "github.com/openshift/api/config/v1"

lib/resourceapply/admissionregistration.go

@@ -4,13 +4,15 @@ import (
 	"context"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
+
 	admissionregv1 "k8s.io/api/admissionregistration/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	admissionregclientv1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
+
+	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
 )
 
 func ApplyValidatingWebhookConfigurationv1(ctx context.Context, client admissionregclientv1.ValidatingWebhookConfigurationsGetter, required *admissionregv1.ValidatingWebhookConfiguration, reconciling bool) (*admissionregv1.ValidatingWebhookConfiguration, bool, error) {