Skip to content

Commit 3d17010

Browse files
committed
chore: lint: misc: reorder imports
In preparation to the addition of linter-enforced import ordering, fix import orders in the nrovalidate/ and rte/ and tools/ subtrees. Commandlines used: ``` gci write --custom-order -s standard -s blank -s default -s 'prefix(k8s.io)' -s 'prefix(sigs.k8s.io)' -s 'prefix(github.com/openshift)' -s 'prefix(github.com/k8stopologyawareschedwg)' -s localmodule -s dot ./nrovalidate/ gci write --custom-order -s standard -s blank -s default -s 'prefix(k8s.io)' -s 'prefix(sigs.k8s.io)' -s 'prefix(github.com/openshift)' -s 'prefix(github.com/k8stopologyawareschedwg)' -s localmodule -s dot ./rte/ gci write --custom-order -s standard -s blank -s default -s 'prefix(k8s.io)' -s 'prefix(sigs.k8s.io)' -s 'prefix(github.com/openshift)' -s 'prefix(github.com/k8stopologyawareschedwg)' -s localmodule -s dot ./tools/ ``` This ordering is not the best nor the nicest, but it's very close to our existing unwritten standard, and can be checked and enforced by tooling. GCI is: https://github.com/daixiang0/gci Signed-off-by: Francesco Romani <[email protected]>
1 parent d354e12 commit 3d17010

File tree

11 files changed

+26
-21
lines changed

11 files changed

+26
-21
lines changed

nrovalidate/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ import (
2424
"os"
2525
"strings"
2626

27-
machineconfigv1 "github.com/openshift/api/machineconfiguration/v1"
28-
securityv1 "github.com/openshift/api/security/v1"
2927
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3028
k8sruntime "k8s.io/apimachinery/pkg/runtime"
3129
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -35,10 +33,12 @@ import (
3533
"sigs.k8s.io/controller-runtime/pkg/client"
3634
"sigs.k8s.io/controller-runtime/pkg/client/config"
3735

38-
nropv1 "github.com/openshift-kni/numaresources-operator/api/v1"
36+
machineconfigv1 "github.com/openshift/api/machineconfiguration/v1"
37+
securityv1 "github.com/openshift/api/security/v1"
3938

4039
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
4140

41+
nropv1 "github.com/openshift-kni/numaresources-operator/api/v1"
4242
nrovalidator "github.com/openshift-kni/numaresources-operator/nrovalidate/validator"
4343
"github.com/openshift-kni/numaresources-operator/pkg/version"
4444
)

nrovalidate/validator/kubeletconfig.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,17 @@ import (
2424
"k8s.io/apimachinery/pkg/util/sets"
2525
"k8s.io/klog/v2"
2626
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
27+
2728
"sigs.k8s.io/controller-runtime/pkg/client"
2829

30+
mcov1 "github.com/openshift/api/machineconfiguration/v1"
31+
2932
"github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform"
3033
"github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform/detect"
3134
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
35+
3236
hypershiftconsts "github.com/openshift-kni/numaresources-operator/internal/hypershift/consts"
3337
"github.com/openshift-kni/numaresources-operator/pkg/kubeletconfig"
34-
mcov1 "github.com/openshift/api/machineconfiguration/v1"
3538
)
3639

3740
const (

nrovalidate/validator/machineconfigpools.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
corev1 "k8s.io/api/core/v1"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/labels"
25+
2526
"sigs.k8s.io/controller-runtime/pkg/client"
2627

2728
mcov1 "github.com/openshift/api/machineconfiguration/v1"

nrovalidate/validator/noderesourcetopologies.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828
"sigs.k8s.io/controller-runtime/pkg/client/config"
2929

30-
topologyclientset "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned"
31-
3230
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
31+
topologyclientset "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned"
3332
)
3433

3534
const (

nrovalidate/validator/noderesourcetopologies_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/apimachinery/pkg/util/sets"
2525

2626
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
27-
2827
nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2"
2928
)
3029

nrovalidate/validator/podstatus.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ package validator
1919
import (
2020
"context"
2121

22-
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
23-
2422
corev1 "k8s.io/api/core/v1"
2523
"k8s.io/apimachinery/pkg/fields"
2624
"k8s.io/apimachinery/pkg/util/sets"
2725

2826
"sigs.k8s.io/controller-runtime/pkg/client"
27+
28+
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
2929
)
3030

3131
const (

nrovalidate/validator/schedcache.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ import (
2020
"context"
2121

2222
"github.com/go-logr/logr"
23+
24+
"sigs.k8s.io/controller-runtime/pkg/client"
25+
2326
"github.com/k8stopologyawareschedwg/deployer/pkg/clientutil"
2427
"github.com/k8stopologyawareschedwg/deployer/pkg/clientutil/nodes"
2528
"github.com/k8stopologyawareschedwg/deployer/pkg/deployer"
2629
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
30+
2731
"github.com/openshift-kni/numaresources-operator/internal/schedcache"
2832
"github.com/openshift-kni/numaresources-operator/pkg/objectnames"
29-
30-
"sigs.k8s.io/controller-runtime/pkg/client"
3133
)
3234

3335
const (

nrovalidate/validator/validator.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ import (
2828
"k8s.io/apimachinery/pkg/util/sets"
2929
"k8s.io/apimachinery/pkg/version"
3030
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
31+
3132
"sigs.k8s.io/controller-runtime/pkg/client"
3233

3334
"github.com/k8stopologyawareschedwg/deployer/pkg/clientutil"
3435
deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator"
35-
3636
nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2"
37+
3738
nropv1 "github.com/openshift-kni/numaresources-operator/api/v1"
3839
"github.com/openshift-kni/numaresources-operator/internal/nodegroups"
3940
"github.com/openshift-kni/numaresources-operator/pkg/objectnames"

rte/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323

2424
"k8s.io/klog/v2"
2525
"k8s.io/klog/v2/textlogger"
26+
2627
ctrl "sigs.k8s.io/controller-runtime"
2728

2829
rteconfiguration "github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/config"

rte/pkg/config/config_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"testing"
2323

2424
"k8s.io/klog"
25+
2526
"sigs.k8s.io/yaml"
2627
)
2728

0 commit comments

Comments
 (0)