diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1cebf7de..2592ca6df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # CONTRIBUTING This doc explains how to set up a development environment, so you can get started -contributing to `RudrX` or build a PoC (Proof of Concept). +contributing to `kubevela` or build a PoC (Proof of Concept). ## Prerequisites @@ -9,14 +9,14 @@ contributing to `RudrX` or build a PoC (Proof of Concept). 2. Kubernetes version v1.15+ with `~/.kube/config` configured. 3. OAM Kubernetes Runtime installed. 4. Kustomize version 3.8+ -5. ginkgo 1.14.0+ (just for [E2E test](https://github.com/cloud-native-application/RudrX/blob/master/DEVELOPMENT.md#e2e-test)) +5. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test)) 6. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow. ## Build * Clone this project ```shell script -git clone git@github.com:cloud-native-application/RudrX.git +git clone git@github.com:oam-dev/kubevela.git ``` * Install Template CRD into your cluster @@ -76,33 +76,33 @@ Will run 5 of 5 specs Trait env init should print env initiation successful message - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:14 + kubevela/e2e/commonContext.go:14 Create env succeed, current env is default • ------------------------------ Trait env switch should show env switch message - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:40 + kubevela/e2e/commonContext.go:40 Switch env succeed, current env is default • ------------------------------ Trait run should print successful creation information - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:76 + kubevela/e2e/commonContext.go:76 Creating AppConfig app-trait-basic SUCCEED • ------------------------------ Trait rudr attach trait should print successful attached information - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/trait/trait_test.go:24 + kubevela/e2e/trait/trait_test.go:24 Applying trait for app Succeeded! • ------------------------------ Trait delete should print successful deletion information - /Users/zhouzhengxi/Programming/golang/src/github.com/zzxwill/RudrX/e2e/commonContext.go:85 + kubevela/e2e/commonContext.go:85 Deleting AppConfig "app-trait-basic" DELETE SUCCEED • diff --git a/Makefile b/Makefile index f5a2b1ea7..10fd485a4 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ VELA_VERSION ?= 0.1.0 # Repo info GIT_COMMIT ?= git-$(shell git rev-parse --short HEAD) -VELA_VERSION_VAR := github.com/cloud-native-application/rudrx/version.VelaVersion -VELA_GITVERSION_VAR := github.com/cloud-native-application/rudrx/version.GitRevision +VELA_VERSION_VAR := github.com/oam-dev/kubevela/version.VelaVersion +VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision LDFLAGS ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)" GOX = go run github.com/mitchellh/gox diff --git a/PROJECT b/PROJECT index 169a3d9e9..3ea643ef5 100644 --- a/PROJECT +++ b/PROJECT @@ -1,3 +1,3 @@ domain: oam.dev -repo: github.com/cloud-native-application/rudrx +repo: github.com/oam-dev/kubevela version: "2" diff --git a/README.md b/README.md index 8fc3b7e23..3394e5cd9 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,9 @@ The Open Application Platform based on Kubernetes and OAM. ## Install `vela` binary ```shell script -git clone git@github.com:cloud-native-application/RudrX.git -cd RudrX -make -mv bin/vela /usr/local/bin +curl https://github.com/oam-dev/kubevela/releases/download/v0.0.1.2/vela-refs.tags.v0.0.1.2-darwin-amd64 +chmod a+x vela-refs.tags.v0.0.1.2-darwin-amd64 +mv vela-refs.tags.v0.0.1.2-darwin-amd64 /usr/local/bin/vela ``` ## Vela commands diff --git a/cmd/core/main.go b/cmd/core/main.go index e38e03515..7d1debd8a 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -23,9 +23,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log/zap" - velacore "github.com/cloud-native-application/rudrx/api/v1alpha1" - velacontroller "github.com/cloud-native-application/rudrx/pkg/controller" - velawebhook "github.com/cloud-native-application/rudrx/pkg/webhook" + velacore "github.com/oam-dev/kubevela/api/v1alpha1" + velacontroller "github.com/oam-dev/kubevela/pkg/controller" + velawebhook "github.com/oam-dev/kubevela/pkg/webhook" ) var scheme = runtime.NewScheme() diff --git a/cmd/vela/main.go b/cmd/vela/main.go index 2595ff129..627539367 100644 --- a/cmd/vela/main.go +++ b/cmd/vela/main.go @@ -8,28 +8,28 @@ import ( "runtime" "time" - "github.com/cloud-native-application/rudrx/cmd/vela/fake" + "github.com/oam-dev/kubevela/cmd/vela/fake" - "github.com/cloud-native-application/rudrx/version" + "github.com/oam-dev/kubevela/version" "github.com/gosuri/uitable" "k8s.io/klog" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "sigs.k8s.io/controller-runtime/pkg/client/config" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/crossplane/oam-kubernetes-runtime/apis/core" "github.com/spf13/cobra" k8sruntime "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - "github.com/cloud-native-application/rudrx/pkg/cmd" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/utils/logs" + "github.com/oam-dev/kubevela/pkg/cmd" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/utils/logs" ) var ( diff --git a/docs/index.md b/docs/index.md index 37848153b..8d0f2cb8d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,9 +11,9 @@ way to integrate any Workloads and Traits. ## Get Started -Check out [Get Started](https://github.com/cloud-native-application/RudrX) to try KubeVela. +Check out [Get Started](https://github.com/oam-dev/kubevela) to try KubeVela. -Explore [Cli docs](https://github.com/cloud-native-application/RudrX/tree/master/documentation/cli) to get a quick glance +Explore [Cli docs](https://github.com/oam-dev/kubevela/tree/master/documentation/cli) to get a quick glance of the power of KubeVela. ## Community @@ -22,4 +22,4 @@ of the power of KubeVela. ## Support or Contact -Having trouble with KubeVela? File an [issue](https://github.com/cloud-native-application/RudrX/issues), or contact us directly [Twitter](https://twitter.com/oam_dev) or [Gitter](https://gitter.im/oam-dev/) +Having trouble with KubeVela? File an [issue](https://github.com/oam-dev/kubevela/issues), or contact us directly [Twitter](https://twitter.com/oam_dev) or [Gitter](https://gitter.im/oam-dev/) diff --git a/e2e/apiserver/apiserver_test.go b/e2e/apiserver/apiserver_test.go index e804e61d2..fd2f6a1c0 100644 --- a/e2e/apiserver/apiserver_test.go +++ b/e2e/apiserver/apiserver_test.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/util" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" "github.com/onsi/gomega" diff --git a/e2e/application/application_test.go b/e2e/application/application_test.go index aa88908d7..6f42cc557 100644 --- a/e2e/application/application_test.go +++ b/e2e/application/application_test.go @@ -3,7 +3,7 @@ package e2e import ( "fmt" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" ) diff --git a/e2e/capability/capability_test.go b/e2e/capability/capability_test.go index 4cca59e1c..97b9866cf 100644 --- a/e2e/capability/capability_test.go +++ b/e2e/capability/capability_test.go @@ -3,11 +3,11 @@ package e2e import ( "fmt" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/e2e/commonContext.go b/e2e/commonContext.go index a539a2213..13850abb7 100644 --- a/e2e/commonContext.go +++ b/e2e/commonContext.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/onsi/ginkgo" "github.com/onsi/gomega" diff --git a/e2e/env/env_test.go b/e2e/env/env_test.go index ef2530ccc..419038d17 100644 --- a/e2e/env/env_test.go +++ b/e2e/env/env_test.go @@ -1,7 +1,7 @@ package e2e import ( - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/e2e/setup/setup_suite_test.go b/e2e/setup/setup_suite_test.go index 917d40f6f..89b30a410 100644 --- a/e2e/setup/setup_suite_test.go +++ b/e2e/setup/setup_suite_test.go @@ -3,7 +3,7 @@ package e2e import ( "testing" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" diff --git a/e2e/trait/trait_test.go b/e2e/trait/trait_test.go index 0a133310b..16a10bcca 100644 --- a/e2e/trait/trait_test.go +++ b/e2e/trait/trait_test.go @@ -5,7 +5,7 @@ import ( "github.com/onsi/gomega" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" ) diff --git a/e2e/workload/workload_test.go b/e2e/workload/workload_test.go index 162bf9bd2..60f7cd24b 100644 --- a/e2e/workload/workload_test.go +++ b/e2e/workload/workload_test.go @@ -3,7 +3,7 @@ package e2e import ( "fmt" - "github.com/cloud-native-application/rudrx/e2e" + "github.com/oam-dev/kubevela/e2e" "github.com/onsi/ginkgo" "github.com/onsi/gomega" ) diff --git a/go.mod b/go.mod index ab237491c..9c9dc1364 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cloud-native-application/rudrx +module github.com/oam-dev/kubevela go 1.13 diff --git a/pkg/application/app.go b/pkg/application/app.go index f8f7f6763..e765384d3 100644 --- a/pkg/application/app.go +++ b/pkg/application/app.go @@ -20,16 +20,16 @@ import ( "k8s.io/apimachinery/pkg/runtime" - mycue "github.com/cloud-native-application/rudrx/pkg/cue" + mycue "github.com/oam-dev/kubevela/pkg/cue" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/ghodss/yaml" ) diff --git a/pkg/application/run.go b/pkg/application/run.go index 5b0598820..f74aac538 100644 --- a/pkg/application/run.go +++ b/pkg/application/run.go @@ -9,7 +9,7 @@ import ( "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" ctypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/app.go b/pkg/cmd/app.go index 126b58b3f..410054360 100644 --- a/pkg/cmd/app.go +++ b/pkg/cmd/app.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/capability.go b/pkg/cmd/capability.go index 6ac5203b7..95d7d6094 100644 --- a/pkg/cmd/capability.go +++ b/pkg/cmd/capability.go @@ -8,11 +8,11 @@ import ( "github.com/gosuri/uitable" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/comp.go b/pkg/cmd/comp.go index 7ab0fdb94..ce7c20932 100644 --- a/pkg/cmd/comp.go +++ b/pkg/cmd/comp.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/completion.go b/pkg/cmd/completion.go index 92e7c7458..09620431a 100644 --- a/pkg/cmd/completion.go +++ b/pkg/cmd/completion.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/dashboard.go b/pkg/cmd/dashboard.go index 38f3526ae..c54627873 100644 --- a/pkg/cmd/dashboard.go +++ b/pkg/cmd/dashboard.go @@ -17,11 +17,11 @@ import ( "github.com/mholt/archiver/v3" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/server" - "github.com/cloud-native-application/rudrx/pkg/server/util" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/server" + "github.com/oam-dev/kubevela/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/spf13/cobra" "go.uber.org/zap/zapcore" diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go index 4010a7951..5e0f69d09 100644 --- a/pkg/cmd/delete.go +++ b/pkg/cmd/delete.go @@ -3,9 +3,9 @@ package cmd import ( "errors" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/cmd/env.go b/pkg/cmd/env.go index a33b2b542..402e08f4a 100644 --- a/pkg/cmd/env.go +++ b/pkg/cmd/env.go @@ -7,10 +7,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/gosuri/uitable" "github.com/spf13/cobra" diff --git a/pkg/cmd/env_test.go b/pkg/cmd/env_test.go index d9efcd106..c12b2ed4e 100644 --- a/pkg/cmd/env_test.go +++ b/pkg/cmd/env_test.go @@ -7,15 +7,15 @@ import ( "strings" "testing" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/crossplane/crossplane-runtime/pkg/test" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cmd/logs.go b/pkg/cmd/logs.go index c0aef79cc..c18fe0e5b 100644 --- a/pkg/cmd/logs.go +++ b/pkg/cmd/logs.go @@ -5,8 +5,8 @@ import ( "github.com/wercker/stern/kubernetes" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" sternCmd "github.com/wercker/stern/cmd" "github.com/wercker/stern/stern" diff --git a/pkg/cmd/ls.go b/pkg/cmd/ls.go index dea2c9bcf..3d56e60ef 100644 --- a/pkg/cmd/ls.go +++ b/pkg/cmd/ls.go @@ -6,13 +6,13 @@ import ( gocmp "github.com/google/go-cmp/cmp" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/gosuri/uitable" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/refresh.go b/pkg/cmd/refresh.go index a53be4d8d..5fb05d665 100644 --- a/pkg/cmd/refresh.go +++ b/pkg/cmd/refresh.go @@ -3,10 +3,10 @@ package cmd import ( "context" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go index c71b38c25..6c89dee1b 100644 --- a/pkg/cmd/run.go +++ b/pkg/cmd/run.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/show.go b/pkg/cmd/show.go index c057144a8..968da61eb 100644 --- a/pkg/cmd/show.go +++ b/pkg/cmd/show.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/application" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go index 25d3bdbf2..9cf2bc9d1 100644 --- a/pkg/cmd/status.go +++ b/pkg/cmd/status.go @@ -11,11 +11,11 @@ import ( "github.com/fatih/color" "github.com/gosuri/uitable" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/system.go b/pkg/cmd/system.go index 71670654f..46dae7be7 100644 --- a/pkg/cmd/system.go +++ b/pkg/cmd/system.go @@ -6,15 +6,15 @@ import ( "io" "strings" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/builtin/traitdefinition" + "github.com/oam-dev/kubevela/pkg/builtin/traitdefinition" - "github.com/cloud-native-application/rudrx/pkg/builtin/workloaddefinition" + "github.com/oam-dev/kubevela/pkg/builtin/workloaddefinition" "github.com/ghodss/yaml" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "k8s.io/apimachinery/pkg/runtime" @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" kubeerrors "k8s.io/apimachinery/pkg/api/errors" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" ) type initCmd struct { diff --git a/pkg/cmd/trait.go b/pkg/cmd/trait.go index b3bc13f75..32b3a777a 100644 --- a/pkg/cmd/trait.go +++ b/pkg/cmd/trait.go @@ -4,15 +4,15 @@ import ( "context" "errors" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/plugins" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/spf13/cobra" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cmd/traits.go b/pkg/cmd/traits.go index 1b4662b09..f302d34ef 100644 --- a/pkg/cmd/traits.go +++ b/pkg/cmd/traits.go @@ -3,9 +3,9 @@ package cmd import ( "strings" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/traits_test.go b/pkg/cmd/traits_test.go index 2c6cfb5a9..11a3753b5 100644 --- a/pkg/cmd/traits_test.go +++ b/pkg/cmd/traits_test.go @@ -8,8 +8,8 @@ import ( "github.com/gosuri/uitable" - "github.com/cloud-native-application/rudrx/api/types" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" ) func Test_printTraitList(t *testing.T) { diff --git a/pkg/cmd/util/helpers.go b/pkg/cmd/util/helpers.go index 51c32d782..561aeab9f 100644 --- a/pkg/cmd/util/helpers.go +++ b/pkg/cmd/util/helpers.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/cmd/workloads.go b/pkg/cmd/workloads.go index d93dab18a..71d99c082 100644 --- a/pkg/cmd/workloads.go +++ b/pkg/cmd/workloads.go @@ -1,10 +1,10 @@ package cmd import ( - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/plugins" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/gosuri/uitable" "github.com/spf13/cobra" ) diff --git a/pkg/controller/setup.go b/pkg/controller/setup.go index f8a3452d3..40aee2903 100644 --- a/pkg/controller/setup.go +++ b/pkg/controller/setup.go @@ -19,8 +19,8 @@ package controller import ( ctrl "sigs.k8s.io/controller-runtime" - "github.com/cloud-native-application/rudrx/pkg/controller/v1alpha1/containerized" - "github.com/cloud-native-application/rudrx/pkg/controller/v1alpha1/metrics" + "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/containerized" + "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/metrics" ) // Setup workload controllers. diff --git a/pkg/controller/v1alpha1/containerized/containerized_controller.go b/pkg/controller/v1alpha1/containerized/containerized_controller.go index b0a8785c2..c22065d75 100644 --- a/pkg/controller/v1alpha1/containerized/containerized_controller.go +++ b/pkg/controller/v1alpha1/containerized/containerized_controller.go @@ -35,7 +35,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) // Reconcile error strings. diff --git a/pkg/controller/v1alpha1/containerized/suite_test.go b/pkg/controller/v1alpha1/containerized/suite_test.go index 2daee74aa..f36dc363b 100644 --- a/pkg/controller/v1alpha1/containerized/suite_test.go +++ b/pkg/controller/v1alpha1/containerized/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/cloud-native-application/rudrx/api/v1alpha1" + v1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/controller/v1alpha1/metrics/metricstrait_controller.go b/pkg/controller/v1alpha1/metrics/metricstrait_controller.go index 631a2ebb0..aa0bc75b5 100644 --- a/pkg/controller/v1alpha1/metrics/metricstrait_controller.go +++ b/pkg/controller/v1alpha1/metrics/metricstrait_controller.go @@ -37,7 +37,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) const ( diff --git a/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go b/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go index 2129cd617..170eeb0d0 100644 --- a/pkg/controller/v1alpha1/metrics/metricstrait_controller_integration_test.go +++ b/pkg/controller/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/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) var ( diff --git a/pkg/controller/v1alpha1/metrics/suite_test.go b/pkg/controller/v1alpha1/metrics/suite_test.go index b366ed289..4852b9fa9 100644 --- a/pkg/controller/v1alpha1/metrics/suite_test.go +++ b/pkg/controller/v1alpha1/metrics/suite_test.go @@ -36,7 +36,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - standardv1alpha1 "github.com/cloud-native-application/rudrx/api/v1alpha1" + standardv1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/cue/convert.go b/pkg/cue/convert.go index 56e9023d6..a188cbd43 100644 --- a/pkg/cue/convert.go +++ b/pkg/cue/convert.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "cuelang.org/go/cue" "cuelang.org/go/pkg/encoding/json" diff --git a/pkg/cue/convert_test.go b/pkg/cue/convert_test.go index 1aa5ff2f2..716c19123 100644 --- a/pkg/cue/convert_test.go +++ b/pkg/cue/convert_test.go @@ -7,7 +7,7 @@ import ( "cuelang.org/go/cue" "cuelang.org/go/pkg/encoding/json" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/oam/application.go b/pkg/oam/application.go index 35bb4ae66..1bec2e93c 100644 --- a/pkg/oam/application.go +++ b/pkg/oam/application.go @@ -6,10 +6,10 @@ import ( "os" "sort" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/application" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/application" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" + "github.com/oam-dev/kubevela/pkg/server/apis" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/oam/capability.go b/pkg/oam/capability.go index 45f54ade5..73c4d3c3e 100644 --- a/pkg/oam/capability.go +++ b/pkg/oam/capability.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/ghodss/yaml" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/oam/env.go b/pkg/oam/env.go index f217ca85d..84f5b58b7 100644 --- a/pkg/oam/env.go +++ b/pkg/oam/env.go @@ -16,8 +16,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/utils/system" ) func GetEnvByName(name string) (*types.EnvMeta, error) { diff --git a/pkg/oam/system.go b/pkg/oam/system.go index dc19e971b..e9a2b9fbb 100644 --- a/pkg/oam/system.go +++ b/pkg/oam/system.go @@ -18,10 +18,10 @@ import ( "helm.sh/helm/v3/pkg/repo" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" "github.com/pkg/errors" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "helm.sh/helm/v3/pkg/kube" "helm.sh/helm/v3/pkg/action" diff --git a/pkg/oam/trait.go b/pkg/oam/trait.go index 4b912e604..ba01c4b52 100644 --- a/pkg/oam/trait.go +++ b/pkg/oam/trait.go @@ -13,14 +13,14 @@ import ( "github.com/gin-gonic/gin" "cuelang.org/go/cue" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" "github.com/spf13/pflag" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/utils/system" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" plur "github.com/gertd/go-pluralize" diff --git a/pkg/oam/workload.go b/pkg/oam/workload.go index c7bbd3891..403f6afd8 100644 --- a/pkg/oam/workload.go +++ b/pkg/oam/workload.go @@ -6,16 +6,16 @@ import ( "strconv" "strings" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/spf13/pflag" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/cmd/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/cmd/util" "sigs.k8s.io/controller-runtime/pkg/client" "cuelang.org/go/cue" - "github.com/cloud-native-application/rudrx/pkg/application" + "github.com/oam-dev/kubevela/pkg/application" ) type RunOptions struct { diff --git a/pkg/plugins/capcenter.go b/pkg/plugins/capcenter.go index dec4c5ff5..825b5d2c2 100644 --- a/pkg/plugins/capcenter.go +++ b/pkg/plugins/capcenter.go @@ -16,10 +16,10 @@ import ( "github.com/google/go-github/v32/github" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "github.com/ghodss/yaml" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/plugins/cluster.go b/pkg/plugins/cluster.go index ecc5010c9..dbc9bc42f 100644 --- a/pkg/plugins/cluster.go +++ b/pkg/plugins/cluster.go @@ -7,16 +7,16 @@ import ( "io/ioutil" "path/filepath" - cmdutil "github.com/cloud-native-application/rudrx/pkg/cmd/util" + cmdutil "github.com/oam-dev/kubevela/pkg/cmd/util" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/cue" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/cue" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/plugins/cluster_test.go b/pkg/plugins/cluster_test.go index 105ac552f..a7b326fa5 100644 --- a/pkg/plugins/cluster_test.go +++ b/pkg/plugins/cluster_test.go @@ -9,7 +9,7 @@ import ( "cuelang.org/go/cue" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/plugins/local.go b/pkg/plugins/local.go index 6a4044dc5..c5436b890 100644 --- a/pkg/plugins/local.go +++ b/pkg/plugins/local.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/utils/system" ) func LoadCapabilityByName(name string) (types.Capability, error) { diff --git a/pkg/plugins/local_test.go b/pkg/plugins/local_test.go index 1dbdb9b5d..4db7fe3cc 100644 --- a/pkg/plugins/local_test.go +++ b/pkg/plugins/local_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" "github.com/stretchr/testify/assert" ) diff --git a/pkg/plugins/suit_test.go b/pkg/plugins/suit_test.go index 56e0c3458..87132382f 100644 --- a/pkg/plugins/suit_test.go +++ b/pkg/plugins/suit_test.go @@ -10,7 +10,7 @@ import ( "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "github.com/ghodss/yaml" - "github.com/cloud-native-application/rudrx/pkg/utils/system" + "github.com/oam-dev/kubevela/pkg/utils/system" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/server/apis/types.go b/pkg/server/apis/types.go index 8b5cc3a19..e7623c8bd 100644 --- a/pkg/server/apis/types.go +++ b/pkg/server/apis/types.go @@ -1,7 +1,7 @@ package apis import ( - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/server/handler/appHandlers.go b/pkg/server/handler/appHandlers.go index c693a4fe1..88a223951 100644 --- a/pkg/server/handler/appHandlers.go +++ b/pkg/server/handler/appHandlers.go @@ -1,11 +1,11 @@ package handler import ( - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/gin-gonic/gin" ) diff --git a/pkg/server/handler/capabilityHandlers.go b/pkg/server/handler/capabilityHandlers.go index 2a8d38413..aaf421a5d 100644 --- a/pkg/server/handler/capabilityHandlers.go +++ b/pkg/server/handler/capabilityHandlers.go @@ -1,9 +1,9 @@ package handler import ( - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/plugins" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/gin-gonic/gin" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/server/handler/envHandlers.go b/pkg/server/handler/envHandlers.go index ad460f013..c406f039b 100644 --- a/pkg/server/handler/envHandlers.go +++ b/pkg/server/handler/envHandlers.go @@ -1,14 +1,14 @@ package handler import ( - "github.com/cloud-native-application/rudrx/pkg/oam" + "github.com/oam-dev/kubevela/pkg/oam" "github.com/gin-gonic/gin" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" ) // ENV related handlers diff --git a/pkg/server/handler/traitHandler.go b/pkg/server/handler/traitHandler.go index f1d297f42..3828c6ee7 100644 --- a/pkg/server/handler/traitHandler.go +++ b/pkg/server/handler/traitHandler.go @@ -3,10 +3,10 @@ package handler import ( "strconv" - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/gin-gonic/gin" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/pkg/server/handler/workloadHandler.go b/pkg/server/handler/workloadHandler.go index 7a5138119..afe9e7eb9 100644 --- a/pkg/server/handler/workloadHandler.go +++ b/pkg/server/handler/workloadHandler.go @@ -1,14 +1,14 @@ package handler import ( - "github.com/cloud-native-application/rudrx/api/types" - "github.com/cloud-native-application/rudrx/pkg/oam" - "github.com/cloud-native-application/rudrx/pkg/plugins" + "github.com/oam-dev/kubevela/api/types" + "github.com/oam-dev/kubevela/pkg/oam" + "github.com/oam-dev/kubevela/pkg/plugins" "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/server/apis" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/util" "github.com/gin-gonic/gin" ) diff --git a/pkg/server/route.go b/pkg/server/route.go index 7337e0891..231301165 100644 --- a/pkg/server/route.go +++ b/pkg/server/route.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloud-native-application/rudrx/pkg/server/handler" - "github.com/cloud-native-application/rudrx/pkg/server/util" + "github.com/oam-dev/kubevela/pkg/server/handler" + "github.com/oam-dev/kubevela/pkg/server/util" ) // setup the gin http server handler diff --git a/pkg/server/util/api.go b/pkg/server/util/api.go index 92c5349c8..d050b79f4 100644 --- a/pkg/server/util/api.go +++ b/pkg/server/util/api.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/cloud-native-application/rudrx/pkg/server/apis" + "github.com/oam-dev/kubevela/pkg/server/apis" ) var DefaultDashboardPort = ":38081" diff --git a/pkg/utils/system/system.go b/pkg/utils/system/system.go index 19870185f..1e3c2f2be 100644 --- a/pkg/utils/system/system.go +++ b/pkg/utils/system/system.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/cloud-native-application/rudrx/api/types" + "github.com/oam-dev/kubevela/api/types" ) const defaultVelaHome = ".vela" diff --git a/pkg/webhook/containerized/containerized_test.go b/pkg/webhook/containerized/containerized_test.go index 4a43395ab..46f65c308 100644 --- a/pkg/webhook/containerized/containerized_test.go +++ b/pkg/webhook/containerized/containerized_test.go @@ -7,8 +7,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - . "github.com/cloud-native-application/rudrx/pkg/webhook/containerized" + "github.com/oam-dev/kubevela/api/v1alpha1" + . "github.com/oam-dev/kubevela/pkg/webhook/containerized" ) var _ = Describe("Containerized", func() { diff --git a/pkg/webhook/containerized/mutating_handler.go b/pkg/webhook/containerized/mutating_handler.go index 166323eaf..ec12101e2 100644 --- a/pkg/webhook/containerized/mutating_handler.go +++ b/pkg/webhook/containerized/mutating_handler.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - util "github.com/cloud-native-application/rudrx/pkg/utils" + "github.com/oam-dev/kubevela/api/v1alpha1" + util "github.com/oam-dev/kubevela/pkg/utils" ) // MutatingHandler handles Containerized workload diff --git a/pkg/webhook/containerized/validating_handler.go b/pkg/webhook/containerized/validating_handler.go index 272bf6e38..523da1a35 100644 --- a/pkg/webhook/containerized/validating_handler.go +++ b/pkg/webhook/containerized/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/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) // ValidatingHandler handles Containerized diff --git a/pkg/webhook/metrics/metrics_test.go b/pkg/webhook/metrics/metrics_test.go index 20109353d..458625b8e 100644 --- a/pkg/webhook/metrics/metrics_test.go +++ b/pkg/webhook/metrics/metrics_test.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - . "github.com/cloud-native-application/rudrx/pkg/webhook/metrics" + "github.com/oam-dev/kubevela/api/v1alpha1" + . "github.com/oam-dev/kubevela/pkg/webhook/metrics" ) var _ = Describe("Metrics Admission controller Test", func() { diff --git a/pkg/webhook/metrics/mutating_handler.go b/pkg/webhook/metrics/mutating_handler.go index eb05ed32e..a56c169b6 100644 --- a/pkg/webhook/metrics/mutating_handler.go +++ b/pkg/webhook/metrics/mutating_handler.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/runtime/inject" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/cloud-native-application/rudrx/api/v1alpha1" - util "github.com/cloud-native-application/rudrx/pkg/utils" + "github.com/oam-dev/kubevela/api/v1alpha1" + util "github.com/oam-dev/kubevela/pkg/utils" ) const ( diff --git a/pkg/webhook/metrics/validating_handler.go b/pkg/webhook/metrics/validating_handler.go index a3518f02e..51bc66fad 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/cloud-native-application/rudrx/api/v1alpha1" + "github.com/oam-dev/kubevela/api/v1alpha1" ) // ValidatingHandler handles MetricsTrait diff --git a/pkg/webhook/register.go b/pkg/webhook/register.go index 36f04e82d..1a00918a0 100644 --- a/pkg/webhook/register.go +++ b/pkg/webhook/register.go @@ -4,8 +4,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/webhook" - "github.com/cloud-native-application/rudrx/pkg/webhook/containerized" - "github.com/cloud-native-application/rudrx/pkg/webhook/metrics" + "github.com/oam-dev/kubevela/pkg/webhook/containerized" + "github.com/oam-dev/kubevela/pkg/webhook/metrics" ) // +kubebuilder:webhook:verbs=create;update;delete,path=/validate-standard-oam-dev-v1alpha1-metricstrait,mutating=false,failurePolicy=fail,groups=standard.oam.dev,resources=metricstraits,versions=v1alpha1,name=vmetricstrait.kb.io