Merge pull request #637 from wonderflow/display

add tips about vela install capability not ready instead of directly fail

.github/workflows/dashboard.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    branches: [master]
+    paths-ignore:
+    - 'docs/**'
+    - '**.md'
 defaults:
   run:
     working-directory: ./dashboard

.github/workflows/e2e.yml

@@ -5,18 +5,15 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+    paths-ignore:
+    - 'docs/**'
+    - '**.md'
 
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
+    name: e2e-tests
+    runs-on: aliyun
     steps:
-      - name: Set up Go 1.13
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.13
-        id: go
-
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
@@ -24,22 +21,22 @@ jobs:
         run: |
           go get -v -t -d ./...
 
-      - name: Install ginkgo
-        run:  |
-          sudo apt-get update
-          sudo apt-get install -y golang-ginkgo-dev
-
       - name: Setup Kind Cluster
-        uses: engineerd/setup-kind@v0.4.0
+        uses: engineerd/setup-kind@v0.5.0
         with:
           version: "v0.7.0"
+          skipClusterCreation: true
+
+      - name: Setup Kind Cluster
+        run: |
+          kind delete cluster
+          kind create cluster
+          kubectl version
+          kubectl cluster-info
 
       - name: Load Image to kind cluster
         run: make kind-load
 
-      - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1
-
       - name: Run Make
         run: make
 
@@ -48,7 +45,7 @@ jobs:
 
       - name: Run e2e tests
         run: |
+          make e2e-cleanup
           make e2e-setup
           make e2e-test
           make e2e-api-test
-          make e2e-cleanup

.github/workflows/go.yml

@@ -5,16 +5,19 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+    paths-ignore:
+    - 'docs/**'
+    - '**.md'
 
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
+    name: unit-tests
+    runs-on: ubuntu-20.04
     steps:
-      - name: Set up Go 1.13
+      - name: Set up Go 1.14
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13
+          go-version: 1.14
         id: go
 
       - name: Check out code into the Go module directory
@@ -22,16 +25,15 @@ jobs:
 
       - name: Install ginkgo
         run:  |
-          sudo apt-get update
           sudo apt-get install -y golang-ginkgo-dev
 
       - name: Setup Kind Cluster
-        uses: engineerd/setup-kind@v0.4.0
+        uses: engineerd/setup-kind@v0.5.0
         with:
           version: "v0.7.0"
 
       - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1
+        uses: wonderflow/kubebuilder-action@v1.1
 
       - name: Run Make test
         run: make test

.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
       VELA_VERSION: ${{ github.ref }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Set up Go 1.13
+      - name: Set up Go 1.14
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13
+          go-version: 1.14
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

.gitignore

@@ -39,6 +39,7 @@ tmp/
 cmd/vela/fake/source.go
 cmd/vela/fake/chart_source.go
 charts/vela-core/crds/_.yaml
+.test_vela
 
 .vela/
 

CONTRIBUTING.md

@@ -1,5 +1,9 @@
 # CONTRIBUTING
 
+## About KubeVela
+
+KubeVela project is initialized and maintained by the cloud native community since day 0 with [bootstrapping contributors from 8+ different organizations](https://github.com/oam-dev/kubevela/graphs/contributors). We intend for KubeVela to have a open governance since the very beginning and donate the project to neutral foundation as soon as it's released. 
+
 This doc explains how to set up a development environment, so you can get started
 contributing to `kubevela` or build a PoC (Proof of Concept). 
 
@@ -10,6 +14,8 @@ contributing to `kubevela` or build a PoC (Proof of Concept).
 3. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test))
 4. 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.
 
+We also recommend you to learn about KubeVela's [design](docs/en/design.md) before dive into its code.
+
 ## Build
 
 * Clone this project
@@ -70,43 +76,60 @@ vela env init myenv --namespace myenv --email my@email.com --domain kubevela.io
 For example, use the following command to create and run an application.
 
 ```shell script
-$ vela comp deploy mycomp -t webservice --image crccheck/hello-world --port 8000
-Creating AppConfig appcomp
-SUCCEED
+$ vela svc deploy mysvc -t webservice --image crccheck/hello-world --port 8000 -a abc
+  App abc deployed
 ```
 
 * Add Trait
 
 ```shell script
-$ vela route mycomp
-Adding route for app abc
-Succeeded!
+$ vela route abc
+  Adding route for app mysvc
+  ⠋ Deploying ...
+  ✅ Application Deployed Successfully!
+    - Name: mysvc
+      Type: webservice
+      HEALTHY Ready: 1/1
+      Last Deployment:
+        Created at: 2020-11-02 11:17:28 +0800 CST
+        Updated at: 2020-11-02T11:21:23+08:00
+      Routes:
+        - route: Visiting URL: http://abc.kubevela.io	IP: 47.242.68.137
 ```
 
 * Check Status
 
 ```
-$ vela comp status abc
-Showing status of Component abc deployed in Environment t2
-Component Status:
-	Name: abc  PodSpecWorkload(type) UNKNOWN APIVersion standard.oam.dev/v1alpha1 Kind PodSpecWorkload workload is unknown for HealthScope
-	Traits
-	    └─Trait/route
-
-Last Deployment:
-	Created at: 2020-09-18 18:47:09 +0800 CST
-	Updated at: 2020-09-18T18:47:16+08:00
+$ vela status abc
+  About:
+  
+    Name:      	abc
+    Namespace: 	default
+    Created at:	2020-11-02 11:17:28.067738 +0800 CST
+    Updated at:	2020-11-02 11:28:13.490986 +0800 CST
+  
+  Services:
+  
+    - Name: mysvc
+      Type: webservice
+      HEALTHY Ready: 1/1
+      Last Deployment:
+        Created at: 2020-11-02 11:17:28 +0800 CST
+        Updated at: 2020-11-02T11:28:13+08:00
+      Routes:
+        - route: Visiting URL: http://abc.kubevela.io	IP: 47.242.68.137
 ```
 
 * Delete App
 
 ```shell script
-$ vela app ls
-abc
+$ vela ls
+  SERVICE       	APP      	TYPE	TRAITS	STATUS  	CREATED-TIME
+  mysvc            	abc       	    	      	Deployed 	2020-11-02 11:17:28 +0800 CST
 
-$ vela app delete abc
-Deleting Application "abc"
-delete apps succeed abc from t2
+$ vela delete abc
+  Deleting Application "abc"
+  delete apps succeed abc from default
 ```
 
 ## Tests
@@ -119,7 +142,7 @@ make test
 
 ### E2E test
 
-** Before e2e test start, make sure you have vela-core running.**
+**Before e2e test start, make sure you have vela-core running.**
 
 ```shell script
 make core-run

DESIGN.md

@@ -1,192 +0,0 @@
-# KubeVela Design
-
-This document is the detailed design and architecture of the KubeVela being built in this repository.
-
-> All the diagram in this documentation could be found in [this slides](https://docs.google.com/presentation/d/1Y3gnKrd7fUZGgee7Ia9vBsRIYhcZLQwMUCDkk1RJvQc/edit?usp=sharing).
-
-## Overview
-
-KubeVela is a simple, complete, but highly extensible cloud native application platform based on Kubernetes and Open Application Model (OAM). KubeVela intends to bring application-centric experience to its end users and democratize building cloud native application platforms for platform engineers.
-
-## User Stories
-
-As a end user (e.g. application developers, operators etc) of the platform, I only want to focus on coding my business logic and ship them to various environments at ease. Let's say:
-- Here's my source code.
-- Here's my application configuration (described in end user PoV).
-- Deploy it in test environment.
-- Deploy it in production environment.
-- Monitoring, debugging, rollout/rollback the application.
-- Dockerfile is fine, but please keep it simple. 
-
-As a platform engineer, I want to build a easy-to-use platform for my end users. In detail, the platform should be:
-- Heroku-like (_in terms of both user experience and functionality_). 
-  - and I prefer to build my own version with OSS tools, particularly, with Kubernetes (for obvious reason).
-- Easy to build. 
-  - I am too busy to reinvent any wheel, I want to reuse every capability in Kubernetes community as possible,  with minimal effort. Writing some simple CRD and controllers is fine, but please, just the simple ones like copy-paste.
-- Powerful and highly extensible.
-  - I don't want to lock my users with restricted abstractions and capabilities like traditional PaaS or FaaS/Serverless. I love Kubernetes and what it has enabled. So in terms of capability, I hope my platform is fully open and has unlimited possibilities like Kubernetes itself, rather than another opinionated close system like traditional PaaS.
-
-
-## Core Principles
-
-In nutshell, the principles for KubeVela project are:
-
-- For end users, it out-of-the-box ships a fully featured PaaS-like experience, nothing special.
-- For platform builders, it works like a special Kubernetes "distro" or extensible PaaS core that could be used to build something more complex. It allows platform builders to ship any existing capabilities in cloud native ecosystem to end users with minimal effort, or develop a new capability at ease in a standardized and Kubernetes-native approach.
-
-## Design Details
-
-### 1. Application Centric
-
-The design of KubeVela intends to make users think in terms of application, not containers or infrastructure. 
-
-Lacking application context impacts the user experience and significantly raised the bar to adopt cloud native stack. We believe "application" is the natural mindset of developers and it's the core concept an application platform should expose.
-
-![alt](resources/app-centric.png)
-
-KubeVela intends to let developers push code, define application in developer facing primitives, and make daily operations as configurations of the application.  
-
-Thus, KubeVela choose to:
-1. Introduce "application" as first class citizen and main API.
-2. Build the whole system around "application", i.e. model capabilities of Kubernetes as application configuration, with clarity and manageability.
-
-#### Solution
-
-Instead of creating a in-house "application CRD", KubeVela adopts [Open Application Model (OAM)](https://github.com/oam-dev/spec) as its application definition, since OAM:
-1. Defines micro-services application by default.
-2. Can model operations as part of the application (i.e. `Trait`).
-2. Highly extensible: every workload and trait in OAM is a independent definition, no abstraction or capability lock-in.
-
-### 2. Capability Oriented Architecture
-
-To enable platform builders use KubeVela as the extensible "PaaS core", KubeVela intends to make its every capability a standalone "plug-in".
-
-![alt](resources/coa.png)
-
-For example, there are several "built-in" workload types in KubeVela such as `Web Service` or `Task`. It is by design that they are all independent CRD controllers that abstract Kubernetes built-in workloads and create Service automatically if needed. KubeVela itself is **NOT** aware of the specification or implementation of these workload types.
-
-This means platform builders are free to bring their own workload types by simply install a CRD controller, or even just reference a k8s built-in resource like StatefulSet as new workload type.
-
-Similarly, all the "built-in" operations such as `scaling` or `rollout` (i.e. "traits" in KubeVela) are also independent CRD controllers which are **NOT** bound with specific workload types. Platform builders are free to bring their own traits implementations by simply providing a CRD controller, reference a k8s built-in resource like `HPA` or `NetworkPolicy` as trait is also possible.
-
-This loosely coupled design of KubeVela adopts the idea of Capability Oriented Architecture (COA), i.e. instead of creating a close system like traditional PaaS, KubeVela intends to become an application-centric framework to connect end users with underlying infrastructure capabilities.
-
-#### Solution
-
-We decide to build KubeVela core with [OAM Kubernetes runtime](https://github.com/crossplane/oam-kubernetes-runtime) which already implemented the building block features such as standalone workload type and trait controllers. Whether a given trait could work with certain workload types is also clarified as `appliesTo` field of trait definition. For platform builders, OAM Kubernetes Runtime also provided a [lightweight library](https://github.com/crossplane/oam-kubernetes-runtime/blob/2be3900a3817aed570de9ec353e6ab0b50e100f0/pkg/controller/v1alpha2/core/traits/manualscalertrait/manualscalertrait_controller.go#L42) to implement trait controller so it doesn't need to care about workload kinds.
-
-##### Capability Register and Discovery
-
-KubeVela leverages [OAM definition objects](https://github.com/oam-dev/spec/blob/master/4.workload_definitions.md) to register and discover workloads and traits:
-
-
-```console
-$ kubectl apply -f workload-definition.yaml # register a new workload type
-$ kubectl apply -f trait-definition.yaml # register a new trait
-```
-
-Note that OAM definition objects only care about API resource, not including the controllers. Thus KubeVela intends to include a **CRD registry** so whenever a new API resource is installed as workload or trait, KubeVela could install its controller automatically from the registry. That of course means we envision the CRD registry could register a CRD and Helm chart (which contains the manifest of the controller). In practice, we are currently evaluating RedHat's Operator Lifecycle Manager (OLM) but no the final conclusion yet.
-
-##### Cloud Services Integration
-
-For capabilities like cloud services, KubeVela intends to leverage Kubernetes as the universal control plane so [Crossplane](https://github.com/crossplane/crossplane) core will be used to register cloud services as workload types.
-
-
-### 3. Extensible User Interface
-
-KubeVela is built with Kubernetes and OAM also adopts Kubernetes API resource model. So in nutshell, **ALL** functionalities of KubeVela core are able to be consumed by simple `kubectl`, for example:
-
-```yaml
-$ kubectl apply -f frontend-component.yaml # create frontend component
-$ kubectl apply -f backend-component.yaml # create backend component
-$ kubectl apply -f application-config.yaml # assign operational traits to components
-```
-
-However, Kubernetes API should not be the end game. Declarative YAML objects are great to build platforms like KubeVela with but when directly exposed to end users, it creates heavy mental burden and high learning curve. For example, even with highest level abstraction, the default [containerized workload schema](https://github.com/oam-dev/spec/blob/master/core/workloads/schema/containerized_workload.md) of OAM still has dozens fields to learn with many rough edges to be aware.
-
-Thus KubeVela intends to introduce a lightweight user facing layer on top of its Kubernetes API objects with following goals in mind:
-
-- Shorten the learning curve of new developers. Most capabilities in KubeVela are developed by big
-companies that run very complex workloads. However, for the bigger developer community, the new user facing layer will provide a much simpler path to on-board KubeVela.
-- Developers can describe their applications and behavior of their components without making assumptions on availability of specific Kubernetes API. For instance, a developer will be able to model auto-scaling needs without referring to the CRD of auto-scaling trait.
-- Provides a single source of truth of the application description. The user facing layer allows developers to work with a single artifact to capture the application definition. This artifact is the definitive truth of how the application is supposed to look like. It simplifies administrative tasks such as change management. It also serves as an anchor for application truth to avoid configuration drifts during operation.
-- Highly extensible. For example, when a new workload type or trait is installed, the end users could access this new capability directly from user interface layer, no re-compile or re-deploy of KubeVela is required.
-
-#### Solution
-
-We concluded above requirements of the user interface layer as introducing a modeling language on top of the existing model objects. With this context, we decide to adopt [CUElang](https://github.com/cuelang/cue) as the modeling language of KubeVela. In detail, every workload or trait definition will inline a cue template as the contract between user and Kubernetes API object.
-
-However, we don't assume users need to learn or write CUElang directly. Instead, the reason we choose CUElang is it's just perfect to help us create developer facing tools based on it. Thus, KubeVela introduced three most common tools based to CUElang for developers to use:
-
-1. A command line tool.
-2. A GUI dashboard.
-3. A Docker Compose style `appfile`.
-
-An example for `vela cli`:
-
-```console
-$ vela comp deploy frontend -t webservice --image oamdev/testapp:v1 --port 80 --app helloworld
-```
-
-The `-t webservice --image oamdev/testapp:v1 --port 80` arguments are not hard coded, they are schema defined by in-line CUE template of `WebService` workload definition.
-
-The `appfile` is essentially a YAML version of command line tool so we can support more complex and serious scenarios by simply running `$ vela up hello-world.yaml`:
-
-```yaml
-version: "1.0-alpha.1"
-
-name: helloworld
-
-services:
-  express-server:
-    type: webservice # workload type
-    build:
-      docker:
-        file: Dockerfile
-        context: .
-
-    image: oamdev/testapp:v1
-    cmd: ["node", "server.js"]
-    ports:
-      - 8080:80
-    env:
-      - FOO=bar
-
-    scale: # scaling trait
-      replica: 2
-      auto:
-        range: "1-10"
-        cpu: 80
-        qps: 1000
-
-    canary: # canary trait
-      step: 5
-      headers:
-        - "foo:bar.*"
-
-  redis:
-    image: oamdev/redis
-
-secrets:
-  my-secret: /local-path/my-secret # load local file into k8s secret
-```
-
-The schema of above `appfile` is not hard coded, they are defined by in-line CUE templates of `WebService` workload definition, `Scaling` trait definition and `Canary` trait definition.
-
-We will skip the example of dashboard, but similarly, the schema of GUI forms are defined by in-lined CUE template of definition objects.
-
-## Architecture
-
-![alt](resources/arch.png)
-
-From highest level, KubeVela is composed by only two components:
-
-### 1. User interface layer
-Including: `cli`, `dashboard`, `appfile`, they are all client side tools to provide developer facing abstractions by leveraging CUElang based parametering and templating.
-### 2. KubeVela core
-Including:
-  - [OAM Kubernetes runtime](https://github.com/crossplane/oam-kubernetes-runtime) to provide application level building blocks such as `Component` and `Application` etc.
-  - [Built-in workload and trait controllers](https://github.com/oam-dev/kubevela/tree/master/pkg/controller/v1alpha1) to implement core capabilities such as `webservice`, `route` and `rollout` etc.
-  - Capability Management: manage features of KubeVela following Capability Oriented Architecture. 
-    - Every feature of KubeVela is a "addon", and it is registered by Kubernetes API resource (including CRD) leveraging OAM definition objects.
-    - CRD Registry: register controllers of Kubernetes add-ons and discover them by CRD. This will enable automatically install controllers/operators when CRD is missing in the cluster.

Makefile

@@ -1,14 +1,14 @@
 # Vela version
 VELA_VERSION ?= 0.1.0
 # Repo info
-GIT_COMMIT ?= git-$(shell git rev-parse --short HEAD)
-VELA_VERSION_VAR := github.com/oam-dev/kubevela/version.VelaVersion
+GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
+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)"
+LDFLAGS             ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)"
 
-GOX      = go run github.com/mitchellh/gox
-TARGETS  := darwin/amd64 linux/amd64 windows/amd64
-DIST_DIRS       := find * -type d -exec
+GOX         = go run github.com/mitchellh/gox
+TARGETS     := darwin/amd64 linux/amd64 windows/amd64
+DIST_DIRS   := find * -type d -exec
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -20,8 +20,8 @@ endif
 all: build
 
 # Run tests
-test: fmt vet lint
-	./hack/unit_test.sh
+test: vet lint
+	go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... ./cmd/...
 
 # Build manager binary
 build: fmt vet lint
@@ -29,14 +29,17 @@ build: fmt vet lint
 	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
 	git checkout cmd/vela/fake/chart_source.go
 
+vela-cli:
+	go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
+
 npm-build:
 	cd dashboard && npm run build && cd ./..
 
 npm-install:
 	cd dashboard && npm install && cd ./..
 
-generate-doc:
-	rm -r documentation/cli/*
+doc-gen:
+	rm -r docs/en/cli/*
 	go run hack/docgen/gen.go
 
 generate-source:
@@ -61,8 +64,10 @@ run: fmt vet
 	go run ./cmd/core/main.go
 
 # Run go fmt against code
-fmt:
+fmt: goimports
 	go fmt ./...
+	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w ./pkg ./cmd
+	./hack/cue-fmt.sh
 
 # Run go vet against code
 vet:
@@ -88,7 +93,7 @@ e2e-setup:
 
 e2e-test:
 	# Run e2e test
-	ginkgo -v -skipPackage setup,apiserver -r e2e
+	ginkgo -v -skipPackage capability,setup,apiserver -r e2e
 
 e2e-api-test:
 	# Run e2e test
@@ -96,6 +101,7 @@ e2e-api-test:
 
 e2e-cleanup:
 	# Clean up
+	rm -rf ~/.vela
 
 # load docker image to the kind cluster
 kind-load:
@@ -121,20 +127,24 @@ core-run: generate fmt vet manifests
 
 # Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
 core-install: manifests
+	kubectl apply -f hack/namespace.yaml
 	kubectl apply -f charts/vela-core/crds/
+	kubectl apply -f charts/vela-core/templates/defwithtemplate/
 	kubectl apply -f charts/vela-core/templates/definitions/
-	kubectl apply -f charts/third_party/prometheus
+	kubectl apply -f charts/vela-core/templates/velaConfig.yaml
+	bin/vela workloads
 
 # Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
 core-uninstall: manifests
-	kubectl delete -f charts/vela-core/crds/
 	kubectl delete -f charts/vela-core/templates/definitions/
-	kubectl delete -f charts/third_party/prometheus
+	kubectl delete -f charts/vela-core/templates/defwithtemplate/
+	kubectl delete -f charts/vela-core/crds/
 
 # 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
-	rm charts/vela-core/crds/_.yaml
+	go generate $(foreach t,pkg api,./$(t)/...)
+	./hack/vela-templates/gen_definitions.sh
 
 # Generate code
 generate: controller-gen
@@ -176,3 +186,15 @@ GOLANGCILINT=$(GOBIN)/golangci-lint
 else
 GOLANGCILINT=$(shell which golangci-lint)
 endif
+
+.PHONY: goimports
+goimports:
+ifeq (, $(shell which goimports))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
+	}
+GOIMPORTS=$(GOBIN)/goimports
+else
+GOIMPORTS=$(shell which goimports)
+endif

OWNERS

@@ -0,0 +1,9 @@
+approvers:
+- kubevela-controller
+- kubevela-devex
+
+reviewers:
+- kubevela-controller
+- kubevela-dashboard
+- oam-k8s-runtime
+- oam-spec

OWNERS_ALIASES

@@ -0,0 +1,49 @@
+aliases:
+  kubevela-devex:
+  - hongchaodeng
+  - wonderflow
+
+  kubevela-dashboard:
+  - zzxwill
+  - hanxie-crypto
+  - hongchaodeng
+
+  kubevela-controller:
+  - resouer
+  - wonderflow
+  - hongchaodeng
+  - zzxwill
+  - ryanzhang-oss
+  
+  oam-k8s-runtime:            # inherit from https://github.com/crossplane/oam-kubernetes-runtime/blob/master/OWNERS.md
+  - hongchaodeng
+  - wonderflow
+  - ryanzhang-oss
+  - captainroy-hy
+  - negz
+  - hasheddan
+
+  oam-spec:                   # inherit from https://github.com/oam-dev/spec/blob/master/OWNERS.md
+  - hongchaodeng
+  - resouer
+  - vturecek
+
+  community-collaborators:
+  - Fei-Guo
+  - szihai
+
+  bootstrap-contributors:     # thank you for bootstrapping KubeVela at the very early stage!
+  - xiaoyuaiheshui
+  - Ghostbaby
+  - wenxinnnnn
+  - silenceper
+  - erdun
+  - sunny0826
+  - mosesyou
+  - artursouza
+  - wonderflow
+  - hongchaodeng
+  - ryanzhang-oss
+  - woshilanren11
+  - hanxie-crypto
+  - zzxwill

README.md

@@ -1,338 +1,37 @@
+![Build status](https://github.com/oam-dev/kubevela/workflows/E2E/badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/oam-dev/kubevela)](https://goreportcard.com/report/github.com/oam-dev/kubevela)
+![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
+[![codecov](https://codecov.io/gh/oam-dev/kubevela/branch/master/graph/badge.svg)](https://codecov.io/gh/oam-dev/kubevela)
+[![LICENSE](https://img.shields.io/github/license/oam-dev/kubevela.svg?style=flat-square)](/LICENSE)
+[![Releases](https://img.shields.io/github/release/oam-dev/kubevela/all.svg?style=flat-square)](https://github.com/oam-dev/kubevela/releases)
+[![TODOs](https://img.shields.io/endpoint?url=https://api.tickgit.com/badge?repo=github.com/oam-dev/kubevela)](https://www.tickgit.com/browse?repo=github.com/oam-dev/kubevela)
+[![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Foam_dev)](https://twitter.com/oam_dev)
+
+![alt](docs/resources/KubeVela-03.png)
+
+*Make shipping applications more enjoyable.*
+
 # KubeVela
 
-The Open Application Platform based on Kubernetes and Open Application Model (OAM).
+For developers, KubeVela is an easy-to-use tool that enables them to describe and ship their applications to Kubernetes with minimal effort.
 
-## Project Status
+For platform builders, KubeVela serves as a framework that empowers them to create developer facing yet highly extensible platforms at ease.
 
-:rotating_light: **Warning: this project is still a work in progress with lots of rough edges, please don't look inside unless you know what you are doing.**
+- Slack: [Discuss](https://cloud-native.slack.com/archives/C01BLQ3HTJA)
+- Gitter: [Community](https://gitter.im/oam-dev/community)
 
-KubeVela project is initialized and maintained by the cloud native community since day 0 with [bootstrapping contributors from 8+ different organizations](https://github.com/oam-dev/kubevela/graphs/contributors). We intend for KubeVela to have a open governance since the very beginning and donate the project to neutral foundation as soon as it's released. 
+> NOTE: KubeVela is still in early stage and iterating quickly. It's currently under preview release.
 
-## Purpose and Goal
+## Quick Start
 
-- For developers and operators
-  - KubeVela, as an out-of-box Cloud Native Application Management Platform, provides numerous workloads and operation tooling for application defining, deployment, scaling, traffic, rollout, routing, monitoring, logging, alerting, CI/CD and so on.
-- For platform builders
-  - KubeVela, as a highly extensible PaaS/Serverless Core, provides pluggable capabilities, an elegant way to integrate any workloads and operational capabilities (i.e. traits).
+Quick start guides are available on [this section](https://kubevela.io/#/en/quick-start).
 
-## Design and Architecture
+## Documentation
 
-Read more about [KubeVela's high level design and architecture](DESIGN.md).
-
-## Demo Instructions
-
-See the demo instructions below get a sense of what we've accomplished and are working on.
-
-## Install
-
-### Prerequisites
-- Kubernetes cluster running Kubernetes v1.15.0 or greater
-- kubectl current context is configured for the target cluster install
-  - ```kubectl config current-context```
-
-### Get the Vela CLI
-
-Download the `vela` binary from the [releases page](https://github.com/oam-dev/kubevela/releases). Unpack the `vela` binary and add it to `$PATH` to get started.
-
-```shell
-sudo mv ./vela /usr/local/bin/vela
-```
-
-### Install Vela Core
-
-```console
-$ vela install
-```
-This command will install vela core controller into your K8s cluster, along with built-in workloads and traits.
-
-## Using KubeVela
-
-After `vela install` you will see available workloads and traits.
-
-```console
-$ vela workloads
-NAME         	DEFINITION
-backend      	podspecworkloads.standard.oam.dev
-task         	jobs.batch.k8s.io
-webservice   	podspecworkloads.standard.oam.dev
-```
-
-```console
-$ vela traits
-NAME        	DEFINITION                        	APPLIES TO
-route       	routes.standard.oam.dev           	webservice,backend            	                                  
-scale       	manualscalertraits.core.oam.dev   	webservice,backend
-```
-
-### Create environment
-
-Before working with your application, you should prepare an deploy environment for it (e.g. test, staging, prod etc).
-
-```console
-$ vela env init demo --namespace demo --email my@email.com --domain kubevela.io
-ENVIROMENT demo CREATED, Namespace: demo, Email: my@email.com.
-```
-
-Vela will create a Kubernetes namespace called `demo` , with namespace level issuer for certificate generation using the email you provided.
-
-You could check the environment metadata in your local:
-
-```console
-$ cat ~/.vela/envs/demo/config.json
-  {"name":"demo","namespace":"demo","email":"my@email.com","domain":"kubevela.io","issuer":"oam-env-demo"}
-```
-
-
-### Create simple component 
-
-Then let's create application, we will use the `demo` environment.
-
-```console
-$ vela comp deploy mycomp -t webservice --image crccheck/hello-world --port 8000 --app myapp
-Creating AppConfig appcomp
-SUCCEED
-```
-
-### Create micro-services application
-
-Vela supports micro-services application by default thanks to Open Application Model.
-
-```console
-$ vela comp deploy db -t backend --image crccheck/hello-world --app myapp
-Creating App myapp
-SUCCEED
-```
-
-```console
-$ vela comp ls
-NAME  	APP  	WORKLOAD  	TRAITS	STATUS 	  CREATED-TIME
-db    	myapp	backend   	      	Deployed	2020-09-18 22:42:04 +0800 CST
-mycomp	myapp	webservice	      	Deployed	2020-09-18 22:42:04 +0800 CST
-```
-
-#### Under the hood
-
-In Kubernetes, vela creates an OAM application configuration named `myapp` to manage all related components.
-
-```console
-$ kubectl get appconfig -n demo
-  NAME    AGE
-  myapp   24s
-```
-
-```console
-$ kubectl get components -n demo
-  NAME     AGE
-  mycomp   24s
-  db       10s
-```
-
-Vela Core is responsible for managing the underlying Kubernetes resources linked with the components and application configuration above.
-
-```console
-$ kubectl get deployment -n demo
-  NAME     READY   UP-TO-DATE   AVAILABLE   AGE
-  mycomp   1/1     1            1           38s
-  db       1/1     1            1           20s
-``` 
-
-```console
-$ kubectl get svc -n demo
- NAME     TYPE        CLUSTER-IP     EXTERNAL-IP   PORT(S)    AGE
- mycomp   ClusterIP   172.21.4.228   <none>        8080/TCP   49s
-```
-
-### Manage operational configurations of the application
-
-Vela leverages OAM trait system to manage operational configurations such as `scale`, `route`, `canary`, `autocale`etc in application centric approach.
-
-Let's take `route` as example.
-
-### `route`
-
-If you want to use `route`, please make sure you have [nginx-ingress controller[https://kubernetes.github.io/ingress-nginx/deploy/] in your cluster.
-
-```console
-$ vela route mycomp --app myapp
- Adding route for app mycomp
- Succeeded!
-```
-
-For now you have to check the public address manually (this will be fixed soon so `vela route` will return visiting URL as result):
-
-```console
-$ kubectl get ingress -n demo
-NAME                        HOSTS                ADDRESS         PORTS     AGE
-mycomp-trait-5b576c4fc      mycomp.kubevela.io   123.57.10.233   80, 443   73s
-```
-
-And after you configure the `kubevela.io` domain pointing to the public address above.
-
-Your application will be reached by `https://mycomp.kubevela.io` with `mTLS` automatically enabled.
-
-### Under the hood
-
-Vela will manage the underlying Kubernetes resource which implements the `route` trait.
-
-```console
-$ kubectl get routes.standard.oam.dev -n demo
-NAME                     AGE
-mycomp-trait-5b576c4fc   18s
-```
-
-`routes.standard.oam.dev` is a CRD controller which will manage ingress, domain, certificate etc for your application.
-
-### Check status
-
-
-Check the application:
-
-```console
-$ vela app show myapp
-  About:
-  
-    Name:      	myapp
-    Created at:	2020-09-18 22:42:04.191171 +0800 CST
-    Updated at:	2020-09-18 22:51:11.128997 +0800 CST
-  
-  
-  Environment:
-  
-    Namespace:	demo
-  
-  Components:
-  
-    Name  	Type      	Traits
-    db    	backend
-    mycomp	webservice	route
-```
-
-Check specific component:
-
-```console
-$ vela comp show mycomp
- About:
- 
-   Name:        	mycomp
-   WorkloadType:	webservice
-   Application: 	myapp
- 
- Environment:
- 
-   Namespace:	demo
- 
- Arguments:
- 
-   image:	crccheck/hello-world
-   name: 	mycomp
-   port: 	8000
- 
- 
- Traits:
- 
-   route:
-     domain:	mycomp.kubevela.io
-     issuer:	oam-env-demo
-     name:  	route
-```
-
-```
-$ vela comp status mycomp
-  Showing status of Component mycomp deployed in Environment demo
-  Component Status:
-  	Name: mycomp  PodSpecWorkload(type) UNKNOWN APIVersion standard.oam.dev/v1alpha1 Kind PodSpecWorkload workload is unknown for HealthScope
-  	Traits
-  	    └─Trait/route
-  
-  Last Deployment:
-  	Created at: 2020-09-18 22:42:04 +0800 CST
-  	Updated at: 2020-09-18T22:51:11+08:00
-```
-
-### Delete application or component
-
-```console
-$ vela app ls
-myapp
-```
-
-```console
-$ vela comp ls
-NAME  	APP  	WORKLOAD  	TRAITS	STATUS 	CREATED-TIME
-db    	myapp	backend   	      	Deployed	2020-09-18 22:42:04 +0800 CST
-mycomp	myapp	webservice	route 	Deployed	2020-09-18 22:42:04 +0800 CST
-```
-
-```console
-$ vela comp delete db
-Deleting Component 'db' from Application 'db'
-```
-
-```console
-$ vela comp ls
-NAME  	APP  	WORKLOAD  	TRAITS	STATUS 	CREATED-TIME
-mycomp	myapp	webservice	route 	Deployed	2020-09-18 22:42:04 +0800 CST
-```
-
-```console
-$ vela app delete myapp
-Deleting Application "myapp"
-delete apps succeed myapp from demo
-```
-
-## Dashboard
-
-Vela has a simple client side dashboard for you to interact with (note it's still under development). The functionality is equivalent to the vela cli.
-
-```console
-$ vela dashboard
-```
-
-#### Auto-completion
-
-##### bash
-
-```console
-To load completions in your current shell session:
-$ source <(vela completion bash)
-
-To load completions for every new session, execute once:
-Linux:
-  $ vela completion bash > /etc/bash_completion.d/vela
-MacOS:
-  $ vela completion bash > /usr/local/etc/bash_completion.d/vela
-```
-
-##### zsh
-
-```console
-To load completions in your current shell session:
-$ source <(vela completion zsh)
-
-To load completions for every new session, execute once:
-$ vela completion zsh > "${fpath[1]}/_vela"
-```
-
-### Clean your environment
-
-```console
-$ helm uninstall kubevela -n vela-system
-release "kubevela" uninstalled
-```
-
-```console
-$ kubectl delete crd workloaddefinitions.core.oam.dev traitdefinitions.core.oam.dev  scopedefinitions.core.oam.dev
-customresourcedefinition.apiextensions.k8s.io "workloaddefinitions.core.oam.dev" deleted
-customresourcedefinition.apiextensions.k8s.io "traitdefinitions.core.oam.dev" deleted
-```
-
-```console
-$ rm -r ~/.vela
-```
+For full documentation, please visit the KubeVela website: [https://kubevela.io](https://kubevela.io/).
 
 ## Contributing
-Check out [CONTRIBUTING.md](./CONTRIBUTING.md) to see how to develop with KubeVela.
+Check out [CONTRIBUTING](./CONTRIBUTING.md) to see how to develop with KubeVela.
 
 ## Code of Conduct
-This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) for further details.
-
+This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See [CODE OF CONDUCT](CODE_OF_CONDUCT.md) for details.

api/api.go

@@ -0,0 +1,2 @@
+// package api contains all api types of KubeVela
+package api

api/core.oam.dev/v1alpha2/appdeploy_types.go

@@ -34,10 +34,10 @@ type ApplicationDeploymentStatus struct {
 	runtimev1alpha1.ConditionedStatus `json:",inline"`
 }
 
+// ApplicationDeployment is the Schema for the ApplicationDeployment API
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
-// ApplicationDeployment is the Schema for the ApplicationDeployment API
 type ApplicationDeployment struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -46,8 +46,8 @@ type ApplicationDeployment struct {
 	Status ApplicationDeploymentStatus `json:"status,omitempty"`
 }
 
-// +kubebuilder:object:root=true
 // ApplicationDeploymentList contains a list of ApplicationDeployment
+// +kubebuilder:object:root=true
 type ApplicationDeploymentList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

api/generate.go

@@ -0,0 +1,8 @@
+// +build generate
+
+// See the below link for details on what is happening here.
+// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
+
+//go:generate go run ../hack/crd/update.go ../charts/vela-core/crds/
+
+package api

api/types/args.go

@@ -5,6 +5,7 @@ import (
 	"k8s.io/client-go/rest"
 )
 
+// Args is args for controller-runtime client
 type Args struct {
 	Config *rest.Config
 	Schema *runtime.Scheme

api/types/capability.go

@@ -21,16 +21,19 @@ import (
 	"fmt"
 
 	"cuelang.org/go/cue"
+	"github.com/google/go-cmp/cmp"
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
+// Source record the source of Capability
 type Source struct {
 	RepoName  string `json:"repoName"`
 	ChartName string `json:"chartName,omitempty"`
 }
 
-type CrdInfo struct {
+// CRDInfo record the CRD info of the Capability
+type CRDInfo struct {
 	APIVersion string `json:"apiVersion"`
 	Kind       string `json:"kind"`
 }
@@ -54,29 +57,38 @@ type Capability struct {
 	// Plugin Source
 	Source  *Source       `json:"source,omitempty"`
 	Install *Installation `json:"install,omitempty"`
-	CrdInfo *CrdInfo      `json:"crdInfo,omitempty"`
+	CrdInfo *CRDInfo      `json:"crdInfo,omitempty"`
 }
 
+// Chart defines all necessary information to install a whole chart
 type Chart struct {
-	Repo      string `json:"repo"`
-	URL       string `json:"url"`
-	Name      string `json:"name"`
-	Namespace string `json:"namespace,omitempty"`
-	Version   string `json:"version"`
+	Repo      string                 `json:"repo"`
+	URL       string                 `json:"url"`
+	Name      string                 `json:"name"`
+	Namespace string                 `json:"namespace,omitempty"`
+	Version   string                 `json:"version"`
+	Values    map[string]interface{} `json:"values"`
 }
 
+// Installation defines the installation method for this Capability, currently only helm is supported
 type Installation struct {
 	Helm Chart `json:"helm"`
+	//TODO(wonderflow) add raw yaml file support for install capability
 }
 
+// CapType defines the type of capability
 type CapType string
 
 const (
+	// TypeWorkload represents OAM Workload
 	TypeWorkload CapType = "workload"
-	TypeTrait    CapType = "trait"
-	TypeScope    CapType = "scope"
+	// TypeTrait represents OAM Trait
+	TypeTrait CapType = "trait"
+	// TypeScope represent OAM Scope
+	TypeScope CapType = "scope"
 )
 
+// Parameter defines a parameter for cli from capability template
 type Parameter struct {
 	Name     string      `json:"name"`
 	Short    string      `json:"short,omitempty"`
@@ -84,17 +96,15 @@ type Parameter struct {
 	Default  interface{} `json:"default,omitempty"`
 	Usage    string      `json:"usage,omitempty"`
 	Type     cue.Kind    `json:"type,omitempty"`
+	Alias    string      `json:"alias,omitempty"`
 }
 
 // ConvertTemplateJSON2Object convert spec.extension to object
 func ConvertTemplateJSON2Object(in *runtime.RawExtension) (Capability, error) {
 	var t Capability
 	var extension Capability
-	if in == nil {
-		return t, fmt.Errorf("extension field is nil")
-	}
-	if in.Raw == nil {
-		return t, fmt.Errorf("template object is nil")
+	if in == nil || in.Raw == nil {
+		return t, fmt.Errorf("no template found")
 	}
 	err := json.Unmarshal(in.Raw, &extension)
 	if err == nil {
@@ -103,7 +113,12 @@ func ConvertTemplateJSON2Object(in *runtime.RawExtension) (Capability, error) {
 	return t, err
 }
 
+// SetFlagBy set cli flag from Parameter
 func SetFlagBy(flags *pflag.FlagSet, v Parameter) {
+	name := v.Name
+	if v.Alias != "" {
+		name = v.Alias
+	}
 	switch v.Type {
 	case cue.IntKind:
 		var vv int64
@@ -117,11 +132,11 @@ func SetFlagBy(flags *pflag.FlagSet, v Parameter) {
 		case float64:
 			vv = int64(val)
 		}
-		flags.Int64P(v.Name, v.Short, vv, v.Usage)
+		flags.Int64P(name, v.Short, vv, v.Usage)
 	case cue.StringKind:
-		flags.StringP(v.Name, v.Short, v.Default.(string), v.Usage)
+		flags.StringP(name, v.Short, v.Default.(string), v.Usage)
 	case cue.BoolKind:
-		flags.BoolP(v.Name, v.Short, v.Default.(bool), v.Usage)
+		flags.BoolP(name, v.Short, v.Default.(bool), v.Usage)
 	case cue.NumberKind, cue.FloatKind:
 		var vv float64
 		switch val := v.Default.(type) {
@@ -134,6 +149,73 @@ func SetFlagBy(flags *pflag.FlagSet, v Parameter) {
 		case float64:
 			vv = val
 		}
-		flags.Float64P(v.Name, v.Short, vv, v.Usage)
+		flags.Float64P(name, v.Short, vv, v.Usage)
 	}
 }
+
+// CapabilityCmpOptions will set compare option
+var CapabilityCmpOptions = []cmp.Option{
+	cmp.Comparer(func(a, b Parameter) bool {
+		if a.Name != b.Name || a.Short != b.Short || a.Required != b.Required ||
+			a.Usage != b.Usage || a.Type != b.Type {
+			return false
+		}
+		switch a.Type {
+		case cue.IntKind:
+			var va, vb int64
+			switch vala := a.Default.(type) {
+			case int64:
+				va = vala
+			case json.Number:
+				va, _ = vala.Int64()
+			case int:
+				va = int64(vala)
+			case float64:
+				va = int64(vala)
+			}
+			switch valb := b.Default.(type) {
+			case int64:
+				vb = valb
+			case json.Number:
+				vb, _ = valb.Int64()
+			case int:
+				vb = int64(valb)
+			case float64:
+				vb = int64(valb)
+			}
+			return va == vb
+		case cue.StringKind:
+			return a.Default.(string) == b.Default.(string)
+		case cue.BoolKind:
+			return a.Default.(bool) == b.Default.(bool)
+		case cue.NumberKind, cue.FloatKind:
+			var va, vb float64
+			switch vala := a.Default.(type) {
+			case int64:
+				va = float64(vala)
+			case json.Number:
+				va, _ = vala.Float64()
+			case int:
+				va = float64(vala)
+			case float64:
+				va = vala
+			}
+			switch valb := b.Default.(type) {
+			case int64:
+				vb = float64(valb)
+			case json.Number:
+				vb, _ = valb.Float64()
+			case int:
+				vb = float64(valb)
+			case float64:
+				vb = valb
+			}
+			return va == vb
+		}
+		return true
+	})}
+
+// EqualCapability will check whether two capabilities is equal
+func EqualCapability(a, b Capability) bool {
+	return cmp.Equal(a, b, CapabilityCmpOptions...)
+}

api/types/types.go

@@ -1,28 +1,33 @@
 package types
 
 const (
-	DefaultOAMNS               = "vela-system"
-	DefaultOAMReleaseName      = "kubevela"
-	DefaultOAMRuntimeChartName = "vela-core"
-	DefaultOAMVersion          = ">0.0.0-0"
-
-	DefaultEnvName      = "default"
+	// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
+	DefaultKubeVelaNS = "vela-system"
+	// DefaultKubeVelaReleaseName defines the default name of KubeVela Release
+	DefaultKubeVelaReleaseName = "kubevela"
+	// DefaultKubeVelaChartName defines the default chart name of KubeVela, this variable MUST align to the chart name of this repo
+	DefaultKubeVelaChartName = "vela-core"
+	// DefaultKubeVelaVersion defines the default version needed for KubeVela chart
+	DefaultKubeVelaVersion = ">0.0.0-0"
+	// DefaultEnvName defines the default environment name for Apps created by KubeVela
+	DefaultEnvName = "default"
+	// DefaultAppNamespace defines the default K8s namespace for Apps created by KubeVela
 	DefaultAppNamespace = "default"
 )
 
 const (
-	AnnAPIVersion  = "definition.oam.dev/apiVersion"
-	AnnKind        = "definition.oam.dev/kind"
+	// AnnDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
 	AnnDescription = "definition.oam.dev/description"
-
-	LabelPodSpecable = "workload.oam.dev/podspecable"
 )
 
 const (
+	// StatusDeployed represents the App was deployed
 	StatusDeployed = "Deployed"
-	StatusStaging  = "Staging"
+	// StatusStaging represents the App was changed locally and it's spec is diff from the deployed one, or not deployed at all
+	StatusStaging = "Staging"
 )
 
+// EnvMeta stores the info for app environment
 type EnvMeta struct {
 	Name      string `json:"name"`
 	Namespace string `json:"namespace"`
@@ -35,12 +40,14 @@ type EnvMeta struct {
 }
 
 const (
+	// TagCommandType used for tag cli category
 	TagCommandType = "commandType"
-
-	TypeStart   = "Getting Started"
-	TypeApp     = "Applications"
-	TypeTraits  = "Traits"
-	TypeRelease = "Release"
-	TypeOthers  = "Others"
-	TypeSystem  = "System"
+	// TypeStart defines one category
+	TypeStart = "Getting Started"
+	// TypeApp defines one category
+	TypeApp = "Managing Applications"
+	// TypeCap defines one category
+	TypeCap = "Managing Capabilities"
+	// TypeSystem defines one category
+	TypeSystem = "System"
 )

api/v1alpha1/autoscaler_types.go

@@ -0,0 +1,122 @@
+/*
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// Protocol defines network protocols supported for things like container ports.
+type Protocol string
+
+// TriggerType defines the type of trigger
+type TriggerType string
+
+// Autoscaler is the Schema for the autoscalers API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam}
+type Autoscaler struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AutoscalerSpec   `json:"spec"`
+	Status AutoscalerStatus `json:"status,omitempty"`
+}
+
+// SetConditions set condition for CR status
+func (as *Autoscaler) SetConditions(c ...v1alpha1.Condition) {
+	as.Status.SetConditions(c...)
+}
+
+// GetCondition get condition from CR status
+func (as *Autoscaler) GetCondition(conditionType v1alpha1.ConditionType) v1alpha1.Condition {
+	return as.Status.GetCondition(conditionType)
+}
+
+// GetWorkloadReference get workload reference
+func (as *Autoscaler) GetWorkloadReference() v1alpha1.TypedReference {
+	return as.Spec.WorkloadReference
+}
+
+// SetWorkloadReference set workload reference
+func (as *Autoscaler) SetWorkloadReference(reference v1alpha1.TypedReference) {
+	as.Spec.WorkloadReference = reference
+}
+
+// Trigger defines the trigger of Autoscaler
+type Trigger struct {
+	// Name is the trigger name, if not set, it will be automatically generated and make it globally unique
+	Name string `json:"name,omitempty"`
+
+	// Type allows value in [cpu/memory/storage/ephemeral-storage、cron、pps、qps/rps、custom]
+	Type TriggerType `json:"type"`
+
+	// Condition set the condition when to trigger scaling
+	Condition map[string]string `json:"condition"`
+}
+
+// AutoscalerSpec defines the desired state of Autoscaler
+type AutoscalerSpec struct {
+	// MinReplicas is the minimal replicas
+	// +optional
+	MinReplicas *int32 `json:"minReplicas,omitempty"`
+
+	// MinReplicas is the maximal replicas
+	// +optional
+	MaxReplicas *int32 `json:"maxReplicas,omitempty"`
+
+	// Triggers lists all triggers
+	Triggers []Trigger `json:"triggers"`
+
+	// TargetWorkload specify the workload which is going to be scaled,
+	// it could be WorkloadReference or the child resource of it
+	TargetWorkload TargetWorkload `json:"targetWorkload,omitempty"`
+
+	// WorkloadReference marks the owner of the workload
+	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
+}
+
+// TargetWorkload holds the a reference to the scale target Object
+type TargetWorkload struct {
+	Name string `json:"name"`
+	// +optional
+	APIVersion string `json:"apiVersion,omitempty"`
+	// +optional
+	Kind string `json:"kind,omitempty"`
+}
+
+// AutoscalerStatus defines the observed state of Autoscaler
+type AutoscalerStatus struct {
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+}
+
+// +kubebuilder:object:root=true
+
+// AutoscalerList contains a list of Autoscaler
+type AutoscalerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Autoscaler `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Autoscaler{}, &AutoscalerList{})
+}

api/v1alpha1/metricstrait_types.go

@@ -39,12 +39,11 @@ type ScapeServiceEndPoint struct {
 	// The default and only supported format is "prometheus" for now
 	Format string `json:"format,omitempty"`
 	// Number or name of the port to access on the pods targeted by the service.
-	// When this field has value implies that we need to create a service for the workload
-	// Mutually exclusive with port.
+	// The default is discovered automatically from podTemplate, metricTrait will create a service for the workload
 	TargetPort intstr.IntOrString `json:"port,omitempty"`
 	// Route service traffic to pods with label keys and values matching this
-	// The default is the labels in the workload
-	// Mutually exclusive with port.
+	// The default is discovered automatically from podTemplate.
+	// If no podTemplate, use the labels specified here, or use the labels of the workload
 	TargetSelector map[string]string `json:"selector,omitempty"`
 	// HTTP path to scrape for metrics.
 	// default is /metrics
@@ -63,8 +62,13 @@ type ScapeServiceEndPoint struct {
 type MetricsTraitStatus struct {
 	runtimev1alpha1.ConditionedStatus `json:",inline"`
 
-	// ServiceMonitorNames managed by this trait
-	ServiceMonitorNames []string `json:"serviceMonitorName,omitempty"`
+	// ServiceMonitorName managed by this trait
+	ServiceMonitorName string `json:"serviceMonitorName,omitempty"`
+
+	// Port is the real port monitoring
+	Port intstr.IntOrString `json:"port,omitempty"`
+	// SelectorLabels is the real labels selected
+	SelectorLabels map[string]string `json:"selectorLabels,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -95,20 +99,22 @@ func init() {
 
 var _ oam.Trait = &MetricsTrait{}
 
+// SetConditions for set CR condition
 func (tr *MetricsTrait) SetConditions(c ...runtimev1alpha1.Condition) {
 	tr.Status.SetConditions(c...)
 }
 
+// GetCondition for get CR condition
 func (tr *MetricsTrait) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return tr.Status.GetCondition(c)
 }
 
-// GetWorkloadReference of this ManualScalerTrait.
+// GetWorkloadReference of this MetricsTrait.
 func (tr *MetricsTrait) GetWorkloadReference() runtimev1alpha1.TypedReference {
 	return tr.Spec.WorkloadReference
 }
 
-// SetWorkloadReference of this ManualScalerTrait.
+// SetWorkloadReference of this MetricsTrait.
 func (tr *MetricsTrait) SetWorkloadReference(r runtimev1alpha1.TypedReference) {
 	tr.Spec.WorkloadReference = r
 }

api/v1alpha1/podspecworkload_types.go

@@ -28,7 +28,7 @@ type PodSpecWorkloadSpec struct {
 	// Replicas is the desired number of replicas of the given podSpec.
 	// These are replicas in the sense that they are instantiations of the same podSpec.
 	// If unspecified, defaults to 1.
-	Replicas *int32 `json:"replicas"`
+	Replicas *int32 `json:"replicas,omitempty"`
 
 	// PodSpec describes the pods that will be created,
 	// we omit the meta part as it will be exactly the same as the PodSpecWorkload
@@ -46,6 +46,8 @@ type PodSpecWorkloadStatus struct {
 // +kubebuilder:object:root=true
 
 // PodSpecWorkload is the Schema for the PodSpec API
+// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
+// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
 // +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
 type PodSpecWorkload struct {
@@ -71,10 +73,12 @@ func init() {
 
 var _ oam.Workload = &PodSpecWorkload{}
 
+// SetConditions set condition for this CR
 func (in *PodSpecWorkload) SetConditions(c ...cpv1alpha1.Condition) {
 	in.Status.SetConditions(c...)
 }
 
+// GetCondition set condition for this CR
 func (in *PodSpecWorkload) GetCondition(c cpv1alpha1.ConditionType) cpv1alpha1.Condition {
 	return in.Status.GetCondition(c)
 }

api/v1alpha1/route_types.go

@@ -66,6 +66,7 @@ type Rule struct {
 	Backend *Backend `json:"backend,omitempty"`
 }
 
+// TLS defines certificate issuer and type for mTLS configuration
 type TLS struct {
 	IssuerName string `json:"issuerName,omitempty"`
 
@@ -74,13 +75,17 @@ type TLS struct {
 	Type IssuerType `json:"type,omitempty"`
 }
 
+// IssuerType defines the type of issuer
 type IssuerType string
 
 const (
-	ClusterIssuer   IssuerType = "ClusterIssuer"
+	// ClusterIssuer is a cluster level type of issuer
+	ClusterIssuer IssuerType = "ClusterIssuer"
+	// NamespaceIssuer is the default one
 	NamespaceIssuer IssuerType = "Issuer"
 )
 
+// Backend defines backend configure for route trait.
 // Route will automatically discover podSpec and label for BackendService.
 // If BackendService is already set, discovery won't work.
 // If BackendService is not set, the discovery mechanism will work.
@@ -105,13 +110,14 @@ type BackendServiceRef struct {
 type RouteStatus struct {
 	Ingresses                         []runtimev1alpha1.TypedReference `json:"ingresses,omitempty"`
 	Service                           *runtimev1alpha1.TypedReference  `json:"service,omitempty"`
+	Status                            string                           `json:"status,omitempty"`
 	runtimev1alpha1.ConditionedStatus `json:",inline"`
 }
 
+// Route is the Schema for the routes API
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories={oam}
 // +kubebuilder:subresource:status
-// Route is the Schema for the routes API
 type Route struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -120,8 +126,8 @@ type Route struct {
 	Status RouteStatus `json:"status,omitempty"`
 }
 
-// +kubebuilder:object:root=true
 // RouteList contains a list of Route
+// +kubebuilder:object:root=true
 type RouteList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
@@ -134,20 +140,22 @@ func init() {
 
 var _ oam.Trait = &Route{}
 
+// SetConditions set condition for CR status
 func (r *Route) SetConditions(c ...runtimev1alpha1.Condition) {
 	r.Status.SetConditions(c...)
 }
 
+// GetCondition get condition from CR status
 func (r *Route) GetCondition(c runtimev1alpha1.ConditionType) runtimev1alpha1.Condition {
 	return r.Status.GetCondition(c)
 }
 
-// GetWorkloadReference of this ManualScalerTrait.
+// GetWorkloadReference of this Route Trait.
 func (r *Route) GetWorkloadReference() runtimev1alpha1.TypedReference {
 	return r.Spec.WorkloadReference
 }
 
-// SetWorkloadReference of this ManualScalerTrait.
+// SetWorkloadReference of this Route Trait.
 func (r *Route) SetWorkloadReference(rt runtimev1alpha1.TypedReference) {
 	r.Spec.WorkloadReference = rt
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -25,6 +25,115 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Autoscaler) DeepCopyInto(out *Autoscaler) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Autoscaler.
+func (in *Autoscaler) DeepCopy() *Autoscaler {
+	if in == nil {
+		return nil
+	}
+	out := new(Autoscaler)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Autoscaler) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AutoscalerList) DeepCopyInto(out *AutoscalerList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Autoscaler, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerList.
+func (in *AutoscalerList) DeepCopy() *AutoscalerList {
+	if in == nil {
+		return nil
+	}
+	out := new(AutoscalerList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AutoscalerList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AutoscalerSpec) DeepCopyInto(out *AutoscalerSpec) {
+	*out = *in
+	if in.MinReplicas != nil {
+		in, out := &in.MinReplicas, &out.MinReplicas
+		*out = new(int32)
+		**out = **in
+	}
+	if in.MaxReplicas != nil {
+		in, out := &in.MaxReplicas, &out.MaxReplicas
+		*out = new(int32)
+		**out = **in
+	}
+	if in.Triggers != nil {
+		in, out := &in.Triggers, &out.Triggers
+		*out = make([]Trigger, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	out.TargetWorkload = in.TargetWorkload
+	out.WorkloadReference = in.WorkloadReference
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerSpec.
+func (in *AutoscalerSpec) DeepCopy() *AutoscalerSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(AutoscalerSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AutoscalerStatus) DeepCopyInto(out *AutoscalerStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalerStatus.
+func (in *AutoscalerStatus) DeepCopy() *AutoscalerStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(AutoscalerStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Backend) DeepCopyInto(out *Backend) {
 	*out = *in
@@ -141,10 +250,13 @@ func (in *MetricsTraitSpec) DeepCopy() *MetricsTraitSpec {
 func (in *MetricsTraitStatus) DeepCopyInto(out *MetricsTraitStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.ServiceMonitorNames != nil {
-		in, out := &in.ServiceMonitorNames, &out.ServiceMonitorNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
+	out.Port = in.Port
+	if in.SelectorLabels != nil {
+		in, out := &in.SelectorLabels, &out.SelectorLabels
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
 	}
 }
 
@@ -446,3 +558,40 @@ func (in *TLS) DeepCopy() *TLS {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TargetWorkload) DeepCopyInto(out *TargetWorkload) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TargetWorkload.
+func (in *TargetWorkload) DeepCopy() *TargetWorkload {
+	if in == nil {
+		return nil
+	}
+	out := new(TargetWorkload)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Trigger) DeepCopyInto(out *Trigger) {
+	*out = *in
+	if in.Condition != nil {
+		in, out := &in.Condition, &out.Condition
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Trigger.
+func (in *Trigger) DeepCopy() *Trigger {
+	if in == nil {
+		return nil
+	}
+	out := new(Trigger)
+	in.DeepCopyInto(out)
+	return out
+}

charts/vela-core/crds/cert-manager.yaml

@@ -1,16 +1,3 @@
-# Copyright YEAR The Jetstack cert-manager contributors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -25238,5 +25225,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
-
+  storedVersions: []

charts/vela-core/crds/standard.oam.dev_autoscalers.yaml

@@ -0,0 +1,155 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.5
+  creationTimestamp: null
+  name: autoscalers.standard.oam.dev
+spec:
+  group: standard.oam.dev
+  names:
+    categories:
+    - oam
+    kind: Autoscaler
+    listKind: AutoscalerList
+    plural: autoscalers
+    singular: autoscaler
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Autoscaler is the Schema for the autoscalers API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AutoscalerSpec defines the desired state of Autoscaler
+            properties:
+              maxReplicas:
+                description: MinReplicas is the maximal replicas
+                format: int32
+                type: integer
+              minReplicas:
+                description: MinReplicas is the minimal replicas
+                format: int32
+                type: integer
+              targetWorkload:
+                description: TargetWorkload specify the workload which is going to
+                  be scaled, it could be WorkloadReference or the child resource of
+                  it
+                properties:
+                  apiVersion:
+                    type: string
+                  kind:
+                    type: string
+                  name:
+                    type: string
+                required:
+                - name
+                type: object
+              triggers:
+                description: Triggers lists all triggers
+                items:
+                  description: Trigger defines the trigger of Autoscaler
+                  properties:
+                    condition:
+                      additionalProperties:
+                        type: string
+                      description: Condition set the condition when to trigger scaling
+                      type: object
+                    name:
+                      description: Name is the trigger name, if not set, it will be
+                        automatically generated and make it globally unique
+                      type: string
+                    type:
+                      description: Type allows value in [cpu/memory/storage/ephemeral-storage、cron、pps、qps/rps、custom]
+                      type: string
+                  required:
+                  - condition
+                  - type
+                  type: object
+                type: array
+              workloadRef:
+                description: WorkloadReference marks the owner of the workload
+                properties:
+                  apiVersion:
+                    description: APIVersion of the referenced object.
+                    type: string
+                  kind:
+                    description: Kind of the referenced object.
+                    type: string
+                  name:
+                    description: Name of the referenced object.
+                    type: string
+                  uid:
+                    description: UID of the referenced object.
+                    type: string
+                required:
+                - apiVersion
+                - kind
+                - name
+                type: object
+            required:
+            - triggers
+            type: object
+          status:
+            description: AutoscalerStatus defines the observed state of Autoscaler
+            properties:
+              conditions:
+                description: Conditions of the resource.
+                items:
+                  description: A Condition that may apply to a resource.
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the last time this condition
+                        transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A Message containing details about this condition's
+                        last transition from one status to another, if any.
+                      type: string
+                    reason:
+                      description: A Reason for this condition's last transition from
+                        one status to another.
+                      type: string
+                    status:
+                      description: Status of this condition; is it currently True,
+                        False, or Unknown?
+                      type: string
+                    type:
+                      description: Type of this condition. At most one of each condition
+                        type may apply to a resource at any point in time.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/vela-core/crds/standard.oam.dev_metricstraits.yaml

@@ -56,9 +56,9 @@ spec:
                     - type: integer
                     - type: string
                     description: Number or name of the port to access on the pods
-                      targeted by the service. When this field has value implies that
-                      we need to create a service for the workload Mutually exclusive
-                      with port.
+                      targeted by the service. The default is discovered automatically
+                      from podTemplate, metricTrait will create a service for the
+                      workload
                     x-kubernetes-int-or-string: true
                   scheme:
                     description: Scheme at which metrics should be scraped The default
@@ -68,8 +68,9 @@ spec:
                     additionalProperties:
                       type: string
                     description: Route service traffic to pods with label keys and
-                      values matching this The default is the labels in the workload
-                      Mutually exclusive with port.
+                      values matching this The default is discovered automatically
+                      from podTemplate. If no podTemplate, use the labels specified
+                      here, or use the labels of the workload
                     type: object
                 type: object
               workloadRef:
@@ -132,11 +133,20 @@ spec:
                   - type
                   type: object
                 type: array
-              serviceMonitorName:
-                description: ServiceMonitorNames managed by this trait
-                items:
+              port:
+                anyOf:
+                - type: integer
+                - type: string
+                description: Port is the real port monitoring
+                x-kubernetes-int-or-string: true
+              selectorLabels:
+                additionalProperties:
                   type: string
-                type: array
+                description: SelectorLabels is the real labels selected
+                type: object
+              serviceMonitorName:
+                description: ServiceMonitorName managed by this trait
+                type: string
             type: object
         required:
         - spec

charts/vela-core/crds/standard.oam.dev_podspecworkloads.yaml

@@ -1230,6 +1230,7 @@ spec:
                                   can be referred to by services.
                                 type: string
                               protocol:
+                                default: TCP
                                 description: Protocol for port. Must be UDP, TCP,
                                   or SCTP. Defaults to "TCP".
                                 type: string
@@ -2364,6 +2365,7 @@ spec:
                                   can be referred to by services.
                                 type: string
                               protocol:
+                                default: TCP
                                 description: Protocol for port. Must be UDP, TCP,
                                   or SCTP. Defaults to "TCP".
                                 type: string
@@ -3503,6 +3505,7 @@ spec:
                                   can be referred to by services.
                                 type: string
                               protocol:
+                                default: TCP
                                 description: Protocol for port. Must be UDP, TCP,
                                   or SCTP. Defaults to "TCP".
                                 type: string
@@ -5691,7 +5694,6 @@ spec:
                 type: integer
             required:
             - podSpec
-            - replicas
             type: object
           status:
             description: PodSpecWorkloadStatus defines the observed state of PodSpecWorkload

charts/vela-core/crds/standard.oam.dev_routes.yaml

@@ -241,6 +241,8 @@ spec:
                 - kind
                 - name
                 type: object
+              status:
+                type: string
             type: object
         type: object
     served: true

charts/vela-core/templates/definitions/backend.yaml

@@ -1,39 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: backend
-  annotations:
-    definition.oam.dev/apiVersion: "standard.oam.dev/v1alpha1"
-    definition.oam.dev/kind: "PodSpecWorkload"
-    definition.oam.dev/description: "Backend worker without ports exposed"
-spec:
-  definitionRef:
-    name: podspecworkload.standard.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-  extension:
-    template: |
-      output: {
-        apiVersion: "standard.oam.dev/v1alpha1"
-        kind:       "PodSpecWorkload"
-        metadata:
-          name: parameter.name
-        spec: {
-          replicas: 1
-            podSpec: {
-              containers: [{
-                 image: parameter.image
-                   name:  parameter.name
-               }]
-            }
-        }
-      }
-      #backend: {
-        name: string
-          // +usage=specify app image
-          // +short=i
-        image: string
-      }
-      parameter: #backend
-

charts/vela-core/templates/definitions/healthscopes.yaml

@@ -2,9 +2,6 @@ apiVersion: core.oam.dev/v1alpha2
 kind: ScopeDefinition
 metadata:
   name: healthscopes.core.oam.dev
-  annotations:
-    definition.oam.dev/apiVersion: core.oam.dev/v1alpha2
-    definition.oam.dev/kind: HealthScope
   namespace: default
 spec:
   workloadRefsPath: spec.workloadRefs

charts/vela-core/templates/definitions/metricstraits.yaml

@@ -1,53 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    mornitoring: oam
-  name: monitoring
-
----
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: metric
-  namespace: default
-  annotations:
-    definition.oam.dev/apiVersion: standard.oam.dev/v1alpha1
-    definition.oam.dev/kind: MetricsTrait
-    definition.oam.dev/description: "Add metric monitoring for workload"
-spec:
-  appliesToWorkloads:
-    - webservice
-    - backend
-    - task
-    - containerizedworkloads.core.oam.dev
-    - clonesetworkloads.apps.kruise.io
-    - deployments.apps
-    - statefulsets.apps
-  definitionRef:
-    name: metricstraits.standard.oam.dev
-  workloadRefPath: spec.workloadRef
-  extension:
-    template: |-
-      #metrics: {
-        // +usage=format of the metrics, default as prometheus
-        // +short=f
-        format:  *"prometheus" | string
-        path:    *"/metrics" | string
-        scheme:  *"http" | string
-        enabled: *true | bool
-        port:    *8080 | >=1024 & uint16
-        // +usage= the label selector for the pods, default is the workload labels
-        selector?: [string]: string
-      }
-      spec: {
-        apiVersion: "standard.oam.dev/v1alpha1"
-          kind:       "MetricsTrait"
-          spec: {
-            scrapeService: parameter
-          }
-      }
-      parameter: #metrics
-      output: {}
-

charts/vela-core/templates/definitions/podspecworkload.yaml

@@ -1,48 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: podspecworkloads.standard.oam.dev
-  annotations:
-    definition.oam.dev/apiVersion: "standard.oam.dev/v1alpha1"
-    definition.oam.dev/kind: "PodSpecWorkload"
-spec:
-  definitionRef:
-    name: podspecworkloads.standard.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-    - apiVersion: v1
-      kind: Service
-  extension:
-    template: |
-      output: {
-      	apiVersion: "standard.oam.dev/v1alpha1"
-      	kind:       "PodSpecWorkload"
-      	metadata:
-      		name: parameter.name
-      	spec: {
-      		replicas: 1
-      		podSpec: {
-      			containers: [{
-      				image: parameter.image
-      				name:  parameter.name
-      				ports: [{
-      					containerPort: parameter.port
-      					protocol:      "TCP"
-      					name:          "default"
-      				}]
-      			}]
-      		}
-      	}
-      }
-      #webservice: {
-      	name: string
-      	// +usage=specify app image
-      	// +short=i
-      	image: string
-      	// +usage=specify port for container
-      	// +short=p
-      	port: *6379 | int
-      }
-      parameter: #webservice
-

charts/vela-core/templates/definitions/routetrait.yaml

@@ -1,35 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: route
-  annotations:
-    definition.oam.dev/apiVersion: standard.oam.dev/v1alpha1
-    definition.oam.dev/kind: Route
-    definition.oam.dev/description: "Add a route for workload"
-spec:
-  appliesToWorkloads:
-    - core.oam.dev/v1alpha2.ContainerizedWorkload
-    - standard.oam.dev/v1alpha1.PodSpecWorkload
-    - deployments.apps
-    - webservice
-  workloadRefPath: spec.workloadRef
-  definitionRef:
-    name: routes.standard.oam.dev
-  extension:
-    template: |
-      output: {
-        apiVersion: "standard.oam.dev/v1alpha1"
-        kind:       "Route"
-        spec: {
-          host: parameter.domain
-          tls: {
-            issuerName: parameter.issuer
-          }
-        }
-      }
-      #route: {
-        domain: *"" | string
-        issuer: *"" | string
-      }
-      parameter: #route
-

charts/vela-core/templates/definitions/tasks.yaml

@@ -1,49 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: task
-  annotations:
-    definition.oam.dev/apiVersion: "v1"
-    definition.oam.dev/kind: "Job"
-    definition.oam.dev/description: "One-time off task or job"
-spec:
-  definitionRef:
-    name: jobs
-  extension:
-    defaultTraits:
-    - monitor
-    - logging
-    template: |
-      output: {
-        apiVersion: "v1"
-        kind:       "Job"
-        metadata: name: parameter.name
-        spec: {
-          parallelism: parameter.count
-            completions: parameter.count
-            template:
-              spec:
-                containers: [{
-                   image: parameter.image
-                     name:  parameter.name
-                     ports: [{
-                       containerPort: parameter.port
-                         protocol:      "TCP"
-                         name:          "default"
-                     }]
-                 }]
-        }
-      }
-      #task: {
-        // +usage=specify number of tasks to run in parallel
-        // +short=c
-        count: *1 | int
-        name:  string
-          // +usage=specify app image
-          // +short=i
-        image: string
-          // +usage=specify port for container
-          // +short=p
-        port: *6379 | int
-      }
-      parameter: #task

charts/vela-core/templates/definitions/webservices.yaml

@@ -1,48 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: webservice
-  annotations:
-    definition.oam.dev/apiVersion: "standard.oam.dev/v1alpha1"
-    definition.oam.dev/kind: "PodSpecWorkload"
-    definition.oam.dev/description: "Long running service with ports exposed"
-spec:
-  definitionRef:
-    name: podspecworkloads.standard.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-    - apiVersion: v1
-      kind: Service
-  extension:
-    template: |
-      output: {
-        apiVersion: "standard.oam.dev/v1alpha1"
-        kind:       "PodSpecWorkload"
-        metadata:
-          name: parameter.name
-        spec: {
-          replicas: 1
-            podSpec: {
-              containers: [{
-                 image: parameter.image
-                 name:  parameter.name
-                 ports: [{
-                   containerPort: parameter.port
-                     protocol:      "TCP"
-                     name:          "default"
-                 }]
-               }]
-            }
-        }
-      }
-      #webservice: {
-        name: string
-          // +usage=specify app image
-          // +short=i
-        image: string
-          // +usage=specify port for container
-          // +short=p
-        port: *6379 | int
-      }
-      parameter: #webservice

charts/vela-core/templates/defwithtemplate/autoscale.yaml

@@ -0,0 +1,82 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: TraitDefinition
+metadata:
+  name: autoscale
+  annotations:
+    definition.oam.dev/description: "Automatically scale the app following certain triggers or metrics"
+spec:
+  appliesToWorkloads:
+    - webservice
+    - worker
+  workloadRefPath: spec.workloadRef
+  definitionRef:
+    name: autoscalers.standard.oam.dev
+  extension:
+    template: |
+      import "strconv"
+      
+      output: {
+      	apiVersion: "standard.oam.dev/v1alpha1"
+      	kind:       "Autoscaler"
+      	spec: {
+      		minReplicas: parameter.min
+      		maxReplicas: parameter.max
+      		if parameter["cpuPercent"] != _|_ && parameter["cron"] != _|_ {
+      			triggers: [cpuScaler, cronScaler]
+      		}
+      		if parameter["cpuPercent"] != _|_ && parameter["cron"] == _|_ {
+      			triggers: [cpuScaler]
+      		}
+      		if parameter["cpuPercent"] == _|_ && parameter["cron"] != _|_ {
+      			triggers: [cronScaler]
+      		}
+      	}
+      }
+      
+      cpuScaler: {
+      	type: "cpu"
+      	condition: {
+      		type: "Utilization"
+      		if parameter["cpuPercent"] != _|_ {
+      			// Temporarily use `strconv` for type converting. This bug will be fixed in kubevela#585
+      			value: strconv.FormatInt(parameter.cpuPercent, 10)
+      		}
+      	}
+      }
+      
+      cronScaler: {
+      	type: "cron"
+      	if parameter["cron"] != _|_ && parameter.cron["replicas"] != _|_ {
+      		condition: {
+      			startAt:  parameter.cron.startAt
+      			duration: parameter.cron.duration
+      			days:     parameter.cron.days
+      			replicas: strconv.FormatInt(parameter.cron.replicas, 10)
+      			timezone: parameter.cron.timezone
+      		}
+      	}
+      }
+      
+      parameter: {
+      	// +usage=minimal replicas of the workload
+      	min: int
+      	// +usage=maximal replicas of the workload
+      	max: int
+      	// +usage=specify the value for CPU utilization, like 80, which means 80%
+      	// +alias=cpu-percent
+      	cpuPercent?: int
+      	// +usage=just for `appfile`, not available for Cli usage
+      	cron?: {
+      		// +usage=the time to start scaling, like `08:00`
+      		startAt: string
+      		// +usage=for how long the scaling will last
+      		duration: string
+      		// +usage=several workdays or weekends, like "Monday, Tuesday"
+      		days: string
+      		// +usage=the target replicas to be scaled to
+      		replicas: int
+      		// +usage=timezone, like "America/Los_Angeles"
+      		timezone: string
+      	}
+      }
+      

charts/vela-core/templates/defwithtemplate/manualscale.yaml

@@ -2,16 +2,12 @@ apiVersion: core.oam.dev/v1alpha2
 kind: TraitDefinition
 metadata:
   annotations:
-    definition.oam.dev/apiVersion: core.oam.dev/v1alpha2
-    definition.oam.dev/kind: ManualScalerTrait
-    definition.oam.dev/description: "Scale replica for workload"
+    definition.oam.dev/description: "Manually scale the app"
   name: scaler
-  namespace: default
 spec:
   appliesToWorkloads:
-    - core.oam.dev/v1alpha2.ContainerizedWorkload
-    - apps/v1.Deployment
     - webservice
+    - worker
   definitionRef:
     name: manualscalertraits.core.oam.dev
   workloadRefPath: spec.workloadRef
@@ -21,11 +17,11 @@ spec:
       	apiVersion: "core.oam.dev/v1alpha2"
       	kind:       "ManualScalerTrait"
       	spec: {
-      		replicaCount: parameter.replica
+      		replicaCount: parameter.replicas
       	}
       }
-      #scale: {
+      parameter: {
       	//+short=r
-      	replica: *2 | int
+      	replicas: *1 | int
       }
-      parameter: #scale
+      

charts/vela-core/templates/defwithtemplate/metrics.yaml

@@ -0,0 +1,37 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: TraitDefinition
+metadata:
+  name: metrics
+  annotations:
+    definition.oam.dev/description: "Configure metrics targets to be monitored for the app"
+spec:
+  appliesToWorkloads:
+    - webservice
+    - backend
+    - task
+  definitionRef:
+    name: metricstraits.standard.oam.dev
+  workloadRefPath: spec.workloadRef
+  extension:
+    template: |-
+      output: {
+      	apiVersion: "standard.oam.dev/v1alpha1"
+      	kind:       "MetricsTrait"
+      	spec: {
+      		scrapeService: parameter
+      	}
+      }
+      parameter: {
+      	// +usage=format of the metrics, default as prometheus
+      	// +short=f
+      	format: *"prometheus" | string
+      	// +usage= the metrics path of the service
+      	path:    *"/metrics" | string
+      	scheme:  *"http" | string
+      	enabled: *true | bool
+      	// +usage= the port for metrics, will discovery automatically by default
+      	port: *0 | >=1024 & <=65535 & int
+      	// +usage= the label selector for the pods, will discovery automatically by default
+      	selector?: [string]: string
+      }
+      

charts/vela-core/templates/defwithtemplate/rollout.yaml

@@ -0,0 +1,51 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: TraitDefinition
+metadata:
+  name: rollout
+  annotations:
+    definition.oam.dev/description: "Configure canary deployment strategy to release the app"
+spec:
+  appliesToWorkloads:
+    - webservice
+  definitionRef:
+    name: canaries.flagger.app
+  workloadRefPath: spec.targetRef
+  revisionEnabled: true
+  extension:
+    template: |-
+      output: {
+      	apiVersion: "flagger.app/v1beta1"
+      	kind:       "Canary"
+      	spec: {
+      		provider:                "smi"
+      		progressDeadlineSeconds: 60
+      		service: {
+      			// Currently Traffic route is not supported, but this is required field for flagger CRD
+      			port: 80
+      			// Currently Traffic route is not supported, but this is required field for flagger CRD
+      			targetPort: 8080
+      		}
+      		analysis: {
+      			interval: parameter.interval
+      			// max number of failed metric checks before rollback
+      			threshold: 10
+      			// max traffic percentage routed to canary
+      			// percentage (0-100)
+      			maxWeight: 50
+      			// canary increment step
+      			// percentage (0-100)
+      			stepWeight: parameter.stepWeight
+      			// max replicas scale up to canary
+      			maxReplicas: parameter.replicas
+      		}
+      	}
+      }
+      parameter: {
+      	// +usage=total replicas of the workload
+      	replicas: *2 | int
+      	// +alias=step-weight
+      	// +usage=weight percent of every step in rolling update
+      	stepWeight: *50 | int
+      	interval:   *"30s" | string
+      }
+      

charts/vela-core/templates/defwithtemplate/route.yaml

@@ -0,0 +1,40 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: TraitDefinition
+metadata:
+  name: route
+  annotations:
+    definition.oam.dev/description: "Configure route policy to the app"
+spec:
+  appliesToWorkloads:
+    - webservice
+  workloadRefPath: spec.workloadRef
+  definitionRef:
+    name: routes.standard.oam.dev
+  extension:
+    template: |
+      output: {
+      	apiVersion: "standard.oam.dev/v1alpha1"
+      	kind:       "Route"
+      	spec: {
+      		host: parameter.domain
+      
+      		if parameter.issuer != "" {
+      			tls: {
+      				issuerName: parameter.issuer
+      			}
+      		}
+      
+      		if parameter["rules"] != _|_ {
+      			rules: parameter.rules
+      		}
+      	}
+      }
+      parameter: {
+      	domain: *"" | string
+      	issuer: *"" | string
+      	rules?: [...{
+      		path:          string
+      		rewriteTarget: *"" | string
+      	}]
+      }
+      

charts/vela-core/templates/defwithtemplate/task.yaml

@@ -0,0 +1,41 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: WorkloadDefinition
+metadata:
+  name: task
+  annotations:
+    definition.oam.dev/description: "One-off task to run a piece of code or script to completion"
+spec:
+  definitionRef:
+    name: jobs
+  extension:
+    template: |
+      output: {
+      	apiVersion: "v1"
+      	kind:       "Job"
+      	spec: {
+      		parallelism: parameter.count
+      		completions: parameter.count
+      		template: spec: {
+      			containers: [{
+      				name:  context.name
+      				image: parameter.image
+      
+      				if parameter["cmd"] != _|_ {
+      					command: parameter.cmd
+      				}
+      			}]
+      		}
+      	}
+      }
+      parameter: {
+      	// +usage=specify number of tasks to run in parallel
+      	// +short=c
+      	count: *1 | int
+      
+      	// +usage=Which image would you like to use for your service
+      	// +short=i
+      	image: string
+      
+      	cmd?: [...string]
+      }
+      

charts/vela-core/templates/defwithtemplate/webservice.yaml

@@ -0,0 +1,83 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: WorkloadDefinition
+metadata:
+  name: webservice
+  annotations:
+    definition.oam.dev/description: "Long-running scalable service with stable endpoint to receive external traffic"
+spec:
+  definitionRef:
+    name: deployments.apps
+  extension:
+    template: |
+      output: {
+      	apiVersion: "apps/v1"
+      	kind:       "Deployment"
+      	spec: {
+      		selector: matchLabels: {
+      			"app.oam.dev/component": context.name
+      		}
+      
+      		template: {
+      			metadata: labels: {
+      				"app.oam.dev/component": context.name
+      			}
+      
+      			spec: {
+      				containers: [{
+      					name:  context.name
+      					image: parameter.image
+      
+      					if parameter["cmd"] != _|_ {
+      						command: parameter.cmd
+      					}
+      
+      					if parameter["env"] != _|_ {
+      						env: parameter.env
+      					}
+      
+      					if context["config"] != _|_ {
+      						env: context.config
+      					}
+      
+      					ports: [{
+      						containerPort: parameter.port
+      					}]
+      
+      					if parameter["cpu"] != _|_ {
+      						resources: {
+      							limits:
+      								cpu: parameter.cpu
+      							requests:
+      								cpu: parameter.cpu
+      						}
+      					}
+      				}]
+      		}
+      		}
+      	}
+      }
+      parameter: {
+      	// +usage=Which image would you like to use for your service
+      	// +short=i
+      	image: string
+      
+      	cmd?: [...string]
+      
+      	// +usage=Which port do you want customer traffic sent to
+      	// +short=p
+      	port: *80 | int
+      
+      	env?: [...{
+      		name:   string
+      		value?: string
+      		valueFrom?: {
+      			secretKeyRef: {
+      				name: string
+      				key:  string
+      			}
+      		}
+      	}]
+      	// +usage=Number of CPU units for the service, like `0.5` (0.5 CPU core), `1` (1 CPU core)
+      	cpu?: string
+      }
+      

charts/vela-core/templates/defwithtemplate/worker.yaml

@@ -0,0 +1,50 @@
+apiVersion: core.oam.dev/v1alpha2
+kind: WorkloadDefinition
+metadata:
+  name: worker
+  annotations:
+    definition.oam.dev/description: "Long-running scalable backend worker without network endpoint"
+spec:
+  definitionRef:
+    name: deployments.apps
+  extension:
+    template: |
+      output: {
+      	apiVersion: "apps/v1"
+      	kind:       "Deployment"
+      	spec: {
+      		selector: matchLabels: {
+      			"app.oam.dev/component": context.name
+      		}
+      
+      		template: {
+      			metadata: labels: {
+      				"app.oam.dev/component": context.name
+      			}
+      
+      			spec: {
+      				containers: [{
+      					name:  context.name
+      					image: parameter.image
+      
+      					if parameter["cmd"] != _|_ {
+      						command: parameter.cmd
+      					}
+      				}]
+      			}
+      		}
+      
+      		selector:
+      			matchLabels:
+      				"app.oam.dev/component": context.name
+      	}
+      }
+      
+      parameter: {
+      	// +usage=Which image would you like to use for your service
+      	// +short=i
+      	image: string
+      
+      	cmd?: [...string]
+      }
+      

charts/vela-core/templates/velaConfig.yaml

@@ -2,16 +2,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: vela-config
-  namespace: {{ .Release.Namespace }}
+  # TODO: Currently namespace MUST be vela-system
+  namespace: vela-system
 data:
-  certificates.cert-manager.io: |
-    {
-      "repo": "jetstack",
-      "urL": "https://charts.jetstack.io",
-      "name": "cert-manager",
-      "namespace": "cert-manager",
-      "version": "1.0.3"
-    }
   servicemonitors.monitoring.coreos.com: |
     {
       "repo": "prometheus-community",
@@ -19,4 +12,20 @@ data:
       "name": "kube-prometheus-stack",
       "namespace": "monitoring",
       "version": "9.4.4"
+    }
+  flagger.app: |
+    {
+      "repo": "oam-flagger",
+      "urL": "https://oam.dev/flagger/archives/",
+      "name": "flagger",
+      "namespace": "vela-system",
+      "version": "1.1.0"
+    }
+  keda: |
+    {
+      "repo": "kedacore",
+      "urL": "https://kedacore.github.io/charts",
+      "name": "keda",
+      "namespace": "keda",
+      "version": "2.0.0-rc3"
     }

charts/vela-core/values.yaml

@@ -7,7 +7,7 @@ useWebhook: true
 image:
   repository: oamdev/vela-core
   tag: latest
-  pullPolicy: Always
+  pullPolicy: IfNotPresent
 
 imagePullSecrets: []
 nameOverride: ""

cmd/core/main.go

@@ -6,8 +6,10 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"strconv"
+	"syscall"
 	"time"
 
 	monitoring "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
@@ -16,11 +18,13 @@ import (
 	oamcontroller "github.com/crossplane/oam-kubernetes-runtime/pkg/controller"
 	oamv1alpha2 "github.com/crossplane/oam-kubernetes-runtime/pkg/controller/v1alpha2"
 	oamwebhook "github.com/crossplane/oam-kubernetes-runtime/pkg/webhook/v1alpha2"
+	"github.com/go-logr/logr"
 	injectorv1alpha1 "github.com/oam-dev/trait-injector/api/v1alpha1"
 	injectorcontroller "github.com/oam-dev/trait-injector/controllers"
 	"github.com/oam-dev/trait-injector/pkg/injector"
 	"github.com/oam-dev/trait-injector/pkg/plugin"
 	certmanager "github.com/wonderflow/cert-manager-api/pkg/apis/certmanager/v1"
+	kedav1alpha1 "github.com/wonderflow/keda-api/api/v1alpha1"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -58,7 +62,7 @@ func init() {
 	_ = velacoreoamdev.AddToScheme(scheme)
 	_ = injectorv1alpha1.AddToScheme(scheme)
 	_ = certmanager.AddToScheme(scheme)
-
+	_ = kedav1alpha1.AddToScheme(scheme)
 	// +kubebuilder:scaffold:scheme
 }
 
@@ -110,10 +114,7 @@ func main() {
 		setupLog.Error(err, "unable to create a kubernetes client")
 		os.Exit(1)
 	}
-	if err = dependency.Install(k8sClient); err != nil {
-		setupLog.Error(err, "unable to install the dependency")
-		os.Exit(1)
-	}
+	go dependency.Install(k8sClient)
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
@@ -136,7 +137,10 @@ func main() {
 
 	if useWebhook {
 		setupLog.Info("vela webhook enabled, will serving at :" + strconv.Itoa(webhookPort))
-		oamwebhook.Add(mgr)
+		if err = oamwebhook.Add(mgr); err != nil {
+			setupLog.Error(err, "unable to setup oam runtime webhook")
+			os.Exit(1)
+		}
 		velawebhook.Register(mgr)
 		if err := waitWebhookSecretVolume(certDir, waitSecretTimeout, waitSecretInterval); err != nil {
 			setupLog.Error(err, "unable to get webhook secret")
@@ -173,10 +177,11 @@ func main() {
 	}
 
 	setupLog.Info("starting the vela controller manager")
-	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+	if err := mgr.Start(makeSignalHandler(setupLog, k8sClient)); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
+	setupLog.Info("program safely stops...")
 }
 
 // registerHealthChecks is used to create readiness&liveness probes
@@ -203,25 +208,57 @@ func waitWebhookSecretVolume(certDir string, timeout, interval time.Duration) er
 		setupLog.Info(fmt.Sprintf("waiting webhook secret, time consumed: %d/%d seconds ...",
 			int64(time.Since(start).Seconds()), int64(timeout.Seconds())))
 		if _, err := os.Stat(certDir); !os.IsNotExist(err) {
-			f, _ := os.Open(certDir)
-			defer f.Close()
-			// check if dir is empty
-			if _, err := f.Readdir(1); err == io.EOF {
-				continue
-			}
-			// check if secret files are empty
-			err := filepath.Walk(certDir, func(path string, info os.FileInfo, err error) error {
-				// even Cert dir is created, cert files are still empty for a while
-				if info.Size() == 0 {
-					return errors.New("secret is not ready")
+			ready := func() bool {
+				f, err := os.Open(filepath.Clean(certDir))
+				if err != nil {
+					return false
 				}
-				return nil
-			})
-			if err == nil {
-				setupLog.Info(fmt.Sprintf("webhook secret is ready (time consumed: %d seconds)",
-					int64(time.Since(start).Seconds())))
+				// nolint
+				defer f.Close()
+				// check if dir is empty
+				if _, err := f.Readdir(1); err == io.EOF {
+					return false
+				}
+				// check if secret files are empty
+				err = filepath.Walk(certDir, func(path string, info os.FileInfo, err error) error {
+					// even Cert dir is created, cert files are still empty for a while
+					if info.Size() == 0 {
+						return errors.New("secret is not ready")
+					}
+					return nil
+				})
+				if err == nil {
+					setupLog.Info(fmt.Sprintf("webhook secret is ready (time consumed: %d seconds)",
+						int64(time.Since(start).Seconds())))
+					return true
+				}
+				return false
+			}()
+			if ready {
 				return nil
 			}
 		}
 	}
 }
+
+func makeSignalHandler(log logr.Logger, kubecli client.Client) (stopCh <-chan struct{}) {
+	stop := make(chan struct{})
+	c := make(chan os.Signal, 2)
+
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+
+	go func() {
+		<-c
+		// Do not uninstall when vela-core terminating.
+		// When running on K8s, old pod will terminate after new pod running, it will cause charts uninstalled.
+		// https://github.com/oam-dev/kubevela/issues/499
+		// dependency.Uninstall(kubecli)
+		close(stop)
+
+		// second signal. Exit directly.
+		<-c
+		os.Exit(1)
+	}()
+
+	return stop
+}

codecov.yml

@@ -0,0 +1,3 @@
+coverage:
+  status:
+    patch: off

design/api/vela-restful-api-reference.md

@@ -426,7 +426,7 @@ Please also specify `traits` values if need to attach a trait to several traits
       "workload_name": "poc5",
       "flags": [
         {
-          "name": "replica",
+          "name": "replicas",
           "value": "4"
         }
       ]
@@ -444,7 +444,7 @@ sample response
 	"data": {
 		"name": "podspecworkload",
 		"type": "workload",
-		"template": "#Template: {\n\tapiVersion: \"core.oam.dev/v1alpha2\"\n\tkind:       \"PodSpecWorkload\"\n\tmetadata: name: podspecworkload.name\n\tspec: {\n\t\tcontainers: [{\n\t\t\timage: containerized.image\n\t\t\tname:  containerized.name\n\t\t\tports: [{\n\t\t\t\tcontainerPort: containerized.port\n\t\t\t\tprotocol:      \"TCP\"\n\t\t\t\tname:          \"default\"\n\t\t\t}]\n\t\t}]\n\t}\n}\ncontainerized: {\n\tname: string\n\t// +usage=specify app image\n\t// +short=i\n\timage: string\n\t// +usage=specify port for container\n\t// +short=p\n\tport: *6379 | int\n}\n",
+		"template": "#Template: {\n\tapiVersion: \"core.oam.dev/v1alpha2\"\n\tkind:       \"PodSpecWorkload\"\n\tmetadata: name: podspecworkload.name\n\tspec: {\n\t\tcontainers: [{\n\t\t\timage: containerized.image\n\t\t\tname:  containerized.name\n\t\t\tports: [{\n\t\t\t\tcontainerPort: containerized.port\n\t\t\t\tprotocol:      \"TCP\"\n\t\t\t\tname:          \"default\"\n\t\t\t}]\n\t\t}]\n\t}\n}\ncontainerized: {\n\tname: string\n\t// +usage=Which image would you like to use for your service\n\t// +short=i\n\timage: string\n\t// +usage=Which port do you want customer traffic sent to\n\t// +short=p\n\tport: *6379 | int\n}\n",
 		"parameters": [{
 			"name": "name",
 			"required": true,
@@ -455,13 +455,13 @@ sample response
 			"short": "i",
 			"required": true,
 			"default": "",
-			"usage": "specify app image",
+			"usage": "Which image would you like to use for your service",
 			"type": 16
 		}, {
 			"name": "port",
 			"short": "p",
 			"default": 6379,
-			"usage": "specify port for container",
+			"usage": "Which port do you want customer traffic sent to",
 			"type": 4
 		}],
 		"definition": "/Users/zhouzhengxi/.vela/capabilities/containerizedworkloads.core.oam.dev.cue",
@@ -492,13 +492,13 @@ sample response
 			"short": "i",
 			"required": true,
 			"default": "",
-			"usage": "specify app image",
+			"usage": "Which image would you like to use for your service",
 			"type": 16
 		}, {
 			"name": "port",
 			"short": "p",
 			"default": 6379,
-			"usage": "specify port for container",
+			"usage": "Which port do you want customer traffic sent to",
 			"type": 4
 		}]
 	}, {
@@ -534,7 +534,7 @@ sample request
   "name": "scale",
   "flags": [
     {
-      "name": "replica",
+      "name": "replicas",
       "value": "4"
     }
   ]
@@ -556,9 +556,9 @@ sample response
 	"data": {
 		"name": "manualscaler",
 		"type": "trait",
-		"template": "#Template: {\n\tapiVersion: \"core.oam.dev/v1alpha2\"\n\tkind:       \"ManualScalerTrait\"\n\tspec: {\n\t\treplicaCount: manualscaler.replica\n\t}\n}\nmanualscaler: {\n\t//+short=r\n\treplica: *2 | int\n}\n",
+		"template": "#Template: {\n\tapiVersion: \"core.oam.dev/v1alpha2\"\n\tkind:       \"ManualScalerTrait\"\n\tspec: {\n\t\treplicaCount: manualscaler.replicas\n\t}\n}\nmanualscaler: {\n\t//+short=r\n\treplicas: *2 | int\n}\n",
 		"parameters": [{
-			"name": "replica",
+			"name": "replicas",
 			"short": "r",
 			"default": 2,
 			"type": 4
@@ -675,7 +675,7 @@ sample response
 	"data": [{
 		"name": "podspecworkload",
 		"type": "workload",
-		"template": "#Template: {\n\tapiVersion: \"core.oam.dev/v1alpha2\"\n\tkind:       \"ContainerizedWorkload\"\n\tmetadata: name: podspecworkload.name\n\tspec: {\n\t\tcontainers: [{\n\t\t\timage: containerized.image\n\t\t\tname:  containerized.name\n\t\t\tports: [{\n\t\t\t\tcontainerPort: containerized.port\n\t\t\t\tprotocol:      \"TCP\"\n\t\t\t\tname:          \"default\"\n\t\t\t}]\n\t\t}]\n\t}\n}\ncontainerized: {\n\tname: string\n\t// +usage=specify app image\n\t// +short=i\n\timage: string\n\t// +usage=specify port for container\n\t// +short=p\n\tport: *6379 | int\n}\n",
+		"template": "#Template: {\n\tapiVersion: \"core.oam.dev/v1alpha2\"\n\tkind:       \"ContainerizedWorkload\"\n\tmetadata: name: podspecworkload.name\n\tspec: {\n\t\tcontainers: [{\n\t\t\timage: containerized.image\n\t\t\tname:  containerized.name\n\t\t\tports: [{\n\t\t\t\tcontainerPort: containerized.port\n\t\t\t\tprotocol:      \"TCP\"\n\t\t\t\tname:          \"default\"\n\t\t\t}]\n\t\t}]\n\t}\n}\ncontainerized: {\n\tname: string\n\t// +usage=Which image would you like to use for your service\n\t// +short=i\n\timage: string\n\t// +usage=Which port do you want customer traffic sent to\n\t// +short=p\n\tport: *6379 | int\n}\n",
 		"parameters": [{
 			"name": "name",
 			"required": true,
@@ -686,13 +686,13 @@ sample response
 			"short": "i",
 			"required": true,
 			"default": "",
-			"usage": "specify app image",
+			"usage": "Which image would you like to use for your service",
 			"type": 16
 		}, {
 			"name": "port",
 			"short": "p",
 			"default": 6379,
-			"usage": "specify port for container",
+			"usage": "Which port do you want customer traffic sent to",
 			"type": 4
 		}],
 		"definition": "/Users/zhouzhengxi/.vela/centers/c1/.tmp/containerizedworkloads.core.oam.dev.cue",
@@ -702,9 +702,9 @@ sample response
 	},{
 		"name": "rollout",
 		"type": "trait",
-		"template": "#Template: {\n\tapiVersion: \"extend.oam.dev/v1alpha2\"\n\tkind:       \"SimpleRolloutTrait\"\n\tspec: {\n\t\treplica:        rollout.replica\n\t\tmaxUnavailable: rollout.maxUnavailable\n\t\tbatch:          rollout.batch\n\t}\n}\nrollout: {\n\treplica:        *3 | int\n\tmaxUnavailable: *1 | int\n\tbatch:          *2 | int\n}\n",
+		"template": "#Template: {\n\tapiVersion: \"extend.oam.dev/v1alpha2\"\n\tkind:       \"SimpleRolloutTrait\"\n\tspec: {\n\t\treplicas:        rollout.replicas\n\t\tmaxUnavailable: rollout.maxUnavailable\n\t\tbatch:          rollout.batch\n\t}\n}\nrollout: {\n\treplicas:        *3 | int\n\tmaxUnavailable: *1 | int\n\tbatch:          *2 | int\n}\n",
 		"parameters": [{
-			"name": "replica",
+			"name": "replicas",
 			"default": 3,
 			"type": 4
 		}, {

design/vela-core/appfile-design.md

@@ -50,14 +50,14 @@ services:
       - /mnt/path=sec:my-secret
 
     scale:
-      replica: 2
+      replicas: 2
       auto: # automatic scale up and down based on given metrics
         range: "1-10"
         cpu: 80 # if cpu utilization is above 80%, scale up
         qps: 1000 # if qps is higher than 1k, scale up
 
     canary: # Auto-create canary deployment. Only upgrade after verify successfully.
-      replica: 1 # canary deployment size
+      replicas: 1 # canary deployment size
       headers:
         - "foo:bar.*"
 ```
@@ -72,7 +72,7 @@ It will build container image, render deployment manifests in yaml, and apply th
 
 ### Extensible Design
 
-The Appfile could be extended with more configurations by adding more capabilities to the OAM system. The config fields in Appfile are strongly correlated to the [capabilities system of OAM](https://github.com/oam-dev/kubevela/blob/master/DESIGN.md#capability-register-and-discovery) – Config fields are registered in the capabilities system and exposed via a [CUE template](https://cuelang.org/).
+The Appfile could be extended with more configurations by adding more capabilities to the OAM system. The config fields in Appfile are strongly correlated to the [capabilities system of OAM](https://github.com/oam-dev/kubevela/blob/master/docs/design.md#2-capability-oriented-architecture) – Config fields are registered in the capabilities system and exposed via a [CUE template](https://cuelang.org/).
 
 Here is an example of a capability definition that platform builders register:
 
@@ -86,8 +86,7 @@ spec:
     name: deployments.apps
   extension:
     template: |
-      parameter: #webservice
-      #webservice: {
+      parameter: {
         // +vela:cli:enabled=true
         // +vela:cli:usage=specify commands to run in container
         // +vela:cli:short=c
@@ -141,7 +140,7 @@ In the following, we will discuss technical details of the proposed design.
 
 ### Registration via Definition/Capability
 
-Vela allows platform builders to extend Appfile config fields by registering them via [capabilities system of OAM](https://github.com/oam-dev/kubevela/blob/master/DESIGN.md#capability-register-and-discovery).
+Vela allows platform builders to extend Appfile config fields by registering them via [capabilities system of OAM](https://github.com/oam-dev/kubevela/blob/master/docs/design.md#2-capability-oriented-architecture).
 
 The entire template should be put under `spec.extension.template` as raw string:
 
@@ -152,7 +151,7 @@ kind: WorkloadDefinition | TraitDefinition
 spec:
   extension:
     template: |
-      parameter: #webservice
+      parameter: {
       ...
 ```
 
@@ -167,8 +166,7 @@ Vela allows platform builders to write bespoke templates to extend Appfile confi
 A template starts with `parameter` and its definition:
 
 ```yaml
-parameter: #webservice
-#webservice: {
+parameter: {
   // +vela:cli:enabled=true
   // +vela:cli:usage=specify commands to run in container
   // +vela:cli:short=c
@@ -178,7 +176,6 @@ parameter: #webservice
 
 Here is the takeout:
 * The `parameter` defines the user input fields and is used to render final output with user input values. These fields will be exposed to users in Appfile.
-* The definition `#webservice` is used to tell the name of the template. This name is used to correlate workload and trait types to fields in Appfile.
 
 Note that there is difference in how Workload and Trait expose parameters.
 
@@ -278,7 +275,7 @@ Here is the takeout:
 
 ### `vela up`
 
-The vela-cli will have an `up` command to provide seamless workflow experience. Provide an `vela.yml` Appfile in the same directory that you will run `vela up` and it is good to go. There is an example under `examples/testapp/` .
+The vela-cli will have an `up` command to provide seamless workflow experience. Provide an `vela.yaml` Appfile in the same directory that you will run `vela up` and it is good to go. There is an example under `examples/testapp/` .
 
 ## Examples
 
@@ -359,4 +356,4 @@ spec:
           }]
         }
       }
-```
+```

design/vela-core/route.md

@@ -96,7 +96,7 @@ you to give a specified ingress controller type. Currently, only nginx-ingress i
 
 The `tls` field allow you to specify a TLS for this route with an IssuerName, the IssuerName pointing to an Issuer Object
 created by cert-manager. Cert-manager and ingress controller will handle certificate creation and binding.
-If not specified, a selfsigned issuer will be created.
+If not specified, mTLS was disabled and you can only visit by http.
 
 If no rule specified, route trait will create one rule automatically and match with the port.
 

docs/CNAME

@@ -0,0 +1 @@
+kubevela.io

docs/README.md

@@ -0,0 +1,31 @@
+# KubeVela Website
+[kubevela.io](https://kubevela.io)
+
+## Contributing
+
+- Fork and clone
+
+  ```
+  $ git clone git@github.com:oam-dev/kubevela.git
+  $ cd kubevela/docs
+  ```
+
+- Install docsify-cli
+  ```
+  $ npm i docsify-cli -g
+  ```
+
+- Make your changes
+
+- Local preview
+  ```
+  $ docsify serve
+  Serving /xxx/kubevela.io now.
+  Listening at http://localhost:3000
+  ```
+
+  Preview your changes at [http://127.0.0.1:3000/](http://127.0.0.1:3000/).
+
+- Push your commit
+
+  Thanks for your contribution!

docs/_coverpage.md

@@ -0,0 +1,9 @@
+<p align="center">
+ <img src="static/logo.svg" alt="kubevela logo" width=300 height=300 />
+</p>
+
+> Make shipping applications more enjoyable.
+
+
+[GitHub](https://github.com/oam-dev/kubevela)
+[Get Started](en/quick-start)

docs/_navbar.md

@@ -0,0 +1,5 @@
+- [Home](/)
+<!-- - [Blog](/en/blog/README.md) -->
+<!-- - Language
+  - [中文](/zh-cn/)
+  - [English](/en/) -->

docs/_sidebar.md

@@ -0,0 +1,76 @@
+- Overview
+  - [Introduction](/en/introduction.md)
+  - [Getting Started](/en/quick-start.md)
+
+- Using KubeVela
+  - Appfile
+    - [Learning Appfile](/en/developers/learn-appfile.md)
+  - Operating
+    - [Setting Routes](/en/developers/set-route.md)
+    - [Setting Auto-scaling Policy](/en/developers/set-autoscale.md)
+    - [Setting Rollout Strategy](/en/developers/set-rollout.md)
+    - [Setting Monitoring Policy](/en/developers/set-metrics.md)
+  - Debugging
+    - [Port Forwarding](/en/developers/port-forward.md)
+    - [Check Application Logs](/en/developers/check-logs.md)
+    - [Execute Commands in Container](/en/developers/exec-cmd.md)  
+  - Extensibility
+    - [Managing Capabilities](/en/developers/cap-center.md)
+  - Configuring
+    - [Setting Up Deployment Environment](/en/developers/config-enviroments.md)
+    - [Configuring data/env in Application](/en/developers/config-app.md)
+  - [Alternative Commands](/en/developers/alternative-cmd.md)
+- Extending KubeVela
+  - [Add Workload Type](/en/platform-engineers/workload-type.md)
+  - [Add Trait](/en/platform-engineers/trait.md)
+  - [Add Cloud Services](/en/platform-engineers/cloud-services.md)
+
+- Roadmap
+  - [KubeVela Roadmap](/en/roadmap.md)
+
+- References
+  - [Concepts and Glossaries](/en/concepts.md)
+  - [Appfile](/en/developers/references/devex/appfile.md)
+  - Capabilities
+    - Workload Types
+      - [Web Service](/en/developers/references/workload-types/web-service.md)
+      - [Task](/en/developers/references/workload-types/task.md)
+      - [Worker](/en/developers/references/workload-types/backend-worker.md)
+    - Traits
+      - [Route](/en/developers/references/traits/route.md)
+      - [Autoscale](/en/developers/references/traits/autoscale.md)
+      - [Rollout](/en/developers/references/traits/rollout.md)
+      - [Metrics](/en/developers/references/traits/metrics.md)
+  - CLI
+    - General
+      - [vela config](/en/cli/vela_config.md)
+      - [vela env](/en/cli/vela_env.md)
+      - [vela init](/en/cli/vela_init.md)
+      - [vela install](/en/cli/vela_install.md)
+      - [vela up](/en/cli/vela_up.md)
+      - [vela version](/en/cli/vela_version.md)
+    - Applications
+      - [vela delete](/en/cli/vela_delete.md)
+      - [vela exec](/en/cli/vela_exec.md)
+      - [vela logs](/en/cli/vela_logs.md)
+      - [vela ls](/en/cli/vela_ls.md)
+      - [vela port-forward](/en/cli/vela_port-forward.md)
+      - [vela show](/en/cli/vela_show.md)
+      - [vela status](/en/cli/vela_status.md)
+      - [vela svc](/en/cli/vela_svc.md)
+    - Workload Types
+      - [vela workloads](/en/cli/vela_workloads.md)
+    - Traits
+      - [vela traits](/en/cli/vela_traits.md)
+      - [vela scaler](/en/cli/vela_scaler.md)
+      - [vela route](/en/cli/vela_route.md)
+      - [vela autoscale](/en/cli/vela_autoscale.md)
+      - [vela rollout](/en/cli/vela_rollout.md)
+      - [vela metrics](/en/cli/vela_metric.md)
+    - System
+      - [vela completion](/en/cli/vela_completion.md)
+      - [vela dashboard](/en/cli/vela_dashboard.md)
+      - [vela system](/en/cli/vela_system.md)
+      - [vela template](/en/cli/vela_template.md)
+    - Extensibility
+      - [vela cap](/en/cli/vela_cap.md)

docs/en/README.md

@@ -0,0 +1,25 @@
+![alt](../resources/KubeVela-03.png)
+
+*Make shipping applications more enjoyable.*
+
+# KubeVela
+
+For developers, KubeVela is an easy-to-use tool that enables them to describe and ship their applications to Kubernetes with minimal effort.
+
+For platform builders, KubeVela serves as a framework that empowers them to create developer facing yet highly extensible platforms at ease.
+
+- Slack: [Discuss](https://cloud-native.slack.com/archives/C01BLQ3HTJA)
+- Gitter: [Community](https://gitter.im/oam-dev/community)
+
+> NOTE: KubeVela is still in early stage and iterating quickly. It's currently under preview release.
+
+## Quick Start
+
+Quick start guides are available on [this section](/en/quick-start).
+
+
+## Contributing
+Check out [CONTRIBUTING](https://github.com/oam-dev/kubevela/blob/master/CONTRIBUTING.md) to see how to develop with KubeVela.
+
+## Code of Conduct
+This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). See [CODE OF CONDUCT](CODE_OF_CONDUCT.md) for details.

docs/en/blog/README.md

@@ -0,0 +1 @@
+## Some blog

docs/en/blog/_sidebar.md

@@ -0,0 +1 @@
+- [Blog](/en/blog/README.md)

docs/en/cli/vela.md

@@ -0,0 +1,49 @@
+## vela
+
+
+
+### Synopsis
+
+
+
+```
+vela [flags]
+```
+
+### Options
+
+```
+  -e, --env string   specify environment name for application
+  -h, --help         help for vela
+```
+
+### SEE ALSO
+
+* [vela autoscale](vela_autoscale.md)	 - Attach autoscale trait to an app
+* [vela cap](vela_cap.md)	 - Manage capability centers and installing/uninstalling capabilities
+* [vela completion](vela_completion.md)	 - Output shell completion code for the specified shell (bash or zsh)
+* [vela config](vela_config.md)	 - Manage configurations
+* [vela dashboard](vela_dashboard.md)	 - Setup API Server and launch Dashboard
+* [vela delete](vela_delete.md)	 - Delete an application
+* [vela env](vela_env.md)	 - Manage environments
+* [vela exec](vela_exec.md)	 - Execute command in a container
+* [vela init](vela_init.md)	 - Create scaffold for an application
+* [vela install](vela_install.md)	 - Install Vela Core with built-in capabilities
+* [vela logs](vela_logs.md)	 - Tail logs for application
+* [vela ls](vela_ls.md)	 - List services
+* [vela metrics](vela_metrics.md)	 - Attach metrics trait to an app
+* [vela port-forward](vela_port-forward.md)	 - Forward local ports to services in an application
+* [vela rollout](vela_rollout.md)	 - Attach rollout trait to an app
+* [vela route](vela_route.md)	 - Attach route trait to an app
+* [vela scaler](vela_scaler.md)	 - Attach scaler trait to an app
+* [vela show](vela_show.md)	 - Show details of an application
+* [vela status](vela_status.md)	 - Show status of an application
+* [vela svc](vela_svc.md)	 - Manage services
+* [vela system](vela_system.md)	 - System management utilities
+* [vela template](vela_template.md)	 - Manage templates
+* [vela traits](vela_traits.md)	 - List traits
+* [vela up](vela_up.md)	 - Apply an appfile
+* [vela version](vela_version.md)	 - Prints out build version information
+* [vela workloads](vela_workloads.md)	 - List workloads
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_autoscale.md

@@ -0,0 +1,41 @@
+## vela autoscale
+
+Attach autoscale trait to an app
+
+### Synopsis
+
+Attach autoscale trait to an app
+
+```
+vela autoscale <appname> [args]
+```
+
+### Examples
+
+```
+vela autoscale frontend
+```
+
+### Options
+
+```
+      --cpu-percent int   specify the value for CPU utilization, like 80, which means 80%
+      --detach            detach trait from service
+  -h, --help              help for autoscale
+      --max int           maximal replicas of the workload
+      --min int           minimal replicas of the workload
+  -s, --staging           only save changes locally without real update application
+      --svc string        specify one service belonging to the application
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap.md

@@ -0,0 +1,29 @@
+## vela cap
+
+Manage capability centers and installing/uninstalling capabilities
+
+### Synopsis
+
+Manage capability centers and installing/uninstalling capabilities
+
+### Options
+
+```
+  -h, --help   help for cap
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+* [vela cap center](vela_cap_center.md)	 - Manage Capability Center
+* [vela cap install](vela_cap_install.md)	 - Install capability into cluster
+* [vela cap ls](vela_cap_ls.md)	 - List capabilities from cap-center
+* [vela cap uninstall](vela_cap_uninstall.md)	 - Uninstall capability from cluster
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_center.md

@@ -20,10 +20,10 @@ Manage Capability Center with config, sync, list
 
 ### SEE ALSO
 
-* [vela cap](vela_cap.md)	 - Capability Management
-* [vela cap center config](vela_cap_center_config.md)	 - Configure or add the capability center, default is local (built-in capabilities)
+* [vela cap](vela_cap.md)	 - Manage capability centers and installing/uninstalling capabilities
+* [vela cap center config](vela_cap_center_config.md)	 - Configure (add if not exist) a capability center, default is local (built-in capabilities)
 * [vela cap center ls](vela_cap_center_ls.md)	 - List all capability centers
 * [vela cap center remove](vela_cap_center_remove.md)	 - Remove specified capability center
 * [vela cap center sync](vela_cap_center_sync.md)	 - Sync capabilities from remote center, default to sync all centers
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_center_config.md

@@ -1,10 +1,10 @@
 ## vela cap center config
 
-Configure or add the capability center, default is local (built-in capabilities)
+Configure (add if not exist) a capability center, default is local (built-in capabilities)
 
 ### Synopsis
 
-Configure or add the capability center, default is local (built-in capabilities)
+Configure (add if not exist) a capability center, default is local (built-in capabilities)
 
 ```
 vela cap center config <centerName> <centerURL> [flags]
@@ -33,4 +33,4 @@ vela cap center config mycenter https://github.com/oam-dev/catalog/cap-center
 
 * [vela cap center](vela_cap_center.md)	 - Manage Capability Center
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_center_ls.md

@@ -32,4 +32,4 @@ vela cap center ls
 
 * [vela cap center](vela_cap_center.md)	 - Manage Capability Center
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_center_remove.md

@@ -32,4 +32,4 @@ vela cap center remove mycenter
 
 * [vela cap center](vela_cap_center.md)	 - Manage Capability Center
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_center_sync.md

@@ -32,4 +32,4 @@ vela cap center sync mycenter
 
 * [vela cap center](vela_cap_center.md)	 - Manage Capability Center
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_install.md

@@ -0,0 +1,36 @@
+## vela cap install
+
+Install capability into cluster
+
+### Synopsis
+
+Install capability into cluster
+
+```
+vela cap install <center>/<name> [flags]
+```
+
+### Examples
+
+```
+vela cap install mycenter/route
+```
+
+### Options
+
+```
+  -h, --help           help for install
+  -t, --token string   Github Repo token
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela cap](vela_cap.md)	 - Manage capability centers and installing/uninstalling capabilities
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_ls.md

@@ -1,13 +1,13 @@
 ## vela cap ls
 
-List all capabilities in center
+List capabilities from cap-center
 
 ### Synopsis
 
-List all capabilities in center
+List capabilities from cap-center
 
 ```
-vela cap ls [centerName] [flags]
+vela cap ls [cap-center] [flags]
 ```
 
 ### Examples
@@ -30,6 +30,6 @@ vela cap ls
 
 ### SEE ALSO
 
-* [vela cap](vela_cap.md)	 - Capability Management
+* [vela cap](vela_cap.md)	 - Manage capability centers and installing/uninstalling capabilities
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_cap_uninstall.md

@@ -0,0 +1,36 @@
+## vela cap uninstall
+
+Uninstall capability from cluster
+
+### Synopsis
+
+Uninstall capability from cluster
+
+```
+vela cap uninstall <name> [flags]
+```
+
+### Examples
+
+```
+vela cap uninstall route
+```
+
+### Options
+
+```
+  -h, --help           help for uninstall
+  -t, --token string   Github Repo token
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela cap](vela_cap.md)	 - Manage capability centers and installing/uninstalling capabilities
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_completion.md

@@ -27,4 +27,4 @@ of vela commands.
 * [vela completion bash](vela_completion_bash.md)	 - generate autocompletions script for bash
 * [vela completion zsh](vela_completion_zsh.md)	 - generate autocompletions script for zsh
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_completion_bash.md

@@ -36,4 +36,4 @@ vela completion bash
 
 * [vela completion](vela_completion.md)	 - Output shell completion code for the specified shell (bash or zsh)
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_completion_zsh.md

@@ -33,4 +33,4 @@ vela completion zsh
 
 * [vela completion](vela_completion.md)	 - Output shell completion code for the specified shell (bash or zsh)
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_config.md

@@ -0,0 +1,29 @@
+## vela config
+
+Manage configurations
+
+### Synopsis
+
+Manage configurations
+
+### Options
+
+```
+  -h, --help   help for config
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+* [vela config del](vela_config_del.md)	 - Delete config
+* [vela config get](vela_config_get.md)	 - Get data for a config
+* [vela config ls](vela_config_ls.md)	 - List configs
+* [vela config set](vela_config_set.md)	 - Set data for a config
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_config_del.md

@@ -0,0 +1,35 @@
+## vela config del
+
+Delete config
+
+### Synopsis
+
+Delete config
+
+```
+vela config del
+```
+
+### Examples
+
+```
+vela config del <config-name>
+```
+
+### Options
+
+```
+  -h, --help   help for del
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela config](vela_config.md)	 - Manage configurations
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_config_get.md

@@ -0,0 +1,35 @@
+## vela config get
+
+Get data for a config
+
+### Synopsis
+
+Get data for a config
+
+```
+vela config get
+```
+
+### Examples
+
+```
+vela config get <config-name>
+```
+
+### Options
+
+```
+  -h, --help   help for get
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela config](vela_config.md)	 - Manage configurations
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_config_ls.md

@@ -0,0 +1,35 @@
+## vela config ls
+
+List configs
+
+### Synopsis
+
+List all configs
+
+```
+vela config ls
+```
+
+### Examples
+
+```
+vela config ls
+```
+
+### Options
+
+```
+  -h, --help   help for ls
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela config](vela_config.md)	 - Manage configurations
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_config_set.md

@@ -0,0 +1,35 @@
+## vela config set
+
+Set data for a config
+
+### Synopsis
+
+Set data for a config
+
+```
+vela config set
+```
+
+### Examples
+
+```
+vela config set <config-name> KEY=VALUE K2=V2
+```
+
+### Options
+
+```
+  -h, --help   help for set
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela config](vela_config.md)	 - Manage configurations
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_dashboard.md

@@ -38,4 +38,4 @@ dashboard
 
 * [vela](vela.md)	 - 
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_delete.md

@@ -0,0 +1,36 @@
+## vela delete
+
+Delete an application
+
+### Synopsis
+
+Delete an application
+
+```
+vela delete APP_NAME
+```
+
+### Examples
+
+```
+vela delete frontend
+```
+
+### Options
+
+```
+  -h, --help         help for delete
+      --svc string   delete only the specified service in this app
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_env.md

@@ -1,10 +1,10 @@
 ## vela env
 
-Manage application environments
+Manage environments
 
 ### Synopsis
 
-Manage application environments
+Manage environments
 
 ### Options
 
@@ -26,4 +26,4 @@ Manage application environments
 * [vela env ls](vela_env_ls.md)	 - List environments
 * [vela env set](vela_env_set.md)	 - Set an environment
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_env_delete.md

@@ -30,6 +30,6 @@ vela env delete test
 
 ### SEE ALSO
 
-* [vela env](vela_env.md)	 - Manage application environments
+* [vela env](vela_env.md)	 - Manage environments
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_env_init.md

@@ -22,7 +22,8 @@ vela env init test --namespace test --email my@email.com
       --domain string      specify domain your applications
       --email string       specify email for production TLS Certificate notification
   -h, --help               help for init
-      --namespace string   specify K8s namespace for env (default "default")
+      --namespace string   specify K8s namespace for env
+  -s, --sync               synchronize capabilities from cluster into local (default true)
 ```
 
 ### Options inherited from parent commands
@@ -33,6 +34,6 @@ vela env init test --namespace test --email my@email.com
 
 ### SEE ALSO
 
-* [vela env](vela_env.md)	 - Manage application environments
+* [vela env](vela_env.md)	 - Manage environments
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_env_ls.md

@@ -13,7 +13,7 @@ vela env ls
 ### Examples
 
 ```
-vela env list [env-name]
+vela env ls [env-name]
 ```
 
 ### Options
@@ -30,6 +30,6 @@ vela env list [env-name]
 
 ### SEE ALSO
 
-* [vela env](vela_env.md)	 - Manage application environments
+* [vela env](vela_env.md)	 - Manage environments
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_env_set.md

@@ -30,6 +30,6 @@ vela env set test
 
 ### SEE ALSO
 
-* [vela env](vela_env.md)	 - Manage application environments
+* [vela env](vela_env.md)	 - Manage environments
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_exec.md

@@ -0,0 +1,32 @@
+## vela exec
+
+Execute command in a container
+
+### Synopsis
+
+Execute command in a container
+
+```
+vela exec [flags] APP_NAME -- COMMAND [args...]
+```
+
+### Options
+
+```
+  -h, --help                           help for exec
+      --pod-running-timeout duration   The length of time (like 5s, 2m, or 3h, higher than zero) to wait until at least one pod is running (default 1m0s)
+  -i, --stdin                          Pass stdin to the container (default true)
+  -t, --tty                            Stdin is a TTY (default true)
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_init.md

@@ -1,10 +1,10 @@
 ## vela init
 
-Init an OAM Application
+Create scaffold for an application
 
 ### Synopsis
 
-Init an OAM Application by one command
+Create scaffold for an application
 
 ```
 vela init
@@ -19,7 +19,8 @@ vela init
 ### Options
 
 ```
-  -h, --help   help for init
+  -h, --help          help for init
+      --render-only   Rendering vela.yaml in current dir and do not deploy
 ```
 
 ### Options inherited from parent commands
@@ -32,4 +33,4 @@ vela init
 
 * [vela](vela.md)	 - 
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_install.md

@@ -1,10 +1,10 @@
 ## vela install
 
-Initialize vela on both client and server
+Install Vela Core with built-in capabilities
 
 ### Synopsis
 
-Install OAM runtime and vela builtin capabilities.
+Install Vela Core with built-in capabilities
 
 ```
 vela install [flags]
@@ -14,10 +14,11 @@ vela install [flags]
 
 ```
   -h, --help                       help for install
-      --image-pull-policy string   vela core image pull policy, this will align to chart value image.pullPolicy (default "Always")
+      --image-pull-policy string   vela core image pull policy, this will align to chart value image.pullPolicy (default "IfNotPresent")
       --image-repo string          vela core image repo, this will align to chart value image.repo (default "oamdev/vela-core")
       --image-tag string           vela core image repo, this will align to chart value image.tag (default "latest")
   -p, --vela-chart-path string     path to vela core chart to override default chart
+  -w, --wait string                wait until vela-core is ready to serve, default will not wait (default "0s")
 ```
 
 ### Options inherited from parent commands
@@ -30,4 +31,4 @@ vela install [flags]
 
 * [vela](vela.md)	 - 
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_logs.md

@@ -0,0 +1,30 @@
+## vela logs
+
+Tail logs for application
+
+### Synopsis
+
+Tail logs for application
+
+```
+vela logs [flags]
+```
+
+### Options
+
+```
+  -h, --help            help for logs
+  -o, --output string   output format for logs, support: [default, raw, json] (default "default")
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_ls.md

@@ -0,0 +1,36 @@
+## vela ls
+
+List services
+
+### Synopsis
+
+List services of all applications
+
+```
+vela ls
+```
+
+### Examples
+
+```
+vela ls
+```
+
+### Options
+
+```
+      --app string   specify the name of application
+  -h, --help         help for ls
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_metrics.md

@@ -19,15 +19,15 @@ vela metrics frontend
 ### Options
 
 ```
-  -a, --app string      create or add into an existing application group
-      --detach          detach trait from component
+      --detach          detach trait from service
       --enabled          (default true)
   -f, --format string   format of the metrics, default as prometheus (default "prometheus")
   -h, --help            help for metrics
-      --path string      (default "/metrics")
-      --port int         (default 8080)
+      --path string      the metrics path of the service (default "/metrics")
+      --port int         the port for metrics, will discovery automatically by default
       --scheme string    (default "http")
   -s, --staging         only save changes locally without real update application
+      --svc string      specify one service belonging to the application
 ```
 
 ### Options inherited from parent commands
@@ -40,4 +40,4 @@ vela metrics frontend
 
 * [vela](vela.md)	 - 
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_port-forward.md

@@ -0,0 +1,32 @@
+## vela port-forward
+
+Forward local ports to services in an application
+
+### Synopsis
+
+Forward local ports to services in an application
+
+```
+vela port-forward APP_NAME [options] [LOCAL_PORT:]REMOTE_PORT [...[LOCAL_PORT_N:]REMOTE_PORT_N] [flags]
+```
+
+### Options
+
+```
+      --address strings                Addresses to listen on (comma separated). Only accepts IP addresses or localhost as a value. When localhost is supplied, vela will try to bind on both 127.0.0.1 and ::1 and will fail if neither of these addresses are available to bind. (default [localhost])
+  -h, --help                           help for port-forward
+      --pod-running-timeout duration   The length of time (like 5s, 2m, or 3h, higher than zero) to wait until at least one pod is running (default 1m0s)
+      --route                          forward ports from route trait service
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_rollout.md

@@ -0,0 +1,41 @@
+## vela rollout
+
+Attach rollout trait to an app
+
+### Synopsis
+
+Attach rollout trait to an app
+
+```
+vela rollout <appname> [args]
+```
+
+### Examples
+
+```
+vela rollout frontend
+```
+
+### Options
+
+```
+      --detach            detach trait from service
+  -h, --help              help for rollout
+      --interval string    (default "30s")
+      --replicas int      total replicas of the workload (default 2)
+  -s, --staging           only save changes locally without real update application
+      --step-weight int   weight percent of every step in rolling update (default 50)
+      --svc string        specify one service belonging to the application
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_route.md

@@ -19,14 +19,12 @@ vela route frontend
 ### Options
 
 ```
-  -a, --app string      create or add into an existing application group
-      --detach          detach trait from component
+      --detach          detach trait from service
       --domain string   
   -h, --help            help for route
       --issuer string   
-      --path string     
-      --port int         (default 443)
   -s, --staging         only save changes locally without real update application
+      --svc string      specify one service belonging to the application
 ```
 
 ### Options inherited from parent commands
@@ -39,4 +37,4 @@ vela route frontend
 
 * [vela](vela.md)	 - 
 
-###### Auto generated by spf13/cobra on 20-Oct-2020
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_scaler.md

@@ -0,0 +1,39 @@
+## vela scaler
+
+Attach scaler trait to an app
+
+### Synopsis
+
+Attach scaler trait to an app
+
+```
+vela scaler <appname> [args]
+```
+
+### Examples
+
+```
+vela scaler frontend
+```
+
+### Options
+
+```
+      --detach         detach trait from service
+  -h, --help           help for scaler
+  -r, --replicas int    (default 1)
+  -s, --staging        only save changes locally without real update application
+      --svc string     specify one service belonging to the application
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_show.md

@@ -0,0 +1,36 @@
+## vela show
+
+Show details of an application
+
+### Synopsis
+
+Show details of an application
+
+```
+vela show APP_NAME [flags]
+```
+
+### Examples
+
+```
+vela show APP_NAME
+```
+
+### Options
+
+```
+  -h, --help         help for show
+  -s, --svc string   service name
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_status.md

@@ -0,0 +1,36 @@
+## vela status
+
+Show status of an application
+
+### Synopsis
+
+Show status of an application, including workloads and traits of each service.
+
+```
+vela status APP_NAME [flags]
+```
+
+### Examples
+
+```
+vela status APP_NAME
+```
+
+### Options
+
+```
+  -h, --help         help for status
+  -s, --svc string   service name
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+
+###### Auto generated by spf13/cobra on 16-Nov-2020

docs/en/cli/vela_svc.md

@@ -0,0 +1,27 @@
+## vela svc
+
+Manage services
+
+### Synopsis
+
+Manage services
+
+### Options
+
+```
+  -a, --app string   specify the name of application containing the services
+  -h, --help         help for svc
+```
+
+### Options inherited from parent commands
+
+```
+  -e, --env string   specify environment name for application
+```
+
+### SEE ALSO
+
+* [vela](vela.md)	 - 
+* [vela svc deploy](vela_svc_deploy.md)	 - Initialize and run a service
+
+###### Auto generated by spf13/cobra on 16-Nov-2020