github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-19 04:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

standardize project structure: move v1alpha1 into standard.oam.dev group

Browse Source 
Signed-off-by: 天元 <jianbo.sjb@alibaba-inc.com>
This commit is contained in:
天元
2020-11-25 21:46:31 +08:00
parent fc805214c7
commit be8403dc0d
29 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/core/main.go
+1 -1
View File
@@ -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"
pkg/controller/dependency/install_test.go
+1 -1
View File
@@ -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"
)
pkg/controller/setup.go
+4 -4
View File
@@ -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.
pkg/controller/standard.oam.dev/v1alpha1/autoscaler/autoscaler_controller.go
+1 -1
View File
@@ -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"
)
pkg/controller/standard.oam.dev/v1alpha1/autoscaler/keda.go
+1 -1
View File
@@ -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 {
pkg/controller/standard.oam.dev/v1alpha1/autoscaler/suite_test.go
+1 -1
View File
@@ -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
)
pkg/controller/standard.oam.dev/v1alpha1/autoscaler/types.go
+1 -1
View File
@@ -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 (
pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller.go
+1 -1
View File
@@ -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"
)
pkg/controller/standard.oam.dev/v1alpha1/metrics/metricstrait_controller_integration_test.go
+1 -1
View File
@@ -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 (
pkg/controller/standard.oam.dev/v1alpha1/metrics/suite_test.go
+2 -2
View File
@@ -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,
}
pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/podspecworkload_controller.go
+1 -1
View File
@@ -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.
pkg/controller/standard.oam.dev/v1alpha1/podspecworkload/suite_test.go
+2 -2
View File
@@ -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")},
}
pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/api.go
+1 -1
View File
@@ -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)
pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress.go
+1 -1
View File
@@ -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"
pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/contour_ingress_test.go
+1 -1
View File
@@ -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) {
pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress.go
+1 -1
View File
@@ -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"
pkg/controller/standard.oam.dev/v1alpha1/routes/ingress/nginx_ingress_test.go
+1 -1
View File
@@ -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) {
pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller.go
+5 -6
View File
@@ -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
}
pkg/controller/standard.oam.dev/v1alpha1/routes/route_controller_test.go
+1 -1
View File
@@ -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"
pkg/controller/standard.oam.dev/v1alpha1/routes/suite_test.go
+3 -3
View File
@@ -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,
}
pkg/controller/standard.oam.dev/v1alpha1/routes/util.go
+1 -1
View File
@@ -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"
pkg/oam/trait_checker.go
+2 -2
View File
@@ -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
pkg/utils/common/common.go
+1 -1
View File
@@ -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 (
pkg/webhook/metrics/metrics_test.go
+1 -1
View File
@@ -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) {
pkg/webhook/metrics/mutating_handler.go
+1 -1
View File
@@ -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"
)
pkg/webhook/metrics/validating_handler.go
+1 -1
View File
@@ -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
pkg/webhook/podspecworkload/mutating_handler.go
+1 -1
View File
@@ -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"
)
pkg/webhook/podspecworkload/podspecworkload_test.go
+1 -1
View File
@@ -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) {
pkg/webhook/podspecworkload/validating_handler.go
+1 -1
View File
@@ -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