From be8403dc0d370da9c80385893f3cbce416840f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E5=85=83?= <jianbo.sjb@alibaba-inc.com>
Date: Wed, 25 Nov 2020 17:29:23 +0800
Subject: [PATCH] standardize project structure: move v1alpha1 into
 standard.oam.dev group
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 天元 <jianbo.sjb@alibaba-inc.com>
---
 cmd/core/main.go                                      |  2 +-
 pkg/controller/dependency/install_test.go             |  2 +-
 pkg/controller/setup.go                               |  8 ++++----
 .../v1alpha1/autoscaler/autoscaler_controller.go      |  2 +-
 .../standard.oam.dev/v1alpha1/autoscaler/keda.go      |  2 +-
 .../v1alpha1/autoscaler/suite_test.go                 |  2 +-
 .../standard.oam.dev/v1alpha1/autoscaler/types.go     |  2 +-
 .../v1alpha1/metrics/metricstrait_controller.go       |  2 +-
 .../metricstrait_controller_integration_test.go       |  2 +-
 .../standard.oam.dev/v1alpha1/metrics/suite_test.go   |  4 ++--
 .../podspecworkload/podspecworkload_controller.go     |  2 +-
 .../v1alpha1/podspecworkload/suite_test.go            |  4 ++--
 .../standard.oam.dev/v1alpha1/routes/ingress/api.go   |  2 +-
 .../v1alpha1/routes/ingress/contour_ingress.go        |  2 +-
 .../v1alpha1/routes/ingress/contour_ingress_test.go   |  2 +-
 .../v1alpha1/routes/ingress/nginx_ingress.go          |  2 +-
 .../v1alpha1/routes/ingress/nginx_ingress_test.go     |  2 +-
 .../v1alpha1/routes/route_controller.go               | 11 +++++------
 .../v1alpha1/routes/route_controller_test.go          |  2 +-
 .../standard.oam.dev/v1alpha1/routes/suite_test.go    |  6 +++---
 .../standard.oam.dev/v1alpha1/routes/util.go          |  2 +-
 pkg/oam/trait_checker.go                              |  4 ++--
 pkg/utils/common/common.go                            |  2 +-
 pkg/webhook/metrics/metrics_test.go                   |  2 +-
 pkg/webhook/metrics/mutating_handler.go               |  2 +-
 pkg/webhook/metrics/validating_handler.go             |  2 +-
 pkg/webhook/podspecworkload/mutating_handler.go       |  2 +-
 pkg/webhook/podspecworkload/podspecworkload_test.go   |  2 +-
 pkg/webhook/podspecworkload/validating_handler.go     |  2 +-
 29 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/cmd/core/main.go b/cmd/core/main.go
index 1d4b6dab8..eef282aca 100644
--- a/cmd/core/main.go
+++ b/cmd/core/main.go
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	velacoreoamdev "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2"
-	velacore "github.com/oam-dev/kubevela/apis/v1alpha1"
+	velacore "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	velacontroller "github.com/oam-dev/kubevela/pkg/controller"
 	"github.com/oam-dev/kubevela/pkg/controller/dependency"
 	velawebhook "github.com/oam-dev/kubevela/pkg/webhook"
diff --git a/pkg/controller/dependency/install_test.go b/pkg/controller/dependency/install_test.go
index c337ba3ac..fd6f04c45 100644
--- a/pkg/controller/dependency/install_test.go
+++ b/pkg/controller/dependency/install_test.go
@@ -9,8 +9,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/apis/types"
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 )
 
diff --git a/pkg/controller/setup.go b/pkg/controller/setup.go
index b3f4d4081..687200fc1 100644
--- a/pkg/controller/setup.go
+++ b/pkg/controller/setup.go
@@ -20,10 +20,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/oam-dev/kubevela/pkg/controller/core.oam.dev/applicationdeployment"
-	autoscalers "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/autoscaler"
-	"github.com/oam-dev/kubevela/pkg/controller/v1alpha1/metrics"
-	"github.com/oam-dev/kubevela/pkg/controller/v1alpha1/podspecworkload"
-	"github.com/oam-dev/kubevela/pkg/controller/v1alpha1/routes"
+	autoscalers "github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/autoscaler"
+	"github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/metrics"
+	"github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload"
+	"github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/routes"
 )
 
 // Setup workload controllers.
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go
index 73cc3f6ae..552477434 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go
@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/pkg/controller/common"
 )
 
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go
index a795c31da..7919717cf 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/pointer"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 func (r *AutoscalerReconciler) scaleByKEDA(scaler v1alpha1.Autoscaler, namespace string, log logr.Logger) error {
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go
index 1cfa5138c..fca9a2fd8 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go
@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go
index 8abdfd57b..e83da14fa 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go
@@ -2,7 +2,7 @@
 package autoscalers
 
 import (
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 const (
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go
index 23576e819..0744907c3 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go
@@ -38,7 +38,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/pkg/controller/common"
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
 )
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go b/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go
index 77d300e87..d9ba7fd69 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go
@@ -18,7 +18,7 @@ import (
 	"k8s.io/utils/pointer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 var (
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go
index 583e7fd27..dfcbe422a 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go
@@ -38,7 +38,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -70,7 +70,7 @@ var _ = BeforeSuite(func(done Done) {
 	useExistCluster := false
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("../../../..", "charts/vela-core/crds"), // this has all the required CRDs,
+			filepath.Join("../../../../..", "charts/vela-core/crds"), // this has all the required CRDs,
 		},
 		UseExistingCluster: &useExistCluster,
 	}
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go
index 065f1a34d..44913c94c 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go
@@ -35,7 +35,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 // Reconcile error strings.
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go
index 2ac6e7a3b..0d8b54666 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go
@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	v1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -55,7 +55,7 @@ var _ = BeforeSuite(func(done Done) {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("../../../..", "charts/vela-core/crds"), // this has all the required CRDs,
+			filepath.Join("../../../../..", "charts/vela-core/crds"), // this has all the required CRDs,
 			filepath.Join("..", "config", "crd", "bases")},
 	}
 
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go
index ee08909cb..93a49f87e 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/api/networking/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 // TypeNginx is a type of route implementation using [Nginx-Ingress](https://github.com/kubernetes/ingress-nginx)
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go
index c9e7852d3..6bb2e7ee1 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 
 	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	certmanager "github.com/wonderflow/cert-manager-api/pkg/apis/certmanager/v1"
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go
index aba9a8ceb..151d80a21 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/pointer"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 func TestContourConstruct(t *testing.T) {
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go
index d737b2077..44da655c8 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 
 	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	certmanager "github.com/wonderflow/cert-manager-api/pkg/apis/certmanager/v1"
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go
index 7c9a54100..f1670dccd 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/pointer"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 func TestConstruct(t *testing.T) {
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go
index 60855b865..61c574fcb 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go
@@ -25,10 +25,9 @@ import (
 
 	"github.com/oam-dev/kubevela/pkg/controller/utils"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/pkg/controller/common"
-	"github.com/oam-dev/kubevela/pkg/controller/v1alpha1/routes/ingress"
+	"github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress"
 
 	cpv1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
@@ -153,7 +152,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 
 // discoveryAndFillBackend will automatically discovery backend for route
 func (r *Reconciler) discoveryAndFillBackend(ctx context.Context, mLog logr.Logger, eventObj runtime.Object, workload *unstructured.Unstructured,
-	routeTrait *v1alpha1.Route) (*runtimev1alpha1.TypedReference, error) {
+	routeTrait *standardv1alpha1.Route) (*runtimev1alpha1.TypedReference, error) {
 
 	// Fetch the child childResources list from the corresponding workload
 	childResources, err := oamutil.FetchWorkloadChildResources(ctx, mLog, r, r.dm, workload)
@@ -187,7 +186,7 @@ func (r *Reconciler) discoveryAndFillBackend(ctx context.Context, mLog logr.Logg
 
 // fillBackendByCreatedService will automatically create service by discovery podTemplate or podSpec.
 func (r *Reconciler) fillBackendByCreatedService(ctx context.Context, mLog logr.Logger, workload *unstructured.Unstructured,
-	routeTrait *v1alpha1.Route, childResources []*unstructured.Unstructured) (*runtimev1alpha1.TypedReference, error) {
+	routeTrait *standardv1alpha1.Route, childResources []*unstructured.Unstructured) (*runtimev1alpha1.TypedReference, error) {
 
 	oamService := &corev1.Service{
 		TypeMeta: metav1.TypeMeta{
@@ -281,7 +280,7 @@ func DiscoverPortsLabel(ctx context.Context, workload *unstructured.Unstructured
 
 // fetch the service that is associated with the workload
 func (r *Reconciler) fillBackendByCheckChildResource(mLog logr.Logger,
-	routeTrait *v1alpha1.Route, childResources []*unstructured.Unstructured) {
+	routeTrait *standardv1alpha1.Route, childResources []*unstructured.Unstructured) {
 	if len(childResources) == 0 {
 		return
 	}
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go
index 1db4a6e08..6c9fd80b0 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util"
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go
index 3bc056a1c..5cbedf46b 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go
@@ -40,8 +40,8 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1"
-	"github.com/oam-dev/kubevela/pkg/controller/v1alpha1/podspecworkload"
+	standardv1alpha1 "github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
+	"github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func(done Done) {
 	useExistCluster := false
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("../../../..", "charts/vela-core/crds"), // this has all the required CRDs,
+			filepath.Join("../../../../..", "charts/vela-core/crds"), // this has all the required CRDs,
 		},
 		UseExistingCluster: &useExistCluster,
 	}
diff --git a/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go
index 18f4f1c80..f86c1ec51 100644
--- a/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go
+++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go
@@ -1,7 +1,7 @@
 package routes
 
 import (
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/pkg/oam/trait_checker.go b/pkg/oam/trait_checker.go
index 9e05eca11..e8169dd1f 100644
--- a/pkg/oam/trait_checker.go
+++ b/pkg/oam/trait_checker.go
@@ -14,9 +14,9 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/pkg/application"
-	autoscalers "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/autoscaler"
+	autoscalers "github.com/oam-dev/kubevela/pkg/controller/standard.oam.dev/v1alpha1/autoscaler"
 )
 
 // CheckStatus defines the type of checking status
diff --git a/pkg/utils/common/common.go b/pkg/utils/common/common.go
index 5007d706c..8e51387d5 100644
--- a/pkg/utils/common/common.go
+++ b/pkg/utils/common/common.go
@@ -13,8 +13,8 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	"github.com/oam-dev/kubevela/apis/types"
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
 )
 
 var (
diff --git a/pkg/webhook/metrics/metrics_test.go b/pkg/webhook/metrics/metrics_test.go
index 97eef4c11..90358c2be 100644
--- a/pkg/webhook/metrics/metrics_test.go
+++ b/pkg/webhook/metrics/metrics_test.go
@@ -9,7 +9,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/pointer"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 func TestMetrics(t *testing.T) {
diff --git a/pkg/webhook/metrics/mutating_handler.go b/pkg/webhook/metrics/mutating_handler.go
index 222cf73d7..3131f0449 100644
--- a/pkg/webhook/metrics/mutating_handler.go
+++ b/pkg/webhook/metrics/mutating_handler.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	util "github.com/oam-dev/kubevela/pkg/utils"
 )
 
diff --git a/pkg/webhook/metrics/validating_handler.go b/pkg/webhook/metrics/validating_handler.go
index 85433a46e..825e65091 100644
--- a/pkg/webhook/metrics/validating_handler.go
+++ b/pkg/webhook/metrics/validating_handler.go
@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 // ValidatingHandler handles MetricsTrait
diff --git a/pkg/webhook/podspecworkload/mutating_handler.go b/pkg/webhook/podspecworkload/mutating_handler.go
index 415092166..f68378ce7 100644
--- a/pkg/webhook/podspecworkload/mutating_handler.go
+++ b/pkg/webhook/podspecworkload/mutating_handler.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 	util "github.com/oam-dev/kubevela/pkg/utils"
 )
 
diff --git a/pkg/webhook/podspecworkload/podspecworkload_test.go b/pkg/webhook/podspecworkload/podspecworkload_test.go
index 5b4821c68..f61a64841 100644
--- a/pkg/webhook/podspecworkload/podspecworkload_test.go
+++ b/pkg/webhook/podspecworkload/podspecworkload_test.go
@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 func TestPodSpecWorkload(t *testing.T) {
diff --git a/pkg/webhook/podspecworkload/validating_handler.go b/pkg/webhook/podspecworkload/validating_handler.go
index 84cb1b8f6..bc19fdaa1 100644
--- a/pkg/webhook/podspecworkload/validating_handler.go
+++ b/pkg/webhook/podspecworkload/validating_handler.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/oam-dev/kubevela/apis/v1alpha1"
+	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
 )
 
 // ValidatingHandler handles PodSpecWorkload