Skip to content

chore: add fmt-imports.sh and fmt imports #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zmberg merged 1 commit into from
Apr 19, 2026
Merged

chore: add fmt-imports.sh and fmt imports #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and
fmt: ## Run go fmt against code.
go fmt ./...

.PHONY: fmt-imports
fmt-imports: ## Format Go import ordering using gci.
@bash hack/fmt-imports.sh

.PHONY: vet
vet: ## Run go vet against code.
go vet ./...
Expand Down
6 changes: 1 addition & 5 deletions cmd/agent-sandbox-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@ import (
"k8s.io/apimachinery/pkg/selection"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
_ "k8s.io/client-go/plugin/pkg/client/auth" // Import all Kubernetes client auth plugins (Azure, GCP, OIDC, etc.)
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/capabilities"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"
ctrl "sigs.k8s.io/controller-runtime"
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -54,7 +51,6 @@ import (
"github.com/openkruise/agents/pkg/utils/fieldindex"
customwebhook "github.com/openkruise/agents/pkg/webhook"
"github.com/openkruise/agents/pkg/webhook/sandboxset/mutating"
// +kubebuilder:scaffold:imports
)

var (
Expand Down
5 changes: 2 additions & 3 deletions cmd/sandbox-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ import (
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

"github.com/openkruise/agents/pkg/sandbox-manager/consts"
"github.com/openkruise/agents/pkg/utils"

"github.com/openkruise/agents/pkg/sandbox-manager/clients"
"github.com/openkruise/agents/pkg/sandbox-manager/consts"
"github.com/openkruise/agents/pkg/servers/e2b"
"github.com/openkruise/agents/pkg/servers/e2b/models"
"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
)

Expand Down
20 changes: 20 additions & 0 deletions hack/fmt-imports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

set -e

if ! command -v gci &> /dev/null; then
export PATH="$(go env GOPATH)/bin:$PATH"

# If still not found, install gci
if ! command -v gci &> /dev/null; then
echo "Installing gci..."
go install github.com/daixiang0/gci@latest
export PATH="$(go env GOPATH)/bin:$PATH"
fi
fi

# Format all Go files using gci with proper import ordering
find . -name "*.go" | xargs gci write --skip-generated \
-s standard \
-s default \
-s "prefix(github.com/openkruise/agents)"
5 changes: 3 additions & 2 deletions pkg/controller/sandbox/core/rateLimiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ import (
"testing"
"time"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
)

// ---- helpers ----------------------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions pkg/controller/sandbox/pod_event_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ import (
"context"
"reflect"

"github.com/openkruise/agents/pkg/features"
"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/util/workqueue"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/openkruise/agents/pkg/features"
"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
)

// SandboxPodEventHandler watches Pods created by the Sandbox controller.
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/sandbox/pod_event_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (
"context"
"testing"

"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -32,6 +30,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

_ "github.com/openkruise/agents/pkg/features"
"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
)

// Helper function to create a pointer to a bool
Expand Down
9 changes: 5 additions & 4 deletions pkg/controller/sandbox/sandbox_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ import (
"testing"
"time"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/controller/sandbox/core"
"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
Expand All @@ -37,6 +33,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/controller/sandbox/core"
"github.com/openkruise/agents/pkg/utils"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
)

func TestSandboxReconciler_Reconcile(t *testing.T) {
Expand Down
9 changes: 4 additions & 5 deletions pkg/controller/sandboxclaim/core/common_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/agent-runtime/storages"
"github.com/openkruise/agents/pkg/sandbox-manager/clients"
"github.com/openkruise/agents/pkg/sandbox-manager/config"
"github.com/openkruise/agents/pkg/sandbox-manager/infra"
"github.com/openkruise/agents/pkg/sandbox-manager/infra/sandboxcr"
"github.com/openkruise/agents/pkg/utils"
"github.com/openkruise/agents/pkg/utils/csiutils"
stateutils "github.com/openkruise/agents/pkg/utils/sandboxutils"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/sandbox-manager/clients"
"github.com/openkruise/agents/pkg/sandbox-manager/infra"
"github.com/openkruise/agents/pkg/sandbox-manager/infra/sandboxcr"
)

type commonControl struct {
Expand Down
5 changes: 3 additions & 2 deletions pkg/controller/sandboxclaim/core/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ import (
"context"
"time"

"k8s.io/client-go/tools/record"
"sigs.k8s.io/controller-runtime/pkg/client"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/controller/sandbox/core"
"github.com/openkruise/agents/pkg/sandbox-manager/clients"
"github.com/openkruise/agents/pkg/sandbox-manager/infra/sandboxcr"
"github.com/openkruise/agents/pkg/utils/expectations"
"k8s.io/client-go/tools/record"
"sigs.k8s.io/controller-runtime/pkg/client"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/sandboxclaim/core/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ import (
"fmt"
"time"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
)

// CalculateClaimStatus determines the next phase of a SandboxClaim and whether to skip business logic.
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/sandboxclaim/core/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ import (
"testing"
"time"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
)

func TestGetDesiredReplicas(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/sandboxclaim/sandboxclaim_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ import (
"fmt"
"reflect"

"github.com/openkruise/agents/pkg/sandbox-manager/clients"
managerconfig "github.com/openkruise/agents/pkg/sandbox-manager/config"
"github.com/openkruise/agents/pkg/utils/webhookutils"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -47,10 +44,13 @@ import (
"github.com/openkruise/agents/pkg/controller/sandboxclaim/core"
"github.com/openkruise/agents/pkg/discovery"
"github.com/openkruise/agents/pkg/features"
"github.com/openkruise/agents/pkg/sandbox-manager/clients"
managerconfig "github.com/openkruise/agents/pkg/sandbox-manager/config"
"github.com/openkruise/agents/pkg/sandbox-manager/infra/sandboxcr"
"github.com/openkruise/agents/pkg/utils"
"github.com/openkruise/agents/pkg/utils/expectations"
utilfeature "github.com/openkruise/agents/pkg/utils/feature"
"github.com/openkruise/agents/pkg/utils/webhookutils"
)

func init() {
Expand Down
9 changes: 5 additions & 4 deletions pkg/controller/sandboxclaim/sandboxclaim_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ import (
"testing"
"time"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/controller/sandboxclaim/core"
"github.com/openkruise/agents/pkg/sandbox-manager/infra/sandboxcr"
utils "github.com/openkruise/agents/pkg/utils/sandbox-manager"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/controller/sandboxclaim/core"
"github.com/openkruise/agents/pkg/sandbox-manager/infra/sandboxcr"
utils "github.com/openkruise/agents/pkg/utils/sandbox-manager"
)

func TestReconciler_Reconcile_BasicFlow(t *testing.T) {
Expand Down
9 changes: 5 additions & 4 deletions pkg/controller/sandboxset/event_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ import (
"context"
"time"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/utils"
"github.com/openkruise/agents/pkg/utils/expectations"
stateutils "github.com/openkruise/agents/pkg/utils/sandboxutils"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
Expand All @@ -17,6 +13,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/event"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/utils"
"github.com/openkruise/agents/pkg/utils/expectations"
stateutils "github.com/openkruise/agents/pkg/utils/sandboxutils"
)

type SandboxEventHandler struct{}
Expand Down
5 changes: 3 additions & 2 deletions pkg/controller/sandboxset/event_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"context"
"testing"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/utils/expectations"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -14,6 +12,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/utils/expectations"
)

type fakePriorityQueue struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/sandboxset/revision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import (
"hash/fnv"
"strconv"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
apps "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/dump"
"k8s.io/apimachinery/pkg/util/rand"

agentsv1alpha1 "github.com/openkruise/agents/api/v1alpha1"
)

// getPatch returns a strategic merge patch that can be applied to restore a StatefulSet to a
Expand Down
16 changes: 8 additions & 8 deletions pkg/controller/sandboxset/sandboxset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ import (
"strings"
"testing"

"k8s.io/apimachinery/pkg/api/resource"
intstrutil "k8s.io/apimachinery/pkg/util/intstr"

"github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/sandbox-manager/consts"
"github.com/openkruise/agents/pkg/utils/fieldindex"
utils "github.com/openkruise/agents/pkg/utils/sandbox-manager"
"github.com/openkruise/agents/pkg/utils/sandboxutils"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types"
intstrutil "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/openkruise/agents/api/v1alpha1"
"github.com/openkruise/agents/pkg/sandbox-manager/consts"
"github.com/openkruise/agents/pkg/utils/fieldindex"
utils "github.com/openkruise/agents/pkg/utils/sandbox-manager"
"github.com/openkruise/agents/pkg/utils/sandboxutils"
)

var testScheme *runtime.Scheme
Expand Down
Loading
Loading