Skip to content

Commit 54dc4ef

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1330 from hongkailiu/gci
NO-JIRA: Use github.com/daixiang0/gci to sort imports
2 parents dd60420 + 55fa151 commit 54dc4ef

56 files changed

Lines changed: 129 additions & 115 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ format:
3535
.PHONY: format
3636

3737
imports:
38-
which goimports || go install -mod=mod golang.org/x/tools/cmd/goimports@latest
39-
go list ./... | sed "s|^github.com/openshift/cluster-version-operator/||" | xargs goimports -w -local "k8s.io,github.com/openshift"
40-
go list ./... | sed "s|^github.com/openshift/cluster-version-operator/||" | xargs goimports -w -local "github.com/openshift/cluster-version-operator"
38+
which gci || go install -mod=mod github.com/daixiang0/gci@latest
39+
gci write --custom-order -s standard -s default -s "prefix(k8s.io)" -s "prefix(github.com/openshift)" -s localmodule --skip-vendor .
4140
.PHONY: imports
4241

4342
verify: verify-yaml verify-update

‎lib/manifest/manifest.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
package manifest
55

66
import (
7-
configv1 "github.com/openshift/api/config/v1"
8-
"github.com/openshift/library-go/pkg/manifest"
9-
107
"k8s.io/apimachinery/pkg/util/sets"
118
"k8s.io/klog/v2"
9+
10+
configv1 "github.com/openshift/api/config/v1"
11+
"github.com/openshift/library-go/pkg/manifest"
1212
)
1313

1414
// InclusionConfiguration configures manifest inclusion, so

‎lib/resourceapply/core.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ import (
55

66
"github.com/google/go-cmp/cmp"
77

8-
"k8s.io/klog/v2"
9-
108
corev1 "k8s.io/api/core/v1"
119
"k8s.io/apimachinery/pkg/api/equality"
1210
apierrors "k8s.io/apimachinery/pkg/api/errors"
1311
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1412
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
13+
"k8s.io/klog/v2"
1514
"k8s.io/utils/ptr"
1615

1716
"github.com/openshift/cluster-version-operator/lib/resourcemerge"

‎lib/resourceapply/cv.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import (
55

66
"github.com/google/go-cmp/cmp"
77

8-
configv1 "github.com/openshift/api/config/v1"
9-
configclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
10-
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
118
"k8s.io/apimachinery/pkg/api/errors"
129
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1310
"k8s.io/klog/v2"
1411
"k8s.io/utils/ptr"
1512

13+
configv1 "github.com/openshift/api/config/v1"
14+
configclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
15+
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
16+
1617
"github.com/openshift/cluster-version-operator/lib/resourcemerge"
1718
)
1819

‎lib/resourceapply/imagestream.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import (
55

66
"github.com/google/go-cmp/cmp"
77

8-
imagev1 "github.com/openshift/api/image/v1"
9-
imageclientv1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
108
"k8s.io/apimachinery/pkg/api/errors"
119
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1210
"k8s.io/klog/v2"
1311
"k8s.io/utils/ptr"
1412

13+
imagev1 "github.com/openshift/api/image/v1"
14+
imageclientv1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
15+
1516
"github.com/openshift/cluster-version-operator/lib/resourcemerge"
1617
)
1718

‎lib/resourceapply/operators.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ import (
44
"context"
55

66
"github.com/google/go-cmp/cmp"
7-
8-
"k8s.io/klog/v2"
9-
107
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
118
operatorsclientv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/typed/operators/v1"
129

1310
apierrors "k8s.io/apimachinery/pkg/api/errors"
1411
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12+
"k8s.io/klog/v2"
1513
"k8s.io/utils/ptr"
1614

1715
"github.com/openshift/cluster-version-operator/lib/resourcemerge"

‎lib/resourceapply/security.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import (
55

66
"github.com/google/go-cmp/cmp"
77

8-
securityv1 "github.com/openshift/api/security/v1"
9-
securityclientv1 "github.com/openshift/client-go/security/clientset/versioned/typed/security/v1"
108
apierrors "k8s.io/apimachinery/pkg/api/errors"
119
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1210
"k8s.io/klog/v2"
1311

12+
securityv1 "github.com/openshift/api/security/v1"
13+
securityclientv1 "github.com/openshift/client-go/security/clientset/versioned/typed/security/v1"
14+
1415
"github.com/openshift/cluster-version-operator/lib/resourcemerge"
1516
)
1617

‎lib/resourcebuilder/resourcebuilder.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ import (
1010
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
1111
operatorsclientv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/typed/operators/v1"
1212

13-
imagev1 "github.com/openshift/api/image/v1"
14-
securityv1 "github.com/openshift/api/security/v1"
15-
configclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
16-
imageclientv1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
17-
securityclientv1 "github.com/openshift/client-go/security/clientset/versioned/typed/security/v1"
18-
"github.com/openshift/library-go/pkg/manifest"
1913
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
2014
appsv1 "k8s.io/api/apps/v1"
2115
batchv1 "k8s.io/api/batch/v1"
@@ -31,6 +25,13 @@ import (
3125
"k8s.io/client-go/rest"
3226
apiregistrationclientv1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1"
3327

28+
imagev1 "github.com/openshift/api/image/v1"
29+
securityv1 "github.com/openshift/api/security/v1"
30+
configclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
31+
imageclientv1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
32+
securityclientv1 "github.com/openshift/client-go/security/clientset/versioned/typed/security/v1"
33+
"github.com/openshift/library-go/pkg/manifest"
34+
3435
"github.com/openshift/cluster-version-operator/lib/resourceapply"
3536
"github.com/openshift/cluster-version-operator/lib/resourcedelete"
3637
"github.com/openshift/cluster-version-operator/lib/resourceread"

‎lib/resourcedelete/imagestream.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"context"
55
"fmt"
66

7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8+
79
imagev1 "github.com/openshift/api/image/v1"
810
imageclientv1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
9-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
)
1112

1213
// DeleteImageStreamv1 checks the given resource for a valid delete annotation. If found

‎lib/resourcedelete/security.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"context"
55
"fmt"
66

7+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8+
79
securityv1 "github.com/openshift/api/security/v1"
810
securityclientv1 "github.com/openshift/client-go/security/clientset/versioned/typed/security/v1"
9-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
)
1112

1213
// DeleteSecurityContextConstraintsv1 checks the given resource for a valid delete annotation. If found

0 commit comments

Comments
 (0)