change go package to oam-dev/kubevela

This commit is contained in:
天元
2020-09-11 12:29:12 +08:00
parent edce904df6
commit 044df63770
74 changed files with 185 additions and 186 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,3 +1,3 @@
domain: oam.dev
repo: github.com/cloud-native-application/rudrx
repo: github.com/oam-dev/kubevela
version: "2"

View File

@@ -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

View File

@@ -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()

View File

@@ -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 (

View File

@@ -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/)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

2
e2e/env/env_test.go vendored
View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/cloud-native-application/rudrx
module github.com/oam-dev/kubevela
go 1.13

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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.

View File

@@ -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.

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/cloud-native-application/rudrx/api/v1alpha1"
v1alpha1 "github.com/oam-dev/kubevela/api/v1alpha1"
// +kubebuilder:scaffold:imports
)

View File

@@ -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 (

View File

@@ -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 (

View File

@@ -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
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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

View File

@@ -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"

View File

@@ -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"

View File

@@ -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() {

View File

@@ -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

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/cloud-native-application/rudrx/api/v1alpha1"
"github.com/oam-dev/kubevela/api/v1alpha1"
)
// ValidatingHandler handles Containerized

View File

@@ -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() {

View File

@@ -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 (

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/cloud-native-application/rudrx/api/v1alpha1"
"github.com/oam-dev/kubevela/api/v1alpha1"
)
// ValidatingHandler handles MetricsTrait

View File

@@ -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