diff --git a/Dockerfile b/Dockerfile index 36ee59837..f71fd6dd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN go mod download # Copy the go source COPY cmd/core/main.go main.go -COPY api/ api/ +COPY apis apis/ COPY pkg/ pkg/ # Build diff --git a/Makefile b/Makefile index 624046100..013be39a6 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ core-uninstall: manifests # Generate manifests e.g. CRD, RBAC etc. manifests: controller-gen $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=charts/vela-core/crds - go generate $(foreach t,pkg api,./$(t)/...) + go generate $(foreach t,pkg apis,./$(t)/...) ./hack/vela-templates/gen_definitions.sh # Generate code diff --git a/api/api.go b/api/api.go deleted file mode 100644 index 9371e7683..000000000 --- a/api/api.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package api contains all api types of KubeVela -package api diff --git a/apis/apis.go b/apis/apis.go new file mode 100644 index 000000000..891b458e2 --- /dev/null +++ b/apis/apis.go @@ -0,0 +1,2 @@ +// Package apis contains all api types of KubeVela +package apis diff --git a/api/core.oam.dev/v1alpha2/appdeploy_types.go b/apis/core.oam.dev/v1alpha2/appdeploy_types.go similarity index 100% rename from api/core.oam.dev/v1alpha2/appdeploy_types.go rename to apis/core.oam.dev/v1alpha2/appdeploy_types.go diff --git a/api/core.oam.dev/v1alpha2/groupversion_info.go b/apis/core.oam.dev/v1alpha2/groupversion_info.go similarity index 100% rename from api/core.oam.dev/v1alpha2/groupversion_info.go rename to apis/core.oam.dev/v1alpha2/groupversion_info.go diff --git a/api/core.oam.dev/v1alpha2/zz_generated.deepcopy.go b/apis/core.oam.dev/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from api/core.oam.dev/v1alpha2/zz_generated.deepcopy.go rename to apis/core.oam.dev/v1alpha2/zz_generated.deepcopy.go diff --git a/api/generate.go b/apis/generate.go similarity index 94% rename from api/generate.go rename to apis/generate.go index dcbbfa3bb..4017008b2 100644 --- a/api/generate.go +++ b/apis/generate.go @@ -5,4 +5,4 @@ //go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/ -package api +package apis diff --git a/api/v1alpha1/autoscaler_types.go b/apis/standard.oam.dev/v1alpha1/autoscaler_types.go similarity index 100% rename from api/v1alpha1/autoscaler_types.go rename to apis/standard.oam.dev/v1alpha1/autoscaler_types.go diff --git a/api/v1alpha1/groupversion_info.go b/apis/standard.oam.dev/v1alpha1/groupversion_info.go similarity index 100% rename from api/v1alpha1/groupversion_info.go rename to apis/standard.oam.dev/v1alpha1/groupversion_info.go diff --git a/api/v1alpha1/metricstrait_types.go b/apis/standard.oam.dev/v1alpha1/metricstrait_types.go similarity index 100% rename from api/v1alpha1/metricstrait_types.go rename to apis/standard.oam.dev/v1alpha1/metricstrait_types.go diff --git a/api/v1alpha1/podspecworkload_types.go b/apis/standard.oam.dev/v1alpha1/podspecworkload_types.go similarity index 100% rename from api/v1alpha1/podspecworkload_types.go rename to apis/standard.oam.dev/v1alpha1/podspecworkload_types.go diff --git a/api/v1alpha1/route_types.go b/apis/standard.oam.dev/v1alpha1/route_types.go similarity index 100% rename from api/v1alpha1/route_types.go rename to apis/standard.oam.dev/v1alpha1/route_types.go diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/apis/standard.oam.dev/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha1/zz_generated.deepcopy.go rename to apis/standard.oam.dev/v1alpha1/zz_generated.deepcopy.go diff --git a/api/types/args.go b/apis/types/args.go similarity index 100% rename from api/types/args.go rename to apis/types/args.go diff --git a/api/types/capability.go b/apis/types/capability.go similarity index 100% rename from api/types/capability.go rename to apis/types/capability.go diff --git a/api/types/types.go b/apis/types/types.go similarity index 100% rename from api/types/types.go rename to apis/types/types.go diff --git a/cmd/core/main.go b/cmd/core/main.go index 69a342990..1d4b6dab8 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -35,8 +35,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - velacoreoamdev "github.com/oam-dev/kubevela/api/core.oam.dev/v1alpha2" - velacore "github.com/oam-dev/kubevela/api/v1alpha1" + velacoreoamdev "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" + velacore "github.com/oam-dev/kubevela/apis/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/e2e/capability/capability_test.go b/e2e/capability/capability_test.go index b3b8e404f..3d30e2098 100644 --- a/e2e/capability/capability_test.go +++ b/e2e/capability/capability_test.go @@ -3,7 +3,7 @@ package e2e import ( "fmt" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/e2e" "github.com/oam-dev/kubevela/pkg/server/apis" diff --git a/pkg/appfile/appfile_test.go b/pkg/appfile/appfile_test.go index 7725b5829..175dd4e42 100644 --- a/pkg/appfile/appfile_test.go +++ b/pkg/appfile/appfile_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/appfile/template" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) diff --git a/pkg/appfile/template/manager.go b/pkg/appfile/template/manager.go index 91bb8ad8f..885648824 100644 --- a/pkg/appfile/template/manager.go +++ b/pkg/appfile/template/manager.go @@ -1,7 +1,7 @@ package template import ( - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/plugins" ) diff --git a/pkg/application/app.go b/pkg/application/app.go index b07ced6cf..b8ee46dea 100644 --- a/pkg/application/app.go +++ b/pkg/application/app.go @@ -18,7 +18,7 @@ import ( "github.com/crossplane/oam-kubernetes-runtime/pkg/oam" "github.com/ghodss/yaml" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/appfile" "github.com/oam-dev/kubevela/pkg/appfile/template" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/application/app_test.go b/pkg/application/app_test.go index b5e33dcd5..da279254a 100644 --- a/pkg/application/app_test.go +++ b/pkg/application/app_test.go @@ -8,7 +8,7 @@ import ( "github.com/ghodss/yaml" "github.com/stretchr/testify/assert" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/appfile/template" ) diff --git a/pkg/application/run.go b/pkg/application/run.go index 33fe95d4f..b0d5c86ae 100644 --- a/pkg/application/run.go +++ b/pkg/application/run.go @@ -9,7 +9,7 @@ import ( ctypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) diff --git a/pkg/commands/capability.go b/pkg/commands/capability.go index 42669340e..85b7d6c14 100644 --- a/pkg/commands/capability.go +++ b/pkg/commands/capability.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" ) diff --git a/pkg/commands/cli.go b/pkg/commands/cli.go index 229d57a72..8066900a5 100644 --- a/pkg/commands/cli.go +++ b/pkg/commands/cli.go @@ -13,7 +13,7 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client/config" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/cmd/vela/fake" "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/utils/system" diff --git a/pkg/commands/comp.go b/pkg/commands/comp.go index b3d4e0fa1..56c24c25c 100644 --- a/pkg/commands/comp.go +++ b/pkg/commands/comp.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/commands/util" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/commands/completion.go b/pkg/commands/completion.go index 8929d41b2..8cfb031a0 100644 --- a/pkg/commands/completion.go +++ b/pkg/commands/completion.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" ) const completionDesc = `Output shell completion code for the specified shell (bash or zsh). diff --git a/pkg/commands/config.go b/pkg/commands/config.go index b157a340c..295217370 100644 --- a/pkg/commands/config.go +++ b/pkg/commands/config.go @@ -11,7 +11,7 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/utils/config" ) diff --git a/pkg/commands/dashboard.go b/pkg/commands/dashboard.go index 9907823d4..64e0244c0 100644 --- a/pkg/commands/dashboard.go +++ b/pkg/commands/dashboard.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/server" "github.com/oam-dev/kubevela/pkg/server/util" diff --git a/pkg/commands/delete.go b/pkg/commands/delete.go index dcd0f4193..20f9fa164 100644 --- a/pkg/commands/delete.go +++ b/pkg/commands/delete.go @@ -3,7 +3,7 @@ package commands import ( "errors" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/commands/env.go b/pkg/commands/env.go index 825a1d450..5fbda4b3d 100644 --- a/pkg/commands/env.go +++ b/pkg/commands/env.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/utils/env" "github.com/oam-dev/kubevela/pkg/utils/system" diff --git a/pkg/commands/env_test.go b/pkg/commands/env_test.go index d09e60c64..89ace81c9 100644 --- a/pkg/commands/env_test.go +++ b/pkg/commands/env_test.go @@ -11,7 +11,7 @@ import ( "github.com/oam-dev/kubevela/pkg/utils/env" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/utils/system" diff --git a/pkg/commands/exec.go b/pkg/commands/exec.go index cf29632c7..45e54aee2 100644 --- a/pkg/commands/exec.go +++ b/pkg/commands/exec.go @@ -17,7 +17,7 @@ import ( cmdexec "k8s.io/kubectl/pkg/cmd/exec" k8scmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" "github.com/oam-dev/kubevela/pkg/commands/util" velacmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/commands/exec_test.go b/pkg/commands/exec_test.go index 6c38b0445..5e2887286 100644 --- a/pkg/commands/exec_test.go +++ b/pkg/commands/exec_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/kubectl/pkg/cmd/exec" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/appfile" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/commands/init.go b/pkg/commands/init.go index 1253106ef..6c221f5fd 100644 --- a/pkg/commands/init.go +++ b/pkg/commands/init.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/commands/logs.go b/pkg/commands/logs.go index de245a16f..4605e8605 100644 --- a/pkg/commands/logs.go +++ b/pkg/commands/logs.go @@ -10,7 +10,7 @@ import ( "text/template" "time" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" "github.com/oam-dev/kubevela/pkg/commands/util" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/commands/ls.go b/pkg/commands/ls.go index d9752d114..70b07a556 100644 --- a/pkg/commands/ls.go +++ b/pkg/commands/ls.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/commands/portforward.go b/pkg/commands/portforward.go index 70bed0e52..405d4b59a 100644 --- a/pkg/commands/portforward.go +++ b/pkg/commands/portforward.go @@ -25,7 +25,7 @@ import ( cmdpf "k8s.io/kubectl/pkg/cmd/portforward" k8scmdutil "k8s.io/kubectl/pkg/cmd/util" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" "github.com/oam-dev/kubevela/pkg/commands/util" velacmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/commands/portforward_test.go b/pkg/commands/portforward_test.go index 7abb4e7c1..3008447d0 100644 --- a/pkg/commands/portforward_test.go +++ b/pkg/commands/portforward_test.go @@ -13,7 +13,7 @@ import ( "k8s.io/kubectl/pkg/cmd/portforward" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) diff --git a/pkg/commands/refresh.go b/pkg/commands/refresh.go index bd83e0501..28bf48957 100644 --- a/pkg/commands/refresh.go +++ b/pkg/commands/refresh.go @@ -6,7 +6,7 @@ import ( "github.com/fatih/color" "github.com/gosuri/uitable" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/utils/system" diff --git a/pkg/commands/show.go b/pkg/commands/show.go index 32c1e9563..e97a7aadd 100644 --- a/pkg/commands/show.go +++ b/pkg/commands/show.go @@ -7,7 +7,7 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/commands/status.go b/pkg/commands/status.go index 0955d2f11..eaef09823 100644 --- a/pkg/commands/status.go +++ b/pkg/commands/status.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" oam2 "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/commands/system.go b/pkg/commands/system.go index ddfdf8003..7452a21f8 100644 --- a/pkg/commands/system.go +++ b/pkg/commands/system.go @@ -19,7 +19,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/utils/helm" diff --git a/pkg/commands/template.go b/pkg/commands/template.go index 42030e243..cfa520d74 100644 --- a/pkg/commands/template.go +++ b/pkg/commands/template.go @@ -5,7 +5,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" mycue "github.com/oam-dev/kubevela/pkg/cue" ) diff --git a/pkg/commands/trait.go b/pkg/commands/trait.go index 9e51d915a..08782d7e4 100644 --- a/pkg/commands/trait.go +++ b/pkg/commands/trait.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" "github.com/oam-dev/kubevela/pkg/commands/util" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/commands/traits.go b/pkg/commands/traits.go index a3401ea3f..5c64d8e53 100644 --- a/pkg/commands/traits.go +++ b/pkg/commands/traits.go @@ -9,7 +9,7 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" ) diff --git a/pkg/commands/traits_test.go b/pkg/commands/traits_test.go index a30a0d3ce..3a902957c 100644 --- a/pkg/commands/traits_test.go +++ b/pkg/commands/traits_test.go @@ -8,7 +8,7 @@ import ( "github.com/gosuri/uitable" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) diff --git a/pkg/commands/up.go b/pkg/commands/up.go index 4320dcf35..a05694f17 100644 --- a/pkg/commands/up.go +++ b/pkg/commands/up.go @@ -23,7 +23,7 @@ import ( apitypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/appfile" "github.com/oam-dev/kubevela/pkg/appfile/template" "github.com/oam-dev/kubevela/pkg/application" diff --git a/pkg/commands/up_test.go b/pkg/commands/up_test.go index 3f3e2290d..ef67ecf73 100644 --- a/pkg/commands/up_test.go +++ b/pkg/commands/up_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/commands/util" ) diff --git a/pkg/commands/workloads.go b/pkg/commands/workloads.go index 7b276aaee..ef40309a3 100644 --- a/pkg/commands/workloads.go +++ b/pkg/commands/workloads.go @@ -5,7 +5,7 @@ package commands import ( "context" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" diff --git a/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go b/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go index cc1850e5b..578c097af 100644 --- a/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go +++ b/pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go @@ -12,7 +12,7 @@ import ( corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/oam-dev/kubevela/api/core.oam.dev/v1alpha2" + "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" ) // Reconciler reconciles a PodSpecWorkload object diff --git a/pkg/controller/core.oam.dev/applicationdeployment/suite_test.go b/pkg/controller/core.oam.dev/applicationdeployment/suite_test.go index e85450df7..4837fd17f 100644 --- a/pkg/controller/core.oam.dev/applicationdeployment/suite_test.go +++ b/pkg/controller/core.oam.dev/applicationdeployment/suite_test.go @@ -14,7 +14,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/oam-dev/kubevela/api/core.oam.dev/v1alpha2" + "github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha2" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/dependency/install.go b/pkg/controller/dependency/install.go index 49a6123b1..9ceb7d84c 100644 --- a/pkg/controller/dependency/install.go +++ b/pkg/controller/dependency/install.go @@ -31,7 +31,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/utils/helm" ) diff --git a/pkg/controller/dependency/install_test.go b/pkg/controller/dependency/install_test.go index 5f70c84f6..c337ba3ac 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/api/types" - "github.com/oam-dev/kubevela/api/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/v1alpha1/autoscaler/autoscaler_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go similarity index 99% rename from pkg/controller/v1alpha1/autoscaler/autoscaler_controller.go rename to pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go index 42f1245c8..73cc3f6ae 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" "github.com/oam-dev/kubevela/pkg/controller/common" ) diff --git a/pkg/controller/v1alpha1/autoscaler/keda.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go similarity index 99% rename from pkg/controller/v1alpha1/autoscaler/keda.go rename to pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go index 042a58a07..a795c31da 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) func (r *AutoscalerReconciler) scaleByKEDA(scaler v1alpha1.Autoscaler, namespace string, log logr.Logger) error { diff --git a/pkg/controller/v1alpha1/autoscaler/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go similarity index 97% rename from pkg/controller/v1alpha1/autoscaler/suite_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go index a93a2992b..1cfa5138c 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/v1alpha1/autoscaler/types.go b/pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go similarity index 75% rename from pkg/controller/v1alpha1/autoscaler/types.go rename to pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go index 2b2ce822f..8abdfd57b 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) const ( diff --git a/pkg/controller/v1alpha1/metrics/metricstrait_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go similarity index 99% rename from pkg/controller/v1alpha1/metrics/metricstrait_controller.go rename to pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go index 21ef0c486..23576e819 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" "github.com/oam-dev/kubevela/pkg/controller/common" "github.com/oam-dev/kubevela/pkg/controller/utils" ) diff --git a/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go b/pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go similarity index 99% rename from pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go index 0619d7b3b..77d300e87 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) var ( diff --git a/pkg/controller/v1alpha1/metrics/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go similarity index 98% rename from pkg/controller/v1alpha1/metrics/suite_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go index eefdd0cdc..583e7fd27 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/v1alpha1/podspecworkload/podspecworkload_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go similarity index 99% rename from pkg/controller/v1alpha1/podspecworkload/podspecworkload_controller.go rename to pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go index 90be90d58..065f1a34d 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) // Reconcile error strings. diff --git a/pkg/controller/v1alpha1/podspecworkload/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go similarity index 97% rename from pkg/controller/v1alpha1/podspecworkload/suite_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go index 9e9857b8c..2ac6e7a3b 100644 --- a/pkg/controller/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/api/v1alpha1" + v1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/v1alpha1/routes/ingress/api.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go similarity index 95% rename from pkg/controller/v1alpha1/routes/ingress/api.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go index 109d161b7..ee08909cb 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" ) // TypeNginx is a type of route implementation using [Nginx-Ingress](https://github.com/kubernetes/ingress-nginx) diff --git a/pkg/controller/v1alpha1/routes/ingress/api_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api_test.go similarity index 100% rename from pkg/controller/v1alpha1/routes/ingress/api_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api_test.go diff --git a/pkg/controller/v1alpha1/routes/ingress/contour_ingress.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go similarity index 99% rename from pkg/controller/v1alpha1/routes/ingress/contour_ingress.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go index 2952f16ca..c9e7852d3 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/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/v1alpha1/routes/ingress/contour_ingress_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go similarity index 97% rename from pkg/controller/v1alpha1/routes/ingress/contour_ingress_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go index 0445cd4f1..aba9a8ceb 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" ) func TestContourConstruct(t *testing.T) { diff --git a/pkg/controller/v1alpha1/routes/ingress/nginx_ingress.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go similarity index 99% rename from pkg/controller/v1alpha1/routes/ingress/nginx_ingress.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go index 92813ca27..d737b2077 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/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/v1alpha1/routes/ingress/nginx_ingress_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go similarity index 97% rename from pkg/controller/v1alpha1/routes/ingress/nginx_ingress_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go index 35d995686..7c9a54100 100644 --- a/pkg/controller/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/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" ) func TestConstruct(t *testing.T) { diff --git a/pkg/controller/v1alpha1/routes/route_controller.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go similarity index 99% rename from pkg/controller/v1alpha1/routes/route_controller.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go index 90639f626..60855b865 100644 --- a/pkg/controller/v1alpha1/routes/route_controller.go +++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go @@ -25,8 +25,8 @@ import ( "github.com/oam-dev/kubevela/pkg/controller/utils" - "github.com/oam-dev/kubevela/api/v1alpha1" - standardv1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" "github.com/oam-dev/kubevela/pkg/controller/common" "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/routes/ingress" diff --git a/pkg/controller/v1alpha1/routes/route_controller_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go similarity index 99% rename from pkg/controller/v1alpha1/routes/route_controller_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go index d08b83c55..1db4a6e08 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util" diff --git a/pkg/controller/v1alpha1/routes/suite_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go similarity index 98% rename from pkg/controller/v1alpha1/routes/suite_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go index 1e65f4d72..3bc056a1c 100644 --- a/pkg/controller/v1alpha1/routes/suite_test.go +++ b/pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go @@ -40,7 +40,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - standardv1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/apis/v1alpha1" "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/podspecworkload" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/v1alpha1/routes/util.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/util.go similarity index 98% rename from pkg/controller/v1alpha1/routes/util.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/util.go index 19e0610de..18f4f1c80 100644 --- a/pkg/controller/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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/controller/v1alpha1/routes/util_test.go b/pkg/controller/standard.oam.dev/v1alpha1/routes/util_test.go similarity index 100% rename from pkg/controller/v1alpha1/routes/util_test.go rename to pkg/controller/standard.oam.dev/v1alpha1/routes/util_test.go diff --git a/pkg/cue/convert.go b/pkg/cue/convert.go index 1f11487b7..7ad0e426b 100644 --- a/pkg/cue/convert.go +++ b/pkg/cue/convert.go @@ -12,7 +12,7 @@ import ( cueJson "cuelang.org/go/pkg/encoding/json" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" ) // OutputFieldName is the name of the struct contains the CR data diff --git a/pkg/cue/convert_test.go b/pkg/cue/convert_test.go index 4d98695ef..4fa3c9525 100644 --- a/pkg/cue/convert_test.go +++ b/pkg/cue/convert_test.go @@ -6,7 +6,7 @@ import ( "cuelang.org/go/cue" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/oam/application.go b/pkg/oam/application.go index 401eae306..20a90d53c 100644 --- a/pkg/oam/application.go +++ b/pkg/oam/application.go @@ -12,7 +12,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/appfile" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/oam/capability.go b/pkg/oam/capability.go index 936fabc04..215f8dd66 100644 --- a/pkg/oam/capability.go +++ b/pkg/oam/capability.go @@ -18,7 +18,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" "github.com/oam-dev/kubevela/pkg/server/apis" diff --git a/pkg/oam/trait.go b/pkg/oam/trait.go index b1ef93f0b..3ad9a5051 100644 --- a/pkg/oam/trait.go +++ b/pkg/oam/trait.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/plugins" diff --git a/pkg/oam/trait_checker.go b/pkg/oam/trait_checker.go index 4a1f7cfba..9e05eca11 100644 --- a/pkg/oam/trait_checker.go +++ b/pkg/oam/trait_checker.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" "github.com/oam-dev/kubevela/pkg/application" autoscalers "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/autoscaler" ) diff --git a/pkg/oam/workload.go b/pkg/oam/workload.go index 7f19b205c..c5705f702 100644 --- a/pkg/oam/workload.go +++ b/pkg/oam/workload.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" "github.com/oam-dev/kubevela/pkg/commands/util" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" diff --git a/pkg/plugins/capcenter.go b/pkg/plugins/capcenter.go index 10de45631..bff9ace09 100644 --- a/pkg/plugins/capcenter.go +++ b/pkg/plugins/capcenter.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" diff --git a/pkg/plugins/cluster.go b/pkg/plugins/cluster.go index 266de345c..5ead3dea5 100644 --- a/pkg/plugins/cluster.go +++ b/pkg/plugins/cluster.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "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/utils/helm" diff --git a/pkg/plugins/cluster_test.go b/pkg/plugins/cluster_test.go index 795fc3b0e..256ab5a0a 100644 --- a/pkg/plugins/cluster_test.go +++ b/pkg/plugins/cluster_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/selection" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" ) var _ = Describe("DefinitionFiles", func() { diff --git a/pkg/plugins/local.go b/pkg/plugins/local.go index 7e7d84b98..b50bf8d30 100644 --- a/pkg/plugins/local.go +++ b/pkg/plugins/local.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/utils/system" ) diff --git a/pkg/plugins/local_test.go b/pkg/plugins/local_test.go index 0f2fa22f3..5afb7f7ca 100644 --- a/pkg/plugins/local_test.go +++ b/pkg/plugins/local_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/api-server.go b/pkg/server/api-server.go index e43f0af71..b969bc3c4 100644 --- a/pkg/server/api-server.go +++ b/pkg/server/api-server.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/crossplane/oam-kubernetes-runtime/pkg/oam/discoverymapper" ctrl "sigs.k8s.io/controller-runtime" diff --git a/pkg/server/apis/types.go b/pkg/server/apis/types.go index b134a9feb..7d21ba723 100644 --- a/pkg/server/apis/types.go +++ b/pkg/server/apis/types.go @@ -4,7 +4,7 @@ import ( corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "k8s.io/apimachinery/pkg/runtime" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" ) // Environment contains all info needed in `vela env` command diff --git a/pkg/server/envHandlers.go b/pkg/server/envHandlers.go index 62e4bf95e..3143646a0 100644 --- a/pkg/server/envHandlers.go +++ b/pkg/server/envHandlers.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" ctrl "sigs.k8s.io/controller-runtime" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/oam-dev/kubevela/pkg/server/util" "github.com/oam-dev/kubevela/pkg/utils/env" diff --git a/pkg/server/traitHandler.go b/pkg/server/traitHandler.go index 33684188f..46098986c 100644 --- a/pkg/server/traitHandler.go +++ b/pkg/server/traitHandler.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/pflag" ctrl "sigs.k8s.io/controller-runtime" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/application" util2 "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" diff --git a/pkg/server/workloadHandler.go b/pkg/server/workloadHandler.go index 1ce5f39d5..239dabb28 100644 --- a/pkg/server/workloadHandler.go +++ b/pkg/server/workloadHandler.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "github.com/spf13/pflag" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" "github.com/oam-dev/kubevela/pkg/oam" "github.com/oam-dev/kubevela/pkg/plugins" diff --git a/pkg/utils/common/common.go b/pkg/utils/common/common.go index 83b60fa46..5007d706c 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/api/types" - "github.com/oam-dev/kubevela/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/types" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) var ( diff --git a/pkg/utils/env/env.go b/pkg/utils/env/env.go index d64077d1f..4cfaef403 100644 --- a/pkg/utils/env/env.go +++ b/pkg/utils/env/env.go @@ -18,7 +18,7 @@ import ( "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" "github.com/oam-dev/kubevela/pkg/utils/system" ) diff --git a/pkg/utils/helm/helm.go b/pkg/utils/helm/helm.go index c81d3bf7e..a8697383b 100644 --- a/pkg/utils/helm/helm.go +++ b/pkg/utils/helm/helm.go @@ -19,7 +19,7 @@ import ( "helm.sh/helm/v3/pkg/repo" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" cmdutil "github.com/oam-dev/kubevela/pkg/commands/util" ) diff --git a/pkg/utils/system/system.go b/pkg/utils/system/system.go index c04b2948f..6e2a7b42b 100644 --- a/pkg/utils/system/system.go +++ b/pkg/utils/system/system.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/apis/types" ) const defaultVelaHome = ".vela" diff --git a/pkg/webhook/metrics/metrics_test.go b/pkg/webhook/metrics/metrics_test.go index 2579d4602..97eef4c11 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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) func TestMetrics(t *testing.T) { diff --git a/pkg/webhook/metrics/mutating_handler.go b/pkg/webhook/metrics/mutating_handler.go index 8265fbf03..222cf73d7 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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/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 2bd171a69..85433a46e 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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) // ValidatingHandler handles MetricsTrait diff --git a/pkg/webhook/podspecworkload/mutating_handler.go b/pkg/webhook/podspecworkload/mutating_handler.go index 93db4a519..415092166 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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/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 149b0cca7..5b4821c68 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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) func TestPodSpecWorkload(t *testing.T) { diff --git a/pkg/webhook/podspecworkload/validating_handler.go b/pkg/webhook/podspecworkload/validating_handler.go index c54351a8e..84cb1b8f6 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/api/v1alpha1" + "github.com/oam-dev/kubevela/apis/v1alpha1" ) // ValidatingHandler handles PodSpecWorkload