diff --git a/cmd/core/main.go b/cmd/core/main.go index a66027274..5623d4ebc 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -12,8 +12,6 @@ import ( "syscall" "time" - "github.com/oam-dev/kubevela/version" - monitoring "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/crossplane/crossplane-runtime/pkg/logging" "github.com/go-logr/logr" @@ -42,6 +40,7 @@ import ( "github.com/oam-dev/kubevela/pkg/controller/utils" velawebhook "github.com/oam-dev/kubevela/pkg/webhook" oamwebhook "github.com/oam-dev/kubevela/pkg/webhook/core.oam.dev/v1alpha2" + "github.com/oam-dev/kubevela/version" ) const ( diff --git a/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/render.go b/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/render.go index e786bc465..d267f6a97 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/render.go +++ b/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/render.go @@ -37,7 +37,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" - "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/oam/discoverymapper" "github.com/oam-dev/kubevela/pkg/oam/util" diff --git a/pkg/oam/util/helper.go b/pkg/oam/util/helper.go index 5a8d1d5cd..ffb3de8a7 100644 --- a/pkg/oam/util/helper.go +++ b/pkg/oam/util/helper.go @@ -11,8 +11,6 @@ import ( "strings" "time" - "k8s.io/apimachinery/pkg/api/meta" - cpv1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1" "github.com/davecgh/go-spew/spew" "github.com/go-logr/logr" @@ -20,6 +18,7 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -29,7 +28,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" - "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/oam/discoverymapper" ) diff --git a/pkg/plugins/capcenter.go b/pkg/plugins/capcenter.go index 9b6b269c5..190f85862 100644 --- a/pkg/plugins/capcenter.go +++ b/pkg/plugins/capcenter.go @@ -12,15 +12,14 @@ import ( "path/filepath" "strings" - "github.com/oam-dev/kubevela/apis/types" - "github.com/oam-dev/kubevela/pkg/utils/system" - "github.com/ghodss/yaml" "github.com/google/go-github/v32/github" "golang.org/x/oauth2" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" + "github.com/oam-dev/kubevela/apis/types" + "github.com/oam-dev/kubevela/pkg/utils/system" ) // GithubContent for cap center diff --git a/pkg/plugins/cluster.go b/pkg/plugins/cluster.go index 6e7d867c6..56a076da2 100644 --- a/pkg/plugins/cluster.go +++ b/pkg/plugins/cluster.go @@ -7,21 +7,18 @@ import ( "os" "path/filepath" - "github.com/oam-dev/kubevela/pkg/utils/common" - "github.com/pkg/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" corev1alpha2 "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" - - "github.com/oam-dev/kubevela/pkg/oam/discoverymapper" - "github.com/oam-dev/kubevela/pkg/oam/util" - "github.com/oam-dev/kubevela/apis/types" util2 "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/cue" + "github.com/oam-dev/kubevela/pkg/oam/discoverymapper" + "github.com/oam-dev/kubevela/pkg/oam/util" + "github.com/oam-dev/kubevela/pkg/utils/common" "github.com/oam-dev/kubevela/pkg/utils/helm" "github.com/oam-dev/kubevela/pkg/utils/system" )