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/docker.yml

@@ -0,0 +1,25 @@
+name: Publish to Registry
+on:
+  push:
+    branches:
+      - master
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Publish to Github Docker Package Registry
+        uses: elgohr/Publish-Docker-Github-Action@2.21
+        with:
+          name: oam-dev/kubevela/vela-core
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.pkg.github.com
+          tags: "latest"
+      - name: Publish to Docker Hub Registry
+        uses: elgohr/Publish-Docker-Github-Action@2.21
+        with:
+          name: oamdev/vela-core
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: "latest"

.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,31 @@ 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: Run Make
         run: make
 
+      - name: Run Make Manager
+        run: make manager
+
       - 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,13 +25,23 @@ 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: wonderflow/kubebuilder-action@v1.1
+
       - name: Run Make test
         run: make test
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.txt
+          flags: unittests
+          name: codecov-umbrella

.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
@@ -32,6 +32,8 @@ jobs:
         run: make generate-source
       - name: Run cross-build
         run: make cross-build
+      - name: Run compress binary
+        run: make compress
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -41,24 +43,67 @@ jobs:
       - name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-      - name: Upload Linux
+      - name: Upload Linux tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./bin/vela-linux-amd64
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64
+          asset_path: ./_bin/vela-linux-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.tar.gz
           asset_content_type: binary/octet-stream
-      - name: Upload MacOS
+      - name: Upload Linux zip
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./bin/vela-darwin-amd64
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64
+          asset_path: ./_bin/vela-linux-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-linux-amd64.zip
           asset_content_type: binary/octet-stream
-      - name: Upload Windows
+      - name: Upload MacOS tar.gz
         uses: actions/upload-release-asset@v1.0.2
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./bin/vela-windows-amd64.exe
-          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.exe
-          asset_content_type: binary/octet-stream
+          asset_path: ./_bin/vela-darwin-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload MacOS zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./_bin/vela-darwin-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Windows tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./_bin/vela-windows-amd64.tar.gz
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Windows zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./_bin/vela-windows-amd64.zip
+          asset_name: vela-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Checksums
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./_bin/sha256sums.txt
+          asset_name: sha256sums.txt
+          asset_content_type: text/plain
+      - name: Publish to Github Docker Package Registry
+        uses: elgohr/Publish-Docker-Github-Action@2.21
+        with:
+          name: oam-dev/kubevela/vela-core
+          username: $GITHUB_ACTOR
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.pkg.github.com
+          tags: "${{ steps.get_version.outputs.VERSION }}"
+      - name: Publish to Docker Hub Registry
+        uses: elgohr/Publish-Docker-Github-Action@2.21
+        with:
+          name: oamdev/vela-core
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: "${{ steps.get_version.outputs.VERSION }}"

.gitignore

@@ -5,6 +5,7 @@
 *.so
 *.dylib
 bin
+_bin
 e2e/vela
 
 # Test binary, build with `go test -c`
@@ -12,6 +13,7 @@ e2e/vela
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+coverage.txt
 
 # Kubernetes Generated files - skip generated files, except for vendored files
 
@@ -35,9 +37,14 @@ config/crd/bases
 tmp/
 
 cmd/vela/fake/source.go
+cmd/vela/fake/chart_source.go
+charts/vela-core/crds/_.yaml
+.test_vela
+
+.vela/
 
 # Dashboard
-dashboard/node_modules/
+node_modules/
 .eslintcache
 dashboard/dist/
 dashboard/package-lock.json

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct
+
+KubeVela follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

CONTRIBUTING.md

@@ -1,114 +1,157 @@
 # 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). 
 
 ## Prerequisites
 
-1. Golang version 1.12+
-2. Kubernetes version v1.15+ with `~/.kube/config` configured.
-3. OAM Kubernetes Runtime installed.
-4. Kustomize version 3.8+
-5. ginkgo 1.14.0+ (just for [E2E test](https://github.com/oam-dev/kubevela/blob/master/DEVELOPMENT.md#e2e-test))
-6. golangci-lint 1.31.0+, it will install automatically if you run `make`, you can [install it manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.
+1. Golang version 1.13+
+2. Kubernetes version v1.16+ with `~/.kube/config` configured.
+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
 
 ```shell script
 git clone git@github.com:oam-dev/kubevela.git
 ```
 
-* Install Template CRD into your cluster
+* Build Vela CLI
 
 ```shell script
-make install
+make
 ```
 
-* Install template object 
+* Configure vela to PATH
+
+after build, make will create `vela` binary to `bin/`, Set this path to PATH.
 
 ```shell script
-kubectl apply -f config/samples/
+export PATH=$PATH:/your/path/to/project/kubevela/bin
 ```
 
-## Develop & Debug
-If you change Template CRD, remember to rerun `make install`.
+Then you can use `vela` command directly.
 
-Use the following command to develop and debug.
+* Build Vela Core
 
 ```shell script
-$ cd cmd/vela
-$ go run main.go COMMAND [FLAG]
+make manager
 ```
 
+* Run Vela Core
+
+Firstly make sure your cluster has CRDs.
+
+```shell script
+make core-install
+```
+
+Run locally:
+
+```shell script
+make core-run
+```
+
+This command will run controller locally, it will use your local KubeConfig which means you need to have a k8s cluster
+locally. If you don't have a one, we suggest that you could setup up a cluster with [kind](https://kind.sigs.k8s.io/).
+
+## Use
+
+* Create environment
+ 
+```shell script
+vela env init myenv --namespace myenv --email my@email.com --domain kubevela.io 
+```
+
+* Create Component 
+
 For example, use the following command to create and run an application.
+
 ```shell script
-$ go run main.go run containerized app2057 nginx:1.9.4
-Creating AppConfig app2057
-SUCCEED
-
-$ kubectl get oam
-NAME                             WORKLOAD-KIND
-component.core.oam.dev/app2057   ContainerizedWorkload
-
-NAME                                     AGE
-containerizedworkload.core.oam.dev/poc   53m
-
-NAME                                            AGE
-applicationconfiguration.core.oam.dev/app2057   69s
-
-NAME                                                              DEFINITION-NAME
-traitdefinition.core.oam.dev/simplerollouttraits.extend.oam.dev   simplerollouttraits.extend.oam.dev
-
-NAME                                                                  DEFINITION-NAME
-workloaddefinition.core.oam.dev/containerizedworkloads.core.oam.dev   containerizedworkloads.core.oam.dev
-workloaddefinition.core.oam.dev/deployments.apps                      deployments.apps
-workloaddefinition.core.oam.dev/statefulsets.apps                     statefulsets.apps
+$ vela svc deploy mysvc -t webservice --image crccheck/hello-world --port 8000 -a abc
+  App abc deployed
 ```
 
-## E2E test
-```
-$ make e2e-test
-Running Suite: Trait Suite
-==========================
-Random Seed: 1596559178
-Will run 5 of 5 specs
+* Add Trait
 
-Trait env init
-  should print env initiation successful message
-  kubevela/e2e/commonContext.go:14
-Create env succeed, current env is default
-•
-------------------------------
-Trait env switch
-  should show env switch message
-  kubevela/e2e/commonContext.go:40
-Switch env succeed, current env is default
-•
-------------------------------
-Trait run
-  should print successful creation information
-  kubevela/e2e/commonContext.go:76
-Creating AppConfig app-trait-basic
-SUCCEED
-•
-------------------------------
-Trait kubevela attach trait
-  should print successful attached information
-  kubevela/e2e/trait/trait_test.go:24
-Applying trait for app
-Succeeded!
-•
-------------------------------
-Trait delete
-  should print successful deletion information
-  kubevela/e2e/commonContext.go:85
-Deleting AppConfig "app-trait-basic"
-DELETE SUCCEED
-•
-Ran 5 of 5 Specs in 9.717 seconds
-SUCCESS! -- 5 Passed | 0 Failed | 0 Pending | 0 Skipped
-PASS
+```shell script
+$ 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 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 ls
+  SERVICE       	APP      	TYPE	TRAITS	STATUS  	CREATED-TIME
+  mysvc            	abc       	    	      	Deployed 	2020-11-02 11:17:28 +0800 CST
+
+$ vela delete abc
+  Deleting Application "abc"
+  delete apps succeed abc from default
+```
+
+## Tests
+
+### Unit test
+
+```shell script
+make test
+```
+
+### E2E test
+
+**Before e2e test start, make sure you have vela-core running.**
+
+```shell script
+make core-run
+```
+
+Start to test.
+
+```
+make e2e-test
 ```
 
 ## Make a pull request

Makefile

@@ -1,13 +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) -X main.chartTGZSource=$$(cat -) -s -w"
+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
+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))
@@ -19,12 +20,17 @@ endif
 all: build
 
 # Run tests
-test: fmt vet lint
-	go test ./pkg/... -coverprofile cover.out
+test: vet lint
+	go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... ./cmd/...
 
 # Build manager binary
 build: fmt vet lint
-	go run hack/chart/generate.go | go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go
+	go run hack/chart/generate.go
+	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 ./..
@@ -32,26 +38,43 @@ npm-build:
 npm-install:
 	cd dashboard && npm install && cd ./..
 
+doc-gen:
+	rm -r docs/en/cli/*
+	go run hack/docgen/gen.go
+
 generate-source:
 	go run hack/frontend/source.go
 
 cross-build:
-	go run hack/chart/generate.go | GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=3 -output="bin/vela-{{.OS}}-{{.Arch}}" -osarch='$(TARGETS)' ./cmd/vela/
+	go run hack/chart/generate.go
+	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=3 -output="_bin/{{.OS}}-{{.Arch}}/vela" -osarch='$(TARGETS)' ./cmd/vela/
+
+compress:
+	( \
+		cd _bin && \
+		$(DIST_DIRS) cp ../LICENSE {} \; && \
+		$(DIST_DIRS) cp ../README.md {} \; && \
+		$(DIST_DIRS) tar -zcf vela-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r vela-{}.zip {} \; && \
+		sha256sum vela-* > sha256sums.txt \
+	)
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 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:
 	go vet ./...
 
 lint: golangci
-	$(GOLANGCILINT) run -E golint,goimports  ./...
+	$(GOLANGCILINT) run --timeout 10m -E golint,goimports  ./...
 
 # Build the docker image
 docker-build: test
@@ -62,13 +85,15 @@ docker-push:
 	docker push ${IMG}
 
 e2e-setup:
+	bin/vela install --image-pull-policy IfNotPresent --image-repo vela-core-test --image-tag $(GIT_COMMIT)
 	ginkgo version
 	ginkgo -v -r e2e/setup
+	kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
 	bin/vela dashboard &
 
 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
@@ -76,7 +101,12 @@ e2e-api-test:
 
 e2e-cleanup:
 	# Clean up
+	rm -rf ~/.vela
 
+# load docker image to the kind cluster
+kind-load:
+	docker build -t vela-core-test:$(GIT_COMMIT) .
+	kind load docker-image vela-core-test:$(GIT_COMMIT) || { echo >&2 "kind not installed or error loading image: $(IMAGE)"; exit 1; }
 
 # Image URL to use all building/pushing image targets
 IMG ?= vela-core:latest
@@ -88,29 +118,33 @@ core-test: generate fmt vet manifests
 	go test ./pkg/... -coverprofile cover.out
 
 # Build manager binary
-manager: generate fmt vet
+manager: generate fmt vet lint manifests
 	go build -o bin/manager ./cmd/core/main.go
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 core-run: generate fmt vet manifests
 	go run ./cmd/core/main.go
 
-# Install CRDs into a cluster
+# Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient.
 core-install: manifests
-	kustomize build config/crd | kubectl apply -f -
+	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/vela-core/templates/velaConfig.yaml
+	bin/vela workloads
 
-# Uninstall CRDs from a cluster
+# Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient.
 core-uninstall: manifests
-	kustomize build config/crd | kubectl delete -f -
-
-# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
-core-deploy: manifests
-	cd config/manager && kustomize edit set image controller=${IMG}
-	kustomize build config/default | kubectl apply -f -
+	kubectl delete -f charts/vela-core/templates/definitions/
+	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/crds
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=charts/vela-core/crds
+	go generate $(foreach t,pkg api,./$(t)/...)
+	./hack/vela-templates/gen_definitions.sh
 
 # Generate code
 generate: controller-gen
@@ -152,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

PROJECT

@@ -1,3 +1,7 @@
 domain: oam.dev
 repo: github.com/oam-dev/kubevela
+resources:
+- group: standard
+  kind: Route
+  version: v1alpha1
 version: "2"

README.md

@@ -1,134 +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 OAM.
+For developers, KubeVela is an easy-to-use tool that enables them to describe and ship their applications to Kubernetes with minimal effort.
 
-## Install
+For platform builders, KubeVela serves as a framework that empowers them to create developer facing yet highly extensible platforms at ease.
 
-### Prerequisites
-- Kubernetes cluster running Kubernetes v1.15.0 or greater
-- kubectl current context is configured for the target cluster install
-  - ```kubectl config current-context```
+- Slack: [Discuss](https://cloud-native.slack.com/archives/C01BLQ3HTJA)
+- Gitter: [Community](https://gitter.im/oam-dev/community)
 
-### Get the Vela CLI
+> NOTE: KubeVela is still in early stage and iterating quickly. It's currently under preview release.
 
-Download the `vela` binary from the [Releases page](https://github.com/oam-dev/kubevela/releases). Change file mod and add it to `$PATH` to get started.
+## Quick Start
 
-For exmaple:
-```shell
-chmod a+x vela-v0.0.2-darwin-amd64
-sudo mv ./vela-v0.0.2-darwin-amd64 /usr/local/bin/vela
-```
+Quick start guides are available on [this section](https://kubevela.io/#/en/quick-start).
 
-### Install Vela Core
+## Documentation
 
-```shell script
-$ vela install
-- Installing Vela Core:
-- Installing builtin capabilities:
-Successful applied 4 kinds of Workloads and Traits: deployments.apps,containerizedworkloads.core.oam.dev,manualscalertraits.core.oam.dev,simplerollouttraits.extend.oam.dev.
-syncing workload definitions from cluster...
-[WARN]handle template task: #Template.metadata.name: reference "task" not found
-get 5 workload definitions from cluster, syncing...5 workload definitions successfully synced
-syncing trait definitions from cluster...
-[WARN]handle template metricstraits.standard.oam.dev: #Template.metadata.name: reference "metricstraits" not found
-get 2 trait definitions from cluster, syncing...2 trait definitions successfully synced
-- Finished.
-```
+For full documentation, please visit the KubeVela website: [https://kubevela.io](https://kubevela.io/).
 
-## Demos
-
-#### Create ENV
-
-```
-$ vela env init test --namespace test
-Create env succeed, current env is test
-
-$ vela env ls
-NAME           	CURRENT	NAMESPACE
-default             	default
-test    	 	*       test
-
-$ vela env switch default
-Switch env succeed, current env is default
-
-$ vela env delete test
-test deleted
-
-$ vela env delete default
-Error: you can't delete current using default
-```
-
-#### workload run
-```shell script
-$ vela comp run -t deployment app123 -p 80 --image nginx:1.9.4
-Creating AppConfig app123
-SUCCEED
-
-$ vela comp status app123
-```
-
-#### app
-
-```
-$ vela app ls
-app123
-poc08032042
-poc1039
-
-$ vela comp ls
-NAME 	APP  	WORKLOAD  	TRAITS     	STATUS  	CREATED-TIME
-ccc  	ccc  	deployment	           	Deployed	2020-08-27 10:56:41 +0800 CST
-com1 	com1 	          	           	Deployed	2020-08-26 16:45:50 +0800 CST
-com2 	com1 	          	           	Deployed	2020-08-26 16:45:50 +0800 CST
-myapp	myapp	          	route,scale	Deployed	2020-08-19 15:11:17 +0800 CST
-
-$ vela app delete app123
-Deleting AppConfig "app123"
-DELETE SUCCEED
-```
-
-#### Auto-Completion
-
-##### bash
-
-```shell script
-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
-
-```shell script
-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
-
-```shell script
-$ helm uninstall vela-core -n oam-system
-release "vela-core" uninstalled
-```
-
-```shell script
-$ kubectl delete crd workloaddefinitions.core.oam.dev traitdefinitions.core.oam.dev
-customresourcedefinition.apiextensions.k8s.io "workloaddefinitions.core.oam.dev" deleted
-customresourcedefinition.apiextensions.k8s.io "traitdefinitions.core.oam.dev" deleted
-```
-
-```shell script
-$ rm -r ~/.vela
-```
-
-## CONTRIBUTING
-Check out [CONTRIBUTING.md](./CONTRIBUTING.md) to see how to develop with KubeVela.
+## Contributing
+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](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

@@ -0,0 +1,59 @@
+/*
+
+
+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 v1alpha2
+
+import (
+	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.
+
+// ApplicationDeploymentSpec defines the desired state of ApplicationDeployment
+type ApplicationDeploymentSpec struct {
+	//TODO add spec here
+}
+
+// ApplicationDeploymentStatus defines the observed state of ApplicationDeployment
+type ApplicationDeploymentStatus struct {
+	//TODO add status field here
+	runtimev1alpha1.ConditionedStatus `json:",inline"`
+}
+
+// ApplicationDeployment is the Schema for the ApplicationDeployment API
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:categories={oam}
+// +kubebuilder:subresource:status
+type ApplicationDeployment struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ApplicationDeploymentSpec   `json:"spec,omitempty"`
+	Status ApplicationDeploymentStatus `json:"status,omitempty"`
+}
+
+// ApplicationDeploymentList contains a list of ApplicationDeployment
+// +kubebuilder:object:root=true
+type ApplicationDeploymentList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ApplicationDeployment `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&ApplicationDeployment{}, &ApplicationDeploymentList{})
+}

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

@@ -0,0 +1,35 @@
+/*
+
+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 v1alpha2 contains API Schema definitions for the core.oam.dev v1alpha2 API group
+// +kubebuilder:object:generate=true
+// +groupName=core.oam.dev
+package v1alpha2
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: "core.oam.dev", Version: "v1alpha2"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)

api/core.oam.dev/v1alpha2/zz_generated.deepcopy.go

@@ -0,0 +1,115 @@
+// +build !ignore_autogenerated
+
+/*
+
+
+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.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package v1alpha2
+
+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 *ApplicationDeployment) DeepCopyInto(out *ApplicationDeployment) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeployment.
+func (in *ApplicationDeployment) DeepCopy() *ApplicationDeployment {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationDeployment)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationDeployment) 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 *ApplicationDeploymentList) DeepCopyInto(out *ApplicationDeploymentList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ApplicationDeployment, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentList.
+func (in *ApplicationDeploymentList) DeepCopy() *ApplicationDeploymentList {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationDeploymentList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationDeploymentList) 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 *ApplicationDeploymentSpec) DeepCopyInto(out *ApplicationDeploymentSpec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentSpec.
+func (in *ApplicationDeploymentSpec) DeepCopy() *ApplicationDeploymentSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationDeploymentSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationDeploymentStatus) DeepCopyInto(out *ApplicationDeploymentStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDeploymentStatus.
+func (in *ApplicationDeploymentStatus) DeepCopy() *ApplicationDeploymentStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationDeploymentStatus)
+	in.DeepCopyInto(out)
+	return out
+}

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"`
 }
@@ -40,11 +43,13 @@ type Capability struct {
 	Name           string      `json:"name"`
 	Type           CapType     `json:"type"`
 	CueTemplate    string      `json:"template,omitempty"`
+	CueTemplateURI string      `json:"templateURI,omitempty"`
 	Parameters     []Parameter `json:"parameters,omitempty"`
 	DefinitionPath string      `json:"definition"`
 	CrdName        string      `json:"crdName,omitempty"`
 	Center         string      `json:"center,omitempty"`
 	Status         string      `json:"status,omitempty"`
+	Description    string      `json:"description,omitempty"`
 
 	//trait only
 	AppliesTo []string `json:"appliesTo,omitempty"`
@@ -52,28 +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"`
-	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"`
@@ -81,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 {
@@ -100,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
@@ -114,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) {
@@ -131,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,43 +1,53 @@
 package types
 
 const (
-	DefaultOAMNS               = "oam-system"
-	DefaultOAMReleaseName      = "vela-core"
-	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"
-
-	// Indicate which workloadDefinition generate from
-	AnnWorkloadDef = "workload.oam.dev/name"
-	// Indicate which traitDefinition generate from
-	AnnTraitDef = "trait.oam.dev/name"
+	// AnnDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
+	AnnDescription = "definition.oam.dev/description"
 )
 
 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"`
-	Current   string `json:"current,omitempty"`
 	Namespace string `json:"namespace"`
+	Email     string `json:"email,omitempty"`
+	Domain    string `json:"domain,omitempty"`
+
+	// Below are not arguments, should be auto-generated
+	Issuer  string `json:"issuer"`
+	Current string `json:"current,omitempty"`
 }
 
 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

@@ -23,20 +23,20 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// ContainerizedSpec defines the desired state of Containerized
-type ContainerizedSpec struct {
+// PodSpecWorkloadSpec defines the desired state of PodSpecWorkload
+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 containerized
+	// we omit the meta part as it will be exactly the same as the PodSpecWorkload
 	PodSpec v1.PodSpec `json:"podSpec"`
 }
 
-// ContainerizedStatus defines the observed state of Containerized
-type ContainerizedStatus struct {
+// PodSpecWorkloadStatus defines the observed state of PodSpecWorkload
+type PodSpecWorkloadStatus struct {
 	cpv1alpha1.ConditionedStatus `json:",inline"`
 
 	// Resources managed by this workload.
@@ -45,36 +45,40 @@ type ContainerizedStatus struct {
 
 // +kubebuilder:object:root=true
 
-// Containerized is the Schema for the containerizeds API
+// 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 Containerized struct {
+type PodSpecWorkload struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ContainerizedSpec   `json:"spec,omitempty"`
-	Status ContainerizedStatus `json:"status,omitempty"`
+	Spec   PodSpecWorkloadSpec   `json:"spec,omitempty"`
+	Status PodSpecWorkloadStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// ContainerizedList contains a list of Containerized
-type ContainerizedList struct {
+// PodSpecWorkloadList contains a list of PodSpecWorkload
+type PodSpecWorkloadList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Containerized `json:"items"`
+	Items           []PodSpecWorkload `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&Containerized{}, &ContainerizedList{})
+	SchemeBuilder.Register(&PodSpecWorkload{}, &PodSpecWorkloadList{})
 }
 
-var _ oam.Workload = &Containerized{}
+var _ oam.Workload = &PodSpecWorkload{}
 
-func (in *Containerized) SetConditions(c ...cpv1alpha1.Condition) {
+// SetConditions set condition for this CR
+func (in *PodSpecWorkload) SetConditions(c ...cpv1alpha1.Condition) {
 	in.Status.SetConditions(c...)
 }
 
-func (in *Containerized) GetCondition(c cpv1alpha1.ConditionType) cpv1alpha1.Condition {
+// 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

@@ -0,0 +1,161 @@
+/*
+
+
+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 (
+	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
+	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// RouteSpec defines the desired state of Route
+type RouteSpec struct {
+	// WorkloadReference to the workload whose metrics needs to be exposed
+	WorkloadReference runtimev1alpha1.TypedReference `json:"workloadRef,omitempty"`
+
+	// Host is the host of the route
+	Host string `json:"host"`
+
+	// TLS indicate route trait will create SSL secret using cert-manager with specified issuer
+	// If this is nil, route trait will use a selfsigned issuer
+	TLS *TLS `json:"tls,omitempty"`
+
+	// Rules contain multiple rules of route
+	Rules []Rule `json:"rules,omitempty"`
+
+	// Provider indicate which ingress controller implementation the route trait will use, by default it's nginx-ingress
+	Provider string `json:"provider,omitempty"`
+}
+
+// Rule defines to route rule
+type Rule struct {
+	// Name will become the suffix of underlying ingress created by this rule, if not, will use index as suffix.
+	Name string `json:"name,omitempty"`
+
+	// Path is location Path, default for "/"
+	Path string `json:"path,omitempty"`
+
+	// RewriteTarget will rewrite request from Path to RewriteTarget path.
+	RewriteTarget string `json:"rewriteTarget,omitempty"`
+
+	// CustomHeaders pass a custom list of headers to the backend service.
+	CustomHeaders map[string]string `json:"customHeaders,omitempty"`
+
+	// DefaultBackend will become the ingress default backend if the backend is not available
+	DefaultBackend *runtimev1alpha1.TypedReference `json:"defaultBackend,omitempty"`
+
+	// Backend indicate how to connect backend service
+	// If it's nil, will auto discovery
+	Backend *Backend `json:"backend,omitempty"`
+}
+
+// TLS defines certificate issuer and type for mTLS configuration
+type TLS struct {
+	IssuerName string `json:"issuerName,omitempty"`
+
+	// Type indicate the issuer is ClusterIssuer or Issuer(namespace issuer), by default, it's Issuer
+	// +kubebuilder:default:=Issuer
+	Type IssuerType `json:"type,omitempty"`
+}
+
+// IssuerType defines the type of issuer
+type IssuerType string
+
+const (
+	// 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.
+type Backend struct {
+	// ReadTimeout used for setting read timeout duration for backend service, the unit is second.
+	ReadTimeout int `json:"readTimeout,omitempty"`
+	// SendTimeout used for setting send timeout duration for backend service, the unit is second.
+	SendTimeout int `json:"sendTimeout,omitempty"`
+	// BackendService specifies the backend K8s service and port, it's optional
+	BackendService *BackendServiceRef `json:"backendService,omitempty"`
+}
+
+// BackendServiceRef specifies the backend K8s service and port, if specified, the two fields are all required
+type BackendServiceRef struct {
+	// Port allow you direct specify backend service port.
+	Port intstr.IntOrString `json:"port"`
+	// ServiceName allow you direct specify K8s service for backend service.
+	ServiceName string `json:"serviceName"`
+}
+
+// RouteStatus defines the observed state of Route
+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
+type Route struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   RouteSpec   `json:"spec,omitempty"`
+	Status RouteStatus `json:"status,omitempty"`
+}
+
+// RouteList contains a list of Route
+// +kubebuilder:object:root=true
+type RouteList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Route `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Route{}, &RouteList{})
+}
+
+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 Route Trait.
+func (r *Route) GetWorkloadReference() runtimev1alpha1.TypedReference {
+	return r.Spec.WorkloadReference
+}
+
+// SetWorkloadReference of this Route Trait.
+func (r *Route) SetWorkloadReference(rt runtimev1alpha1.TypedReference) {
+	r.Spec.WorkloadReference = rt
+}

api/v1alpha1/zz_generated.deepcopy.go

@@ -26,7 +26,7 @@ import (
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Containerized) DeepCopyInto(out *Containerized) {
+func (in *Autoscaler) DeepCopyInto(out *Autoscaler) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -34,18 +34,18 @@ func (in *Containerized) DeepCopyInto(out *Containerized) {
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Containerized.
-func (in *Containerized) DeepCopy() *Containerized {
+// 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(Containerized)
+	out := new(Autoscaler)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Containerized) DeepCopyObject() runtime.Object {
+func (in *Autoscaler) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -53,31 +53,31 @@ func (in *Containerized) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerizedList) DeepCopyInto(out *ContainerizedList) {
+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([]Containerized, len(*in))
+		*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 ContainerizedList.
-func (in *ContainerizedList) DeepCopy() *ContainerizedList {
+// 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(ContainerizedList)
+	out := new(AutoscalerList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ContainerizedList) DeepCopyObject() runtime.Object {
+func (in *AutoscalerList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -85,43 +85,87 @@ func (in *ContainerizedList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerizedSpec) DeepCopyInto(out *ContainerizedSpec) {
+func (in *AutoscalerSpec) DeepCopyInto(out *AutoscalerSpec) {
 	*out = *in
-	if in.Replicas != nil {
-		in, out := &in.Replicas, &out.Replicas
+	if in.MinReplicas != nil {
+		in, out := &in.MinReplicas, &out.MinReplicas
 		*out = new(int32)
 		**out = **in
 	}
-	in.PodSpec.DeepCopyInto(&out.PodSpec)
+	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 ContainerizedSpec.
-func (in *ContainerizedSpec) DeepCopy() *ContainerizedSpec {
+// 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(ContainerizedSpec)
+	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 *ContainerizedStatus) DeepCopyInto(out *ContainerizedStatus) {
+func (in *AutoscalerStatus) DeepCopyInto(out *AutoscalerStatus) {
 	*out = *in
 	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-	if in.Resources != nil {
-		in, out := &in.Resources, &out.Resources
-		*out = make([]corev1alpha1.TypedReference, len(*in))
-		copy(*out, *in)
-	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerizedStatus.
-func (in *ContainerizedStatus) DeepCopy() *ContainerizedStatus {
+// 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(ContainerizedStatus)
+	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
+	if in.BackendService != nil {
+		in, out := &in.BackendService, &out.BackendService
+		*out = new(BackendServiceRef)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Backend.
+func (in *Backend) DeepCopy() *Backend {
+	if in == nil {
+		return nil
+	}
+	out := new(Backend)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BackendServiceRef) DeepCopyInto(out *BackendServiceRef) {
+	*out = *in
+	out.Port = in.Port
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackendServiceRef.
+func (in *BackendServiceRef) DeepCopy() *BackendServiceRef {
+	if in == nil {
+		return nil
+	}
+	out := new(BackendServiceRef)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -206,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
+		}
 	}
 }
 
@@ -223,6 +270,252 @@ func (in *MetricsTraitStatus) DeepCopy() *MetricsTraitStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PodSpecWorkload) DeepCopyInto(out *PodSpecWorkload) {
+	*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 PodSpecWorkload.
+func (in *PodSpecWorkload) DeepCopy() *PodSpecWorkload {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkload)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *PodSpecWorkload) 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 *PodSpecWorkloadList) DeepCopyInto(out *PodSpecWorkloadList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]PodSpecWorkload, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadList.
+func (in *PodSpecWorkloadList) DeepCopy() *PodSpecWorkloadList {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkloadList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *PodSpecWorkloadList) 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 *PodSpecWorkloadSpec) DeepCopyInto(out *PodSpecWorkloadSpec) {
+	*out = *in
+	if in.Replicas != nil {
+		in, out := &in.Replicas, &out.Replicas
+		*out = new(int32)
+		**out = **in
+	}
+	in.PodSpec.DeepCopyInto(&out.PodSpec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadSpec.
+func (in *PodSpecWorkloadSpec) DeepCopy() *PodSpecWorkloadSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkloadSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PodSpecWorkloadStatus) DeepCopyInto(out *PodSpecWorkloadStatus) {
+	*out = *in
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+	if in.Resources != nil {
+		in, out := &in.Resources, &out.Resources
+		*out = make([]corev1alpha1.TypedReference, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodSpecWorkloadStatus.
+func (in *PodSpecWorkloadStatus) DeepCopy() *PodSpecWorkloadStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PodSpecWorkloadStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Route) DeepCopyInto(out *Route) {
+	*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 Route.
+func (in *Route) DeepCopy() *Route {
+	if in == nil {
+		return nil
+	}
+	out := new(Route)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Route) 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 *RouteList) DeepCopyInto(out *RouteList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Route, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouteList.
+func (in *RouteList) DeepCopy() *RouteList {
+	if in == nil {
+		return nil
+	}
+	out := new(RouteList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RouteList) 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 *RouteSpec) DeepCopyInto(out *RouteSpec) {
+	*out = *in
+	out.WorkloadReference = in.WorkloadReference
+	if in.TLS != nil {
+		in, out := &in.TLS, &out.TLS
+		*out = new(TLS)
+		**out = **in
+	}
+	if in.Rules != nil {
+		in, out := &in.Rules, &out.Rules
+		*out = make([]Rule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouteSpec.
+func (in *RouteSpec) DeepCopy() *RouteSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(RouteSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RouteStatus) DeepCopyInto(out *RouteStatus) {
+	*out = *in
+	if in.Ingresses != nil {
+		in, out := &in.Ingresses, &out.Ingresses
+		*out = make([]corev1alpha1.TypedReference, len(*in))
+		copy(*out, *in)
+	}
+	if in.Service != nil {
+		in, out := &in.Service, &out.Service
+		*out = new(corev1alpha1.TypedReference)
+		**out = **in
+	}
+	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouteStatus.
+func (in *RouteStatus) DeepCopy() *RouteStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(RouteStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Rule) DeepCopyInto(out *Rule) {
+	*out = *in
+	if in.CustomHeaders != nil {
+		in, out := &in.CustomHeaders, &out.CustomHeaders
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	if in.DefaultBackend != nil {
+		in, out := &in.DefaultBackend, &out.DefaultBackend
+		*out = new(corev1alpha1.TypedReference)
+		**out = **in
+	}
+	if in.Backend != nil {
+		in, out := &in.Backend, &out.Backend
+		*out = new(Backend)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Rule.
+func (in *Rule) DeepCopy() *Rule {
+	if in == nil {
+		return nil
+	}
+	out := new(Rule)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ScapeServiceEndPoint) DeepCopyInto(out *ScapeServiceEndPoint) {
 	*out = *in
@@ -250,3 +543,55 @@ func (in *ScapeServiceEndPoint) DeepCopy() *ScapeServiceEndPoint {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLS) DeepCopyInto(out *TLS) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
+func (in *TLS) DeepCopy() *TLS {
+	if in == nil {
+		return nil
+	}
+	out := new(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/third_party/grafana/download-grafana.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Download and unpack operator Lifecycle Manager (coreos)
-curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.15.1/install.sh | bash -s 0.15.1

charts/third_party/grafana/grafana-operator.yaml

@@ -1,24 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: my-grafana-operator
----
-apiVersion: operators.coreos.com/v1
-kind: OperatorGroup
-metadata:
-  name: operatorgroup
-  namespace: my-grafana-operator
-spec:
-  targetNamespaces:
-  - my-grafana-operator
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  name: my-grafana-operator
-  namespace: my-grafana-operator
-spec:
-  channel: alpha
-  name: grafana-operator
-  source: operatorhubio-catalog
-  sourceNamespace: olm

charts/third_party/prometheus/monitoring-namespace.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    mornitoring: oam
-  name: monitoring

charts/third_party/prometheus/prometheus-operator-0podmonitorCustomResourceDefinition.yaml

@@ -1,265 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: podmonitors.monitoring.coreos.com
-spec:
-  group: monitoring.coreos.com
-  names:
-    kind: PodMonitor
-    listKind: PodMonitorList
-    plural: podmonitors
-    singular: podmonitor
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: PodMonitor defines monitoring for a set of pods.
-        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: Specification of desired Pod selection for target discovery
-              by Prometheus.
-            properties:
-              jobLabel:
-                description: The label to use to retrieve the job name from.
-                type: string
-              namespaceSelector:
-                description: Selector to select which namespaces the Endpoints objects
-                  are discovered from.
-                properties:
-                  any:
-                    description: Boolean describing whether all namespaces are selected
-                      in contrast to a list restricting them.
-                    type: boolean
-                  matchNames:
-                    description: List of namespace names.
-                    items:
-                      type: string
-                    type: array
-                type: object
-              podMetricsEndpoints:
-                description: A list of endpoints allowed as part of this PodMonitor.
-                items:
-                  description: PodMetricsEndpoint defines a scrapeable endpoint of
-                    a Kubernetes Pod serving Prometheus metrics.
-                  properties:
-                    honorLabels:
-                      description: HonorLabels chooses the metric's labels on collisions
-                        with target labels.
-                      type: boolean
-                    honorTimestamps:
-                      description: HonorTimestamps controls whether Prometheus respects
-                        the timestamps present in scraped data.
-                      type: boolean
-                    interval:
-                      description: Interval at which metrics should be scraped
-                      type: string
-                    metricRelabelings:
-                      description: MetricRelabelConfigs to apply to samples before
-                        ingestion.
-                      items:
-                        description: 'RelabelConfig allows dynamic rewriting of the
-                          label set, being applied to samples before ingestion. It
-                          defines `<metric_relabel_configs>`-section of Prometheus
-                          configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                        properties:
-                          action:
-                            description: Action to perform based on regex matching.
-                              Default is 'replace'
-                            type: string
-                          modulus:
-                            description: Modulus to take of the hash of the source
-                              label values.
-                            format: int64
-                            type: integer
-                          regex:
-                            description: Regular expression against which the extracted
-                              value is matched. Default is '(.*)'
-                            type: string
-                          replacement:
-                            description: Replacement value against which a regex replace
-                              is performed if the regular expression matches. Regex
-                              capture groups are available. Default is '$1'
-                            type: string
-                          separator:
-                            description: Separator placed between concatenated source
-                              label values. default is ';'.
-                            type: string
-                          sourceLabels:
-                            description: The source labels select values from existing
-                              labels. Their content is concatenated using the configured
-                              separator and matched against the configured regular
-                              expression for the replace, keep, and drop actions.
-                            items:
-                              type: string
-                            type: array
-                          targetLabel:
-                            description: Label to which the resulting value is written
-                              in a replace action. It is mandatory for replace actions.
-                              Regex capture groups are available.
-                            type: string
-                        type: object
-                      type: array
-                    params:
-                      additionalProperties:
-                        items:
-                          type: string
-                        type: array
-                      description: Optional HTTP URL parameters
-                      type: object
-                    path:
-                      description: HTTP path to scrape for metrics.
-                      type: string
-                    port:
-                      description: Name of the pod port this endpoint refers to. Mutually
-                        exclusive with targetPort.
-                      type: string
-                    proxyUrl:
-                      description: ProxyURL eg http://proxyserver:2195 Directs scrapes
-                        to proxy through this endpoint.
-                      type: string
-                    relabelings:
-                      description: 'RelabelConfigs to apply to samples before ingestion.
-                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
-                      items:
-                        description: 'RelabelConfig allows dynamic rewriting of the
-                          label set, being applied to samples before ingestion. It
-                          defines `<metric_relabel_configs>`-section of Prometheus
-                          configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                        properties:
-                          action:
-                            description: Action to perform based on regex matching.
-                              Default is 'replace'
-                            type: string
-                          modulus:
-                            description: Modulus to take of the hash of the source
-                              label values.
-                            format: int64
-                            type: integer
-                          regex:
-                            description: Regular expression against which the extracted
-                              value is matched. Default is '(.*)'
-                            type: string
-                          replacement:
-                            description: Replacement value against which a regex replace
-                              is performed if the regular expression matches. Regex
-                              capture groups are available. Default is '$1'
-                            type: string
-                          separator:
-                            description: Separator placed between concatenated source
-                              label values. default is ';'.
-                            type: string
-                          sourceLabels:
-                            description: The source labels select values from existing
-                              labels. Their content is concatenated using the configured
-                              separator and matched against the configured regular
-                              expression for the replace, keep, and drop actions.
-                            items:
-                              type: string
-                            type: array
-                          targetLabel:
-                            description: Label to which the resulting value is written
-                              in a replace action. It is mandatory for replace actions.
-                              Regex capture groups are available.
-                            type: string
-                        type: object
-                      type: array
-                    scheme:
-                      description: HTTP scheme to use for scraping.
-                      type: string
-                    scrapeTimeout:
-                      description: Timeout after which the scrape is ended
-                      type: string
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      description: 'Deprecated: Use ''port'' instead.'
-                      x-kubernetes-int-or-string: true
-                  type: object
-                type: array
-              podTargetLabels:
-                description: PodTargetLabels transfers labels on the Kubernetes Pod
-                  onto the target.
-                items:
-                  type: string
-                type: array
-              sampleLimit:
-                description: SampleLimit defines per-scrape limit on number of scraped
-                  samples that will be accepted.
-                format: int64
-                type: integer
-              selector:
-                description: Selector to select Pod objects.
-                properties:
-                  matchExpressions:
-                    description: matchExpressions is a list of label selector requirements.
-                      The requirements are ANDed.
-                    items:
-                      description: A label selector requirement is a selector that
-                        contains values, a key, and an operator that relates the key
-                        and values.
-                      properties:
-                        key:
-                          description: key is the label key that the selector applies
-                            to.
-                          type: string
-                        operator:
-                          description: operator represents a key's relationship to
-                            a set of values. Valid operators are In, NotIn, Exists
-                            and DoesNotExist.
-                          type: string
-                        values:
-                          description: values is an array of string values. If the
-                            operator is In or NotIn, the values array must be non-empty.
-                            If the operator is Exists or DoesNotExist, the values
-                            array must be empty. This array is replaced during a strategic
-                            merge patch.
-                          items:
-                            type: string
-                          type: array
-                      required:
-                      - key
-                      - operator
-                      type: object
-                    type: array
-                  matchLabels:
-                    additionalProperties:
-                      type: string
-                    description: matchLabels is a map of {key,value} pairs. A single
-                      {key,value} in the matchLabels map is equivalent to an element
-                      of matchExpressions, whose key field is "key", the operator
-                      is "In", and the values array contains only "value". The requirements
-                      are ANDed.
-                    type: object
-                type: object
-            required:
-            - podMetricsEndpoints
-            - selector
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/third_party/prometheus/prometheus-operator-0probeCustomResourceDefinition.yaml

@@ -1,212 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: probes.monitoring.coreos.com
-spec:
-  group: monitoring.coreos.com
-  names:
-    kind: Probe
-    listKind: ProbeList
-    plural: probes
-    singular: probe
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: Probe defines monitoring for a set of static targets or ingresses.
-        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: Specification of desired Ingress selection for target discovery
-              by Prometheus.
-            properties:
-              interval:
-                description: Interval at which targets are probed using the configured
-                  prober. If not specified Prometheus' global scrape interval is used.
-                type: string
-              jobName:
-                description: The job name assigned to scraped metrics by default.
-                type: string
-              module:
-                description: 'The module to use for probing specifying how to probe
-                  the target. Example module configuring in the blackbox exporter:
-                  https://github.com/prometheus/blackbox_exporter/blob/master/example.yml'
-                type: string
-              prober:
-                description: Specification for the prober to use for probing targets.
-                  The prober.URL parameter is required. Targets cannot be probed if
-                  left empty.
-                properties:
-                  path:
-                    description: Path to collect metrics from. Defaults to `/probe`.
-                    type: string
-                  scheme:
-                    description: HTTP scheme to use for scraping. Defaults to `http`.
-                    type: string
-                  url:
-                    description: Mandatory URL of the prober.
-                    type: string
-                required:
-                - url
-                type: object
-              scrapeTimeout:
-                description: Timeout for scraping metrics from the Prometheus exporter.
-                type: string
-              targets:
-                description: Targets defines a set of static and/or dynamically discovered
-                  targets to be probed using the prober.
-                properties:
-                  ingress:
-                    description: Ingress defines the set of dynamically discovered
-                      ingress objects which hosts are considered for probing.
-                    properties:
-                      namespaceSelector:
-                        description: Select Ingress objects by namespace.
-                        properties:
-                          any:
-                            description: Boolean describing whether all namespaces
-                              are selected in contrast to a list restricting them.
-                            type: boolean
-                          matchNames:
-                            description: List of namespace names.
-                            items:
-                              type: string
-                            type: array
-                        type: object
-                      relabelingConfigs:
-                        description: 'RelabelConfigs to apply to samples before ingestion.
-                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
-                        items:
-                          description: 'RelabelConfig allows dynamic rewriting of
-                            the label set, being applied to samples before ingestion.
-                            It defines `<metric_relabel_configs>`-section of Prometheus
-                            configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
-                          properties:
-                            action:
-                              description: Action to perform based on regex matching.
-                                Default is 'replace'
-                              type: string
-                            modulus:
-                              description: Modulus to take of the hash of the source
-                                label values.
-                              format: int64
-                              type: integer
-                            regex:
-                              description: Regular expression against which the extracted
-                                value is matched. Default is '(.*)'
-                              type: string
-                            replacement:
-                              description: Replacement value against which a regex
-                                replace is performed if the regular expression matches.
-                                Regex capture groups are available. Default is '$1'
-                              type: string
-                            separator:
-                              description: Separator placed between concatenated source
-                                label values. default is ';'.
-                              type: string
-                            sourceLabels:
-                              description: The source labels select values from existing
-                                labels. Their content is concatenated using the configured
-                                separator and matched against the configured regular
-                                expression for the replace, keep, and drop actions.
-                              items:
-                                type: string
-                              type: array
-                            targetLabel:
-                              description: Label to which the resulting value is written
-                                in a replace action. It is mandatory for replace actions.
-                                Regex capture groups are available.
-                              type: string
-                          type: object
-                        type: array
-                      selector:
-                        description: Select Ingress objects by labels.
-                        properties:
-                          matchExpressions:
-                            description: matchExpressions is a list of label selector
-                              requirements. The requirements are ANDed.
-                            items:
-                              description: A label selector requirement is a selector
-                                that contains values, a key, and an operator that
-                                relates the key and values.
-                              properties:
-                                key:
-                                  description: key is the label key that the selector
-                                    applies to.
-                                  type: string
-                                operator:
-                                  description: operator represents a key's relationship
-                                    to a set of values. Valid operators are In, NotIn,
-                                    Exists and DoesNotExist.
-                                  type: string
-                                values:
-                                  description: values is an array of string values.
-                                    If the operator is In or NotIn, the values array
-                                    must be non-empty. If the operator is Exists or
-                                    DoesNotExist, the values array must be empty.
-                                    This array is replaced during a strategic merge
-                                    patch.
-                                  items:
-                                    type: string
-                                  type: array
-                              required:
-                              - key
-                              - operator
-                              type: object
-                            type: array
-                          matchLabels:
-                            additionalProperties:
-                              type: string
-                            description: matchLabels is a map of {key,value} pairs.
-                              A single {key,value} in the matchLabels map is equivalent
-                              to an element of matchExpressions, whose key field is
-                              "key", the operator is "In", and the values array contains
-                              only "value". The requirements are ANDed.
-                            type: object
-                        type: object
-                    type: object
-                  staticConfig:
-                    description: 'StaticConfig defines static targets which are considers
-                      for probing. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#static_config.'
-                    properties:
-                      labels:
-                        additionalProperties:
-                          type: string
-                        description: Labels assigned to all metrics scraped from the
-                          targets.
-                        type: object
-                      static:
-                        description: Targets is a list of URLs to probe using the
-                          configured prober.
-                        items:
-                          type: string
-                        type: array
-                    type: object
-                type: object
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/third_party/prometheus/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml

@@ -1,94 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  creationTimestamp: null
-  name: prometheusrules.monitoring.coreos.com
-spec:
-  group: monitoring.coreos.com
-  names:
-    kind: PrometheusRule
-    listKind: PrometheusRuleList
-    plural: prometheusrules
-    singular: prometheusrule
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: PrometheusRule defines alerting rules for a Prometheus instance
-        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: Specification of desired alerting rule definitions for Prometheus.
-            properties:
-              groups:
-                description: Content of Prometheus rule file
-                items:
-                  description: 'RuleGroup is a list of sequentially evaluated recording
-                    and alerting rules. Note: PartialResponseStrategy is only used
-                    by ThanosRuler and will be ignored by Prometheus instances.  Valid
-                    values for this field are ''warn'' or ''abort''.  More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response'
-                  properties:
-                    interval:
-                      type: string
-                    name:
-                      type: string
-                    partial_response_strategy:
-                      type: string
-                    rules:
-                      items:
-                        description: Rule describes an alerting or recording rule.
-                        properties:
-                          alert:
-                            type: string
-                          annotations:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          expr:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            x-kubernetes-int-or-string: true
-                          for:
-                            type: string
-                          labels:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          record:
-                            type: string
-                        required:
-                        - expr
-                        type: object
-                      type: array
-                  required:
-                  - name
-                  - rules
-                  type: object
-                type: array
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

charts/third_party/prometheus/prometheus-operator-clusterRole.yaml

@@ -1,82 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.41.1
-  name: prometheus-operator
-rules:
-- apiGroups:
-  - monitoring.coreos.com
-  resources:
-  - alertmanagers
-  - alertmanagers/finalizers
-  - prometheuses
-  - prometheuses/finalizers
-  - thanosrulers
-  - thanosrulers/finalizers
-  - servicemonitors
-  - podmonitors
-  - probes
-  - prometheusrules
-  verbs:
-  - '*'
-- apiGroups:
-  - apps
-  resources:
-  - statefulsets
-  verbs:
-  - '*'
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - secrets
-  verbs:
-  - '*'
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - list
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - services
-  - services/finalizers
-  - endpoints
-  verbs:
-  - get
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create

charts/third_party/prometheus/prometheus-operator-clusterRoleBinding.yaml

@@ -1,34 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.41.1
-  name: prometheus-operator
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: prometheus-operator
-subjects:
-- kind: ServiceAccount
-  name: prometheus-operator
-  namespace: monitoring
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.41.1
-  name: prometheus-operator-admin
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: "cluster-admin"
-subjects:
-  - kind: ServiceAccount
-    name: prometheus-operator
-    namespace: monitoring

charts/third_party/prometheus/prometheus-operator-deployment.yaml

@@ -1,60 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.41.1
-  name: prometheus-operator
-  namespace: monitoring
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: controller
-      app.kubernetes.io/name: prometheus-operator
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: controller
-        app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: v0.41.1
-    spec:
-      containers:
-      - args:
-        - --kubelet-service=kube-system/kubelet
-        - --logtostderr=true
-        - --config-reloader-image=jimmidyson/configmap-reload:v0.4.0
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.41.1
-        image: quay.io/coreos/prometheus-operator:v0.41.1
-        name: prometheus-operator
-        ports:
-        - containerPort: 8080
-          name: http
-        resources:
-          limits:
-            cpu: 200m
-            memory: 200Mi
-          requests:
-            cpu: 100m
-            memory: 100Mi
-        securityContext:
-          allowPrivilegeEscalation: false
-      - args:
-        - --logtostderr
-        - --secure-listen-address=:8443
-        - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
-        - --upstream=http://127.0.0.1:8080/
-        image: quay.io/coreos/kube-rbac-proxy:v0.4.1
-        name: kube-rbac-proxy
-        ports:
-        - containerPort: 8443
-          name: https
-        securityContext:
-          runAsUser: 65534
-      nodeSelector:
-        beta.kubernetes.io/os: linux
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 65534
-      serviceAccountName: prometheus-operator

charts/third_party/prometheus/prometheus-operator-service.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.41.1
-  name: prometheus-operator
-  namespace: monitoring
-spec:
-  clusterIP: None
-  ports:
-  - name: https
-    port: 8443
-    targetPort: https
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator

charts/third_party/prometheus/prometheus-operator-serviceAccount.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.41.1
-  name: prometheus-operator
-  namespace: monitoring

charts/vela-core/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vela-core
-description: A Helm chart for Kubernetes
+description: A Helm chart for Kube Vela core
 
 # A chart can be either an 'application' or a 'library' chart.
 #

charts/vela-core/crds/core.oam.dev_applicationconfigurations.yaml

@@ -101,16 +101,29 @@ spec:
                                 to match a value.
                               properties:
                                 fieldPath:
+                                  description: FieldPath specifies got value from
+                                    workload/trait object
                                   type: string
                                 op:
                                   description: ConditionOperator specifies the operator
                                     to match a value.
                                   type: string
                                 value:
+                                  description: Value specifies an expected value This
+                                    is mutually exclusive with ValueFrom
                                   type: string
+                                valueFrom:
+                                  description: ValueFrom specifies expected value
+                                    from AppConfig This is mutually exclusive with
+                                    Value
+                                  properties:
+                                    fieldPath:
+                                      type: string
+                                  required:
+                                  - fieldPath
+                                  type: object
                               required:
                               - op
-                              - value
                               type: object
                             type: array
                           fieldPath:
@@ -233,16 +246,29 @@ spec:
                                       requirement to match a value.
                                     properties:
                                       fieldPath:
+                                        description: FieldPath specifies got value
+                                          from workload/trait object
                                         type: string
                                       op:
                                         description: ConditionOperator specifies the
                                           operator to match a value.
                                         type: string
                                       value:
+                                        description: Value specifies an expected value
+                                          This is mutually exclusive with ValueFrom
                                         type: string
+                                      valueFrom:
+                                        description: ValueFrom specifies expected
+                                          value from AppConfig This is mutually exclusive
+                                          with Value
+                                        properties:
+                                          fieldPath:
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
                                     required:
                                     - op
-                                    - value
                                     type: object
                                   type: array
                                 fieldPath:
@@ -338,6 +364,8 @@ spec:
                           - kind
                           - name
                           type: object
+                        reason:
+                          type: string
                         to:
                           description: DependencyToObject represents the object that
                             dependency data goes to.
@@ -365,10 +393,47 @@ spec:
                           type: object
                       required:
                       - from
+                      - reason
                       - to
                       type: object
                     type: array
                 type: object
+              historyWorkloads:
+                description: HistoryWorkloads will record history but still working
+                  revision workloads.
+                items:
+                  description: HistoryWorkload contain the old component revision
+                    that are still running
+                  properties:
+                    revision:
+                      description: component revision of this workload
+                      type: string
+                    workloadRef:
+                      description: Reference to running 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
+                  type: object
+                type: array
+              observedGeneration:
+                description: The generation observed by the appConfig controller.
+                format: int64
+                type: integer
               status:
                 description: Status is a place holder for a customized controller
                   to fill if it needs a single place to summarize the status of the
@@ -482,8 +547,6 @@ spec:
                       type: object
                   type: object
                 type: array
-            required:
-            - dependency
             type: object
         type: object
     served: true

charts/vela-core/crds/core.oam.dev_applicationdeployments.yaml

@@ -0,0 +1,90 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.5
+  creationTimestamp: null
+  name: applicationdeployments.core.oam.dev
+spec:
+  group: core.oam.dev
+  names:
+    categories:
+    - oam
+    kind: ApplicationDeployment
+    listKind: ApplicationDeploymentList
+    plural: applicationdeployments
+    singular: applicationdeployment
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: ApplicationDeployment is the Schema for the ApplicationDeployment
+          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: ApplicationDeploymentSpec defines the desired state of ApplicationDeployment
+            type: object
+          status:
+            description: ApplicationDeploymentStatus defines the observed state of
+              ApplicationDeployment
+            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
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/vela-core/crds/core.oam.dev_components.yaml

@@ -72,6 +72,7 @@ spec:
                         will specify parameter values using this name.
                       type: string
                     required:
+                      default: false
                       description: Required specifies whether or not a value for this
                         parameter must be supplied when authoring an ApplicationConfiguration.
                       type: boolean
@@ -82,7 +83,9 @@ spec:
                 type: array
               workload:
                 description: A Workload that will be created for each ApplicationConfiguration
-                  that includes this Component. Workloads must be defined by a WorkloadDefinition.
+                  that includes this Component. Workload is an instance of a workloadDefinition.
+                  We either use the GVK info or a special "type" field in the workload
+                  to associate the content of the workload with its workloadDefinition
                 type: object
                 x-kubernetes-embedded-resource: true
                 x-kubernetes-preserve-unknown-fields: true
@@ -137,6 +140,10 @@ spec:
                 - name
                 - revision
                 type: object
+              observedGeneration:
+                description: The generation observed by the component controller.
+                format: int64
+                type: integer
             type: object
         type: object
     served: true

charts/vela-core/crds/core.oam.dev_healthscopes.yaml

@@ -119,10 +119,76 @@ spec:
                   - type
                   type: object
                 type: array
-              health:
-                type: string
+              healthConditions:
+                description: WorkloadHealthConditions represents health condition
+                  of workloads in the scope
+                items:
+                  description: WorkloadHealthCondition represents informative health
+                    condition.
+                  properties:
+                    componentName:
+                      description: ComponentName represents the component name if
+                        target is a workload
+                      type: string
+                    diagnosis:
+                      type: string
+                    healthStatus:
+                      description: HealthStatus represents health status strings.
+                      type: string
+                    targetWorkload:
+                      description: A TypedReference refers to an object by Name, Kind,
+                        and APIVersion. It is commonly used to reference cluster-scoped
+                        objects or objects where the namespace is already known.
+                      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
+                    workloadStatus:
+                      description: WorkloadStatus represents status of workloads whose
+                        HealthStatus is UNKNOWN.
+                      type: string
+                  required:
+                  - healthStatus
+                  type: object
+                type: array
+              scopeHealthCondition:
+                description: ScopeHealthCondition represents health condition summary
+                  of the scope
+                properties:
+                  healthStatus:
+                    description: HealthStatus represents health status strings.
+                    type: string
+                  healthyWorkloads:
+                    format: int64
+                    type: integer
+                  total:
+                    format: int64
+                    type: integer
+                  unhealthyWorkloads:
+                    format: int64
+                    type: integer
+                  unknownWorkloads:
+                    format: int64
+                    type: integer
+                required:
+                - healthStatus
+                type: object
             required:
-            - health
+            - scopeHealthCondition
             type: object
         type: object
     served: true

charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml

@@ -85,6 +85,16 @@ spec:
                   builders
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              podSpecPath:
+                description: PodSpecPath indicates where/if this workload has K8s
+                  podSpec field if one workload has podSpec, trait can do lot's of
+                  assumption such as port, env, volume fields.
+                type: string
+              revisionLabel:
+                description: RevisionLabel indicates which label for underlying resources(e.g.
+                  pods) of this workload can be used by trait to create resource selectors(e.g.
+                  label selector for pods).
+                type: string
             required:
             - definitionRef
             type: object

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

@@ -6,22 +6,22 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
-  name: containerizeds.standard.oam.dev
+  name: podspecworkloads.standard.oam.dev
 spec:
   group: standard.oam.dev
   names:
     categories:
     - oam
-    kind: Containerized
-    listKind: ContainerizedList
-    plural: containerizeds
-    singular: containerized
+    kind: PodSpecWorkload
+    listKind: PodSpecWorkloadList
+    plural: podspecworkloads
+    singular: podspecworkload
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Containerized is the Schema for the containerizeds API
+        description: PodSpecWorkload is the Schema for the PodSpec API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -36,11 +36,11 @@ spec:
           metadata:
             type: object
           spec:
-            description: ContainerizedSpec defines the desired state of Containerized
+            description: PodSpecWorkloadSpec defines the desired state of PodSpecWorkload
             properties:
               podSpec:
                 description: PodSpec describes the pods that will be created, we omit
-                  the meta part as it will be exactly the same as the containerized
+                  the meta part as it will be exactly the same as the PodSpecWorkload
                 properties:
                   activeDeadlineSeconds:
                     description: Optional duration in seconds the pod may be active
@@ -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,10 +5694,9 @@ spec:
                 type: integer
             required:
             - podSpec
-            - replicas
             type: object
           status:
-            description: ContainerizedStatus defines the observed state of Containerized
+            description: PodSpecWorkloadStatus defines the observed state of PodSpecWorkload
             properties:
               conditions:
                 description: Conditions of the resource.

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

@@ -0,0 +1,257 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.2.5
+  creationTimestamp: null
+  name: routes.standard.oam.dev
+spec:
+  group: standard.oam.dev
+  names:
+    categories:
+    - oam
+    kind: Route
+    listKind: RouteList
+    plural: routes
+    singular: route
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Route is the Schema for the routes 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: RouteSpec defines the desired state of Route
+            properties:
+              host:
+                description: Host is the host of the route
+                type: string
+              provider:
+                description: Provider indicate which ingress controller implementation
+                  the route trait will use, by default it's nginx-ingress
+                type: string
+              rules:
+                description: Rules contain multiple rules of route
+                items:
+                  description: Rule defines to route rule
+                  properties:
+                    backend:
+                      description: Backend indicate how to connect backend service
+                        If it's nil, will auto discovery
+                      properties:
+                        backendService:
+                          description: BackendService specifies the backend K8s service
+                            and port, it's optional
+                          properties:
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Port allow you direct specify backend service
+                                port.
+                              x-kubernetes-int-or-string: true
+                            serviceName:
+                              description: ServiceName allow you direct specify K8s
+                                service for backend service.
+                              type: string
+                          required:
+                          - port
+                          - serviceName
+                          type: object
+                        readTimeout:
+                          description: ReadTimeout used for setting read timeout duration
+                            for backend service, the unit is second.
+                          type: integer
+                        sendTimeout:
+                          description: SendTimeout used for setting send timeout duration
+                            for backend service, the unit is second.
+                          type: integer
+                      type: object
+                    customHeaders:
+                      additionalProperties:
+                        type: string
+                      description: CustomHeaders pass a custom list of headers to
+                        the backend service.
+                      type: object
+                    defaultBackend:
+                      description: DefaultBackend will become the ingress default
+                        backend if the backend is not available
+                      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
+                    name:
+                      description: Name will become the suffix of underlying ingress
+                        created by this rule, if not, will use index as suffix.
+                      type: string
+                    path:
+                      description: Path is location Path, default for "/"
+                      type: string
+                    rewriteTarget:
+                      description: RewriteTarget will rewrite request from Path to
+                        RewriteTarget path.
+                      type: string
+                  type: object
+                type: array
+              tls:
+                description: TLS indicate route trait will create SSL secret using
+                  cert-manager with specified issuer If this is nil, route trait will
+                  use a selfsigned issuer
+                properties:
+                  issuerName:
+                    type: string
+                  type:
+                    default: Issuer
+                    description: Type indicate the issuer is ClusterIssuer or Issuer(namespace
+                      issuer), by default, it's Issuer
+                    type: string
+                type: object
+              workloadRef:
+                description: WorkloadReference to the workload whose metrics needs
+                  to be exposed
+                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:
+            - host
+            type: object
+          status:
+            description: RouteStatus defines the observed state of Route
+            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
+              ingresses:
+                items:
+                  description: A TypedReference refers to an object by Name, Kind,
+                    and APIVersion. It is commonly used to reference cluster-scoped
+                    objects or objects where the namespace is already known.
+                  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
+                type: array
+              service:
+                description: A TypedReference refers to an object by Name, Kind, and
+                  APIVersion. It is commonly used to reference cluster-scoped objects
+                  or objects where the namespace is already known.
+                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
+              status:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/vela-core/templates/backends.yaml

@@ -1,42 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: backend-service
-  annotations:
-    definition.oam.dev/apiVersion: "core.oam.dev/v1alpha2"
-    definition.oam.dev/kind: "ContainerizedWorkload"
-spec:
-  definitionRef:
-    name: containerizeds.standard.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-    - apiVersion: v1
-      kind: Service
-  extension:
-    template: |
-      #Template: {
-      	apiVersion: "core.oam.dev/v1alpha2"
-      	kind:       "ContainerizedWorkload"
-      	metadata: name: containerized.name
-      	spec: {
-      		containers: [{
-              image: containerized.image
-              name:  containerized.name
-              ports: [{
-                  containerPort: containerized.port
-                  protocol:      "TCP"
-                  name:          "default"
-              }]
-      		}]
-      	}
-      }
-      containerized: {
-      	name: string
-      	// +usage=specify app image
-      	// +short=i
-      	image: string
-      	// +usage=specify port for container
-      	// +short=p
-      	port: *6379 | int
-      }

charts/vela-core/templates/containerized.yaml

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

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

@@ -2,6 +2,7 @@ apiVersion: core.oam.dev/v1alpha2
 kind: ScopeDefinition
 metadata:
   name: healthscopes.core.oam.dev
+  namespace: default
 spec:
   workloadRefsPath: spec.workloadRefs
   allowComponentOverlap: true

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

@@ -1,25 +1,27 @@
 apiVersion: core.oam.dev/v1alpha2
 kind: TraitDefinition
 metadata:
-  name: manualscalertraits.core.oam.dev
   annotations:
-    definition.oam.dev/apiVersion: "core.oam.dev/v1alpha2"
-    definition.oam.dev/kind: "ManualScalerTrait"
+    definition.oam.dev/description: "Manually scale the app"
+  name: scaler
 spec:
   appliesToWorkloads:
-    - core.oam.dev/v1alpha2.ContainerizedWorkload
+    - webservice
+    - worker
   definitionRef:
     name: manualscalertraits.core.oam.dev
+  workloadRefPath: spec.workloadRef
   extension:
-    template: |
-      #Template: {
+    template: |-
+      output: {
       	apiVersion: "core.oam.dev/v1alpha2"
       	kind:       "ManualScalerTrait"
       	spec: {
-      		replicaCount: scale.replica
+      		replicaCount: parameter.replicas
       	}
       }
-      scale: {
+      parameter: {
       	//+short=r
-      	replica: *2 | int
+      	replicas: *1 | int
       }
+      

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/kubevela-controller.yaml

@@ -18,7 +18,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: manager-rolebinding
+  name: {{ include "kubevela.fullname" . }}:manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -33,7 +33,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: leader-election-role
+  name: {{ include "kubevela.fullname" . }}:leader-election-role
 rules:
   - apiGroups:
       - ""
@@ -66,11 +66,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: leader-election-rolebinding
+  name: {{ include "kubevela.fullname" . }}:leader-election-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: leader-election-role
+  name: {{ include "kubevela.fullname" . }}:leader-election-role
 subjects:
   - kind: ServiceAccount
     name: {{ include "kubevela.serviceAccountName" . }}
@@ -80,6 +80,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kubevela.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "kubevela.labels" . | nindent 4 }}
 spec:
@@ -110,6 +111,7 @@ spec:
             - "--use-webhook=true"
             - "--webhook-port={{ .Values.webhookService.port }}"
             - "--webhook-cert-dir={{ .Values.certificate.mountPath }}"
+            - "--health-addr=:{{ .Values.healthCheck.port }}"
           {{ end }}
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
@@ -120,6 +122,21 @@ spec:
             - containerPort: {{ .Values.webhookService.port }}
               name: webhook-server
               protocol: TCP
+            - containerPort: {{ .Values.healthCheck.port }}
+              name: healthz
+              protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: healthz
+            initialDelaySeconds: 90
+            periodSeconds: 5
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 90
+            periodSeconds: 5
           volumeMounts:
             - mountPath: {{ .Values.certificate.mountPath }}
               name: tls-cert-vol
@@ -141,4 +158,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
     {{- toYaml . | nindent 8 }}
-  {{- end }}
+  {{- end }}

charts/vela-core/templates/metricstraits.yaml

@@ -1,41 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: metricstraits.standard.oam.dev
-spec:
-  appliesToWorkloads:
-    - containerizedworkloads.core.oam.dev
-    - clonesetworkloads.apps.kruise.io
-    - deployments.apps
-    - statefulsets.apps
-  definitionRef:
-    name: metricstraits.standard.oam.dev
-  workloadRefPath: spec.workloadRef
-  extension:
-    template: |
-      #Template: {
-      	apiVersion: "standard.oam.dev/v1alpha1"
-      	kind:       "MetricsTrait"
-      	metadata:
-          name: metricstraits.name
-      	spec: {
-      		containers: [{
-              image: containerized.image
-              name:  containerized.name
-              ports: [{
-                  containerPort: containerized.port
-                  protocol:      "TCP"
-                  name:          "default"
-              }]
-      		}]
-      	}
-      }
-      containerized: {
-      	name: string
-      	// +usage=specify app image
-      	// +short=i
-      	image: string
-      	// +usage=specify port for container
-      	// +short=p
-      	port: *6379 | int
-      }

charts/vela-core/templates/tasks.yaml

@@ -1,47 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: task
-  annotations:
-    definition.oam.dev/apiVersion: "v1"
-    definition.oam.dev/kind: "Job"
-spec:
-  definitionRef:
-    name: jobs
-  extension:
-    defaultTraits:
-    - monitor
-    - logging
-    template: |
-      #Template: {
-        apiVersion: "v1"
-        kind:       "Job"
-        metadata: name: task
-        spec: {
-          parallelism: taskSpec.count
-          completions: taskSpec.count
-          template:
-            spec:
-            containers: [{
-               image: taskSpec.image
-                 name:  taskSpec.name
-                   ports: [{
-                     containerPort: taskSpec.port
-                       protocol:      "TCP"
-                       name:          "default"
-                   }]
-                }]
-            }
-          }
-          taskSpec: {
-            // +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
-          }

charts/vela-core/templates/velaConfig.yaml

@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vela-config
+  # TODO: Currently namespace MUST be vela-system
+  namespace: vela-system
+data:
+  servicemonitors.monitoring.coreos.com: |
+    {
+      "repo": "prometheus-community",
+      "urL": "https://prometheus-community.github.io/helm-charts",
+      "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/templates/webhook.yaml

@@ -3,8 +3,8 @@
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
+  namespace: {{ .Release.Namespace }}
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.certificate.certificateName }}
 webhooks:
@@ -31,7 +31,7 @@ webhooks:
       service:
         name: {{ template "kubevela.name" . }}-webhook
         namespace: {{ .Release.Namespace }}
-        path: /mutate-standard-oam-dev-v1alpha1-containerized
+        path: /mutate-standard-oam-dev-v1alpha1-podspecworkload
     failurePolicy: Fail
     name: mcontainerized.kb.io
     rules:
@@ -43,14 +43,14 @@ webhooks:
           - CREATE
           - UPDATE
         resources:
-          - Containerized
+          - podspecworkloads
 
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
+  namespace: {{ .Release.Namespace }}
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.certificate.certificateName }}
 webhooks:
@@ -78,7 +78,7 @@ webhooks:
       service:
         name: {{ template "kubevela.name" . }}-webhook
         namespace: {{ .Release.Namespace }}
-        path: /validate-standard-oam-dev-v1alpha1-containerized
+        path: /validate-standard-oam-dev-v1alpha1-podspecworkload
     failurePolicy: Fail
     name: vcontainerized.kb.io
     rules:
@@ -89,15 +89,15 @@ webhooks:
         operations:
           - CREATE
           - UPDATE
-          - DELETE
         resources:
-          - Containerized
+          - podspecworkloads
 
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "kubevela.name" . }}-webhook
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kubevela.labels" . | nindent 4 }}
 spec:
@@ -113,7 +113,7 @@ spec:
 ---
 # The following manifests contain a self-signed issuer CR and a certificate CR.
 # More document can be found at https://docs.cert-manager.io
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ .Values.certificate.issuerName | quote  }}
@@ -121,7 +121,7 @@ spec:
   selfSigned: {}
 
 ---
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ .Values.certificate.certificateName }}

charts/vela-core/templates/webservices.yaml

@@ -1,43 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: web-service
-  annotations:
-    definition.oam.dev/apiVersion: "core.oam.dev/v1alpha2"
-    definition.oam.dev/kind: "ContainerizedWorkload"
-spec:
-  definitionRef:
-    name: containerizeds.standard.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-    - apiVersion: v1
-      kind: Service
-  extension:
-    template: |
-      #Template: {
-      	apiVersion: "core.oam.dev/v1alpha2"
-      	kind:       "ContainerizedWorkload"
-      	metadata:
-          name: containerized.name
-      	spec: {
-      		containers: [{
-              image: containerized.image
-              name:  containerized.name
-              ports: [{
-                  containerPort: containerized.port
-                  protocol:      "TCP"
-                  name:          "default"
-              }]
-      		}]
-      	}
-      }
-      containerized: {
-      	name: string
-      	// +usage=specify app image
-      	// +short=i
-      	image: string
-      	// +usage=specify port for container
-      	// +short=p
-      	port: *6379 | int
-      }

charts/vela-core/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 useWebhook: true
 image:
   repository: oamdev/vela-core
-  tag: 0.1
+  tag: latest
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -63,6 +63,9 @@ webhookService:
   type: ClusterIP
   port: 9443
 
+healthCheck:
+  port: 9440
+
 nodeSelector: {}
 
 tolerations: []

cmd/core/main.go

@@ -1,10 +1,16 @@
 package main
 
 import (
+	"errors"
 	"flag"
+	"fmt"
 	"io"
 	"os"
+	"os/signal"
+	"path/filepath"
 	"strconv"
+	"syscall"
+	"time"
 
 	monitoring "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
@@ -12,30 +18,51 @@ 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"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	velacoreoamdev "github.com/oam-dev/kubevela/api/core.oam.dev/v1alpha2"
 	velacore "github.com/oam-dev/kubevela/api/v1alpha1"
 	velacontroller "github.com/oam-dev/kubevela/pkg/controller"
+	"github.com/oam-dev/kubevela/pkg/controller/dependency"
 	velawebhook "github.com/oam-dev/kubevela/pkg/webhook"
 )
 
-var scheme = runtime.NewScheme()
+const (
+	kubevelaName = "kubevela"
+)
+
+var (
+	setupLog           = ctrl.Log.WithName(kubevelaName)
+	scheme             = runtime.NewScheme()
+	waitSecretTimeout  = 90 * time.Second
+	waitSecretInterval = 2 * time.Second
+)
 
 func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
+	_ = crdv1.AddToScheme(scheme)
 	_ = oamcore.AddToScheme(scheme)
 	_ = monitoring.AddToScheme(scheme)
 	_ = velacore.AddToScheme(scheme)
+	_ = velacoreoamdev.AddToScheme(scheme)
 	_ = injectorv1alpha1.AddToScheme(scheme)
+	_ = certmanager.AddToScheme(scheme)
+	_ = kedav1alpha1.AddToScheme(scheme)
 	// +kubebuilder:scaffold:scheme
 }
 
@@ -47,6 +74,7 @@ func main() {
 	var webhookPort int
 	var useWebhook, useTraitInjector bool
 	var controllerArgs oamcontroller.Args
+	var healthAddr string
 
 	flag.BoolVar(&useWebhook, "use-webhook", false, "Enable Admission Webhook")
 	flag.BoolVar(&useTraitInjector, "use-trait-injector", false, "Enable TraitInjector")
@@ -60,6 +88,7 @@ func main() {
 	flag.BoolVar(&logCompress, "log-compress", true, "Enable compression on the rotated logs.")
 	flag.IntVar(&controllerArgs.RevisionLimit, "revision-limit", 50,
 		"RevisionLimit is the maximum number of revisions that will be maintained. The default value is 50.")
+	flag.StringVar(&healthAddr, "health-addr", ":9440", "The address the health endpoint binds to.")
 	flag.Parse()
 
 	// setup logging
@@ -79,24 +108,44 @@ func main() {
 		o.DestWritter = w
 	}))
 
-	setupLog := ctrl.Log.WithName("vela-runtime")
+	// install dependency charts first
+	k8sClient, err := client.New(ctrl.GetConfigOrDie(), client.Options{Scheme: scheme})
+	if err != nil {
+		setupLog.Error(err, "unable to create a kubernetes client")
+		os.Exit(1)
+	}
+	go dependency.Install(k8sClient)
+
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: metricsAddr,
-		LeaderElection:     enableLeaderElection,
-		LeaderElectionID:   "vela-runtime",
-		Port:               webhookPort,
-		CertDir:            certDir,
+		Scheme:                 scheme,
+		MetricsBindAddress:     metricsAddr,
+		LeaderElection:         enableLeaderElection,
+		LeaderElectionID:       kubevelaName,
+		Port:                   webhookPort,
+		CertDir:                certDir,
+		HealthProbeBindAddress: healthAddr,
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to create a controller manager")
 		os.Exit(1)
 	}
 
+	if err := registerHealthChecks(mgr); err != nil {
+		setupLog.Error(err, "unable to register ready/health checks")
+		os.Exit(1)
+	}
+
 	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")
+			os.Exit(1)
+		}
 	}
 
 	if err = oamv1alpha2.Setup(mgr, controllerArgs, logging.NewLogrLogger(setupLog)); err != nil {
@@ -128,8 +177,88 @@ 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
+func registerHealthChecks(mgr ctrl.Manager) error {
+	setupLog.Info("creating readiness/health check")
+	if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil {
+		return err
+	}
+
+	if err := mgr.AddHealthzCheck("ping", healthz.Ping); err != nil {
+		return err
+	}
+	return nil
+}
+
+// waitWebhookSecretVolume waits for webhook secret ready to avoid mgr running crash
+func waitWebhookSecretVolume(certDir string, timeout, interval time.Duration) error {
+	start := time.Now()
+	for {
+		time.Sleep(interval)
+		if time.Since(start) > timeout {
+			return fmt.Errorf("getting webhook secret timeout after %s", timeout.String())
+		}
+		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) {
+			ready := func() bool {
+				f, err := os.Open(filepath.Clean(certDir))
+				if err != nil {
+					return false
+				}
+				// 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
 }

cmd/core/main_test.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var (
+	testdir      = "testdir"
+	testTimeout  = 2 * time.Second
+	testInterval = 1 * time.Second
+)
+
+func TestGinkgo(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "test main")
+}
+
+var _ = Describe("test waitSecretVolume", func() {
+	BeforeEach(func() {
+		err := os.MkdirAll(testdir, 0755)
+		Expect(err).NotTo(HaveOccurred())
+	})
+	AfterEach(func() {
+		os.RemoveAll(testdir)
+	})
+
+	When("dir not exist or empty", func() {
+		It("return timeout error", func() {
+			err := waitWebhookSecretVolume(testdir, testTimeout, testInterval)
+			Expect(err).To(HaveOccurred())
+			By("remove dir")
+			os.RemoveAll(testdir)
+			err = waitWebhookSecretVolume(testdir, testTimeout, testInterval)
+			Expect(err).To(HaveOccurred())
+		})
+	})
+
+	When("dir contains empty file", func() {
+		It("return timeout error", func() {
+			By("add empty file")
+			_, err := os.Create(testdir + "/emptyFile")
+			Expect(err).NotTo(HaveOccurred())
+			err = waitWebhookSecretVolume(testdir, testTimeout, testInterval)
+			Expect(err).To(HaveOccurred())
+		})
+	})
+
+	When("files in dir are not empty", func() {
+		It("return nil", func() {
+			By("add non-empty file")
+			_, err := os.Create(testdir + "/file")
+			Expect(err).NotTo(HaveOccurred())
+			err = ioutil.WriteFile(testdir+"/file", []byte("test"), os.ModeAppend)
+			Expect(err).NotTo(HaveOccurred())
+			err = waitWebhookSecretVolume(testdir, testTimeout, testInterval)
+			Expect(err).NotTo(HaveOccurred())
+		})
+	})
+
+})

cmd/vela/fake/chart_source.go

@@ -0,0 +1,5 @@
+package fake
+
+// ChartSource is a base64-encoded, gzipped tarball of the default Helm chart(charts/vela-core).
+// Its value is initialized at build time. This whole file will be rewrite at that time, please don't change this file.
+var ChartSource string

cmd/vela/main.go

@@ -1,174 +1,19 @@
 package main
 
 import (
-	"flag"
-	"fmt"
 	"math/rand"
 	"os"
-	"runtime"
 	"time"
 
-	"github.com/oam-dev/kubevela/api/types"
-	"github.com/oam-dev/kubevela/cmd/vela/fake"
 	"github.com/oam-dev/kubevela/pkg/commands"
-	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
-	"github.com/oam-dev/kubevela/pkg/utils/system"
-	"github.com/oam-dev/kubevela/version"
-
-	"github.com/crossplane/oam-kubernetes-runtime/apis/core"
-	"github.com/gosuri/uitable"
-	"github.com/spf13/cobra"
-	k8sruntime "k8s.io/apimachinery/pkg/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/klog"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
-var (
-	scheme = k8sruntime.NewScheme()
-)
-
-// chartTGZSource is a base64-encoded, gzipped tarball of the default Helm chart.
-// Its value is initialized at build time.
-var chartTGZSource string
-
-func init() {
-	_ = clientgoscheme.AddToScheme(scheme)
-
-	_ = core.AddToScheme(scheme)
-	// +kubebuilder:scaffold:scheme
-}
-
 func main() {
 	rand.Seed(time.Now().UnixNano())
 
-	command := newCommand()
+	command := commands.NewCommand()
 
 	if err := command.Execute(); err != nil {
 		os.Exit(1)
 	}
 }
-
-func newCommand() *cobra.Command {
-	ioStream := cmdutil.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}
-
-	cmds := &cobra.Command{
-		Use:                "vela",
-		DisableFlagParsing: true,
-		Run: func(cmd *cobra.Command, args []string) {
-			allCommands := cmd.Commands()
-			cmd.Printf("✈️  A Micro App Platform for Kubernetes.\n\nUsage:\n  vela [flags]\n  vela [command]\n\nAvailable Commands:\n\n")
-			PrintHelpByTag(cmd, allCommands, types.TypeStart)
-			PrintHelpByTag(cmd, allCommands, types.TypeApp)
-			PrintHelpByTag(cmd, allCommands, types.TypeTraits)
-			PrintHelpByTag(cmd, allCommands, types.TypeOthers)
-			PrintHelpByTag(cmd, allCommands, types.TypeSystem)
-			cmd.Println("Flags:")
-			cmd.Println("  -h, --help   help for vela")
-			cmd.Println()
-			cmd.Println(`Use "vela [command] --help" for more information about a command.`)
-		},
-		SilenceUsage: true,
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return nil, cobra.ShellCompDirectiveNoFileComp
-		},
-	}
-	cmds.PersistentFlags().StringP("env", "e", "", "specify env name for application")
-	restConf, err := config.GetConfig()
-	if err != nil {
-		fmt.Println("get kubeconfig err", err)
-		os.Exit(1)
-	}
-
-	commandArgs := types.Args{
-		Config: restConf,
-		Schema: scheme,
-	}
-
-	if err := system.InitDirs(); err != nil {
-		fmt.Println("InitDir err", err)
-		os.Exit(1)
-	}
-
-	cmds.AddCommand(
-		// Getting Start
-		commands.NewInstallCommand(commandArgs, chartTGZSource, ioStream),
-		commands.NewEnvCommand(commandArgs, ioStream),
-
-		// Getting Start
-		NewVersionCommand(),
-
-		// Apps
-		commands.NewAppsCommand(commandArgs, ioStream),
-
-		// Workloads
-		commands.AddCompCommands(commandArgs, ioStream),
-
-		// Capability Systems
-		commands.CapabilityCommandGroup(commandArgs, ioStream),
-
-		// System
-		commands.SystemCommandGroup(commandArgs, ioStream),
-		commands.NewCompletionCommand(),
-
-		commands.NewTraitsCommand(ioStream),
-		commands.NewWorkloadsCommand(ioStream),
-
-		commands.NewDashboardCommand(commandArgs, ioStream, fake.FrontendSource),
-
-		commands.NewLogsCommand(commandArgs, ioStream),
-	)
-
-	// Traits
-	if err = commands.AddTraitCommands(cmds, commandArgs, ioStream); err != nil {
-		fmt.Println("Add trait commands from traitDefinition err", err)
-		os.Exit(1)
-	}
-
-	// this is for mute klog
-	fset := flag.NewFlagSet("logs", flag.ContinueOnError)
-	klog.InitFlags(fset)
-	_ = fset.Set("v", "-1")
-	return cmds
-}
-
-func PrintHelpByTag(cmd *cobra.Command, all []*cobra.Command, tag string) {
-	cmd.Printf("  %s:\n\n", tag)
-	table := uitable.New()
-	for _, c := range all {
-		if val, ok := c.Annotations[types.TagCommandType]; ok && val == tag {
-			table.AddRow("    "+c.Use, c.Long)
-			for _, subcmd := range c.Commands() {
-				table.AddRow("      "+subcmd.Use, "  "+subcmd.Long)
-			}
-		}
-	}
-	cmd.Println(table.String())
-	if tag == types.TypeTraits {
-		if len(table.Rows) > 0 {
-			cmd.Println()
-		}
-		cmd.Println("    Want more? < install more capabilities by `vela cap` >")
-	}
-	cmd.Println()
-}
-
-func NewVersionCommand() *cobra.Command {
-	return &cobra.Command{
-		Use:   "version",
-		Short: "Prints out build version information",
-		Long:  "Prints out build version information",
-		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Printf(`Version: %v
-GitRevision: %v
-GolangVersion: %v
-`,
-				version.VelaVersion,
-				version.GitRevision,
-				runtime.Version())
-		},
-		Annotations: map[string]string{
-			types.TagCommandType: types.TypeStart,
-		},
-	}
-}

codecov.yml

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

config/samples/traits/route.yaml

@@ -1,42 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: ingresses.networking.k8s.io
-  annotations:
-    "definition.oam.dev/apiVersion": "networking.k8s.io/v1beta1"
-    "definition.oam.dev/kind": "Ingress"
-spec:
-  revisionEnabled: true
-  appliesToWorkloads:
-    - core.oam.dev/v1alpha2.ContainerizedWorkload
-    - deployments.apps
-  definitionRef:
-    name: ingresses.networking.k8s.io
-  extension:
-    install:
-      helm:
-        repo: stable
-        name: nginx-ingress
-        url: https://kubernetes-charts.storage.googleapis.com/
-        version: 1.41.2
-    template: |
-      #Template: {
-      	apiVersion: "networking.k8s.io/v1beta1"
-      	kind:       "Ingress"
-      	spec: {
-      		rules: [{
-      			host: route.domain
-      			http: paths: [{
-      				backend: {
-      					serviceName: route.service
-      					servicePort: route.port
-      				}}]
-      		}]
-      	}
-      }
-      route: {
-      	domain:  string
-      	port:    *80 | int
-      	service: string
-      }
-

config/samples/traits/simplerollouttrait_definition.yaml

@@ -1,30 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: TraitDefinition
-metadata:
-  name: simplerollouttraits.extend.oam.dev
-  annotations:
-    "definition.oam.dev/apiVersion": "extend.oam.dev/v1alpha2"
-    "definition.oam.dev/kind": "SimpleRolloutTrait"
-spec:
-  revisionEnabled: true
-  appliesToWorkloads:
-    - core.oam.dev/v1alpha2.ContainerizedWorkload
-    - deployments.apps
-  definitionRef:
-    name: simplerollouttraits.extend.oam.dev
-  extension:
-    template: |
-      #Template: {
-      	apiVersion: "extend.oam.dev/v1alpha2"
-      	kind:       "SimpleRolloutTrait"
-      	spec: {
-      		replica:        rollout.replica
-      		maxUnavailable: rollout.maxUnavailable
-      		batch:          rollout.batch
-      	}
-      }
-      rollout: {
-      	replica:        *3 | int
-      	maxUnavailable: *1 | int
-      	batch:          *2 | int
-      }

config/samples/workloads/containerizedworkload_definition.yaml

@@ -1,43 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: containerizedworkloads.core.oam.dev
-  annotations:
-    definition.oam.dev/apiVersion: "core.oam.dev/v1alpha2"
-    definition.oam.dev/kind: "ContainerizedWorkload"
-spec:
-  definitionRef:
-    name: containerizedworkloads.core.oam.dev
-  childResourceKinds:
-    - apiVersion: apps/v1
-      kind: Deployment
-    - apiVersion: v1
-      kind: Service
-  extension:
-    template: |
-      #Template: {
-      	apiVersion: "core.oam.dev/v1alpha2"
-      	kind:       "ContainerizedWorkload"
-      	metadata: name: containerized.name
-      	spec: {
-      		containers: [{
-      			image: containerized.image
-      			name:  containerized.name
-      			ports: [{
-      				containerPort: containerized.port
-      				protocol:      "TCP"
-      				name:          "default"
-      			}]
-      		}]
-      	}
-      }
-      containerized: {
-      	name: string
-      	// +usage=specify app image
-      	// +short=i
-      	image: string
-      	// +usage=specify port for container
-      	// +short=p
-      	port: *6379 | int
-      }
-

config/samples/workloads/deployment_definition.yaml

@@ -1,52 +0,0 @@
-apiVersion: core.oam.dev/v1alpha2
-kind: WorkloadDefinition
-metadata:
-  name: deployments.apps
-  annotations:
-    definition.oam.dev/apiVersion: "apps/v1"
-    definition.oam.dev/kind: "Deployment"
-spec:
-  definitionRef:
-    name: deployments.apps
-  extension:
-    template: |
-      #Template: {
-      	apiVersion: "apps/v1"
-      	kind:       "Deployment"
-      	metadata: name: deployment.name
-      	spec: {
-      		selector:
-      			matchLabels:
-      				app: deployment.name
-      		template: {
-      			metadata:
-      				labels:
-      					app: deployment.name
-      			spec: containers: [{
-      				image: deployment.image
-      				name:  deployment.name
-      				env:   deployment.env
-      				ports: [{
-      					containerPort: deployment.port
-      					protocol:      "TCP"
-      					name:          "default"
-      				}]
-      			}]
-      		}
-      	}
-      }
-
-      deployment: {
-      	name: string
-      	// +usage=specify app image
-      	// +short=i
-      	image: string
-      	// +usage=specify port for container
-      	// +short=p
-      	port: *8080 | int
-      	env: [...{
-      		name:  string
-      		value: string
-      	}]
-      }
-

config/webhook/manifests.yaml

@@ -29,9 +29,9 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-standard-oam-dev-v1alpha1-containerized
+      path: /mutate-standard-oam-dev-v1alpha1-podspecworkload
   failurePolicy: Fail
-  name: mcontainerized.kb.io
+  name: mpodspecworkload.kb.io
   rules:
   - apiGroups:
     - standard.oam.dev
@@ -41,7 +41,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - Containerized
+    - PodSpecWorkload
 
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1
@@ -74,9 +74,9 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-standard-oam-dev-v1alpha1-containerized
+      path: /validate-standard-oam-dev-v1alpha1-podspecworkload
   failurePolicy: Fail
-  name: vcontainerized.kb.io
+  name: vpodspecworkload.kb.io
   rules:
   - apiGroups:
     - standard.oam.dev
@@ -87,4 +87,4 @@ webhooks:
     - UPDATE
     - DELETE
     resources:
-    - Containerized
+    - PodSpecWorkload

dashboard/config/config.js

@@ -12,9 +12,7 @@ export default defineConfig({
     hmr: true,
   },
   locale: {
-    // default zh-CN
     default: 'en-US',
-    // default true, when it is true, will use `navigator.language` overwrite default
     antd: false,
     baseNavigator: false,
   },
@@ -36,22 +34,14 @@ export default defineConfig({
           routes: [
             {
               path: '/',
-              // redirect: `/${envname}/ApplicationList`,
               redirect: `/ApplicationList`,
             },
             {
               name: 'ApplicationList',
               icon: 'table',
-              // path: `/${envname}/ApplicationList`,
               path: `/ApplicationList`,
               component: './ApplicationList',
             },
-            {
-              name: 'ApplicationList.ApplicationListDetail',
-              hideInMenu: true,
-              path: '/ApplicationList/ApplicationListDetail',
-              component: './ApplicationList/ApplicationListDetail',
-            },
             {
               name: 'ApplicationList.WorkloadDetail',
               icon: 'smile',
@@ -67,35 +57,22 @@ export default defineConfig({
               hideInMenu: true,
             },
             {
-              name: 'ApplicationList.CreateApplication',
+              name: 'ApplicationList.Components',
               hideInMenu: true,
-              path: '/ApplicationList/CreateApplication',
-              component: './ApplicationList/CreateApplication',
+              path: '/ApplicationList/:appName/Components',
+              component: './ApplicationList/Components',
+            },
+            {
+              name: 'ApplicationList.Components.createComponent',
+              hideInMenu: true,
+              path: '/ApplicationList/:appName/createComponent',
+              component: './ApplicationList/CreateComponent',
             },
             {
               name: 'Workload',
               icon: 'table',
               path: '/Workload',
               routes: [
-                // {
-                //   name: 'Deployment',
-                //   icon: 'table',
-                //   path: '/Workload/Deployment',
-                //   component: './Workload/Deployment',
-                // },
-                // {
-                //   name: 'Containerized',
-                //   icon: 'smile',
-                //   path: '/Workload/Containerized',
-                //   component: './Workload/Containerized',
-                // },
-                // {
-                //   name: 'Detail',
-                //   icon: 'smile',
-                //   path: '/Workload/Detail',
-                //   component: './Workload/Detail',
-                //   hideInMenu: true,
-                // },
                 {
                   name: 'WorkloadItem',
                   icon: 'smile',
@@ -109,25 +86,6 @@ export default defineConfig({
               name: 'Traits',
               icon: 'table',
               routes: [
-                // {
-                //   name: 'Scale',
-                //   icon: 'table',
-                //   path: '/Traits/Scale',
-                //   component: './Traits/Scale',
-                // },
-                // {
-                //   name: 'Rollout',
-                //   icon: 'smile',
-                //   path: '/Traits/Rollout',
-                //   component: './Traits/Rollout',
-                // },
-                // {
-                //   name: 'Detail',
-                //   icon: 'smile',
-                //   path: '/Traits/Detail',
-                //   component: './Traits/Detail',
-                //   hideInMenu: true,
-                // },
                 {
                   name: 'TraitItem',
                   icon: 'smile',
@@ -136,12 +94,6 @@ export default defineConfig({
                 },
               ],
             },
-            // {
-            //   name: 'Release',
-            //   icon: 'table',
-            //   path: '/Release',
-            //   component: './Release',
-            // },
             {
               name: 'Capability',
               icon: 'table',
@@ -183,8 +135,13 @@ export default defineConfig({
   ],
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
-    // ...darkTheme,
+    // 主题配置
     'primary-color': defaultSettings.primaryColor,
+    'link-color': defaultSettings.linkColor,
+    'link-hover-color': defaultSettings.linkHoverColor,
+    'disabled-bg': defaultSettings.disabledBg,
+    'disabled-color': defaultSettings.disabledColor,
+    'btn-disable-color': defaultSettings.btnDisableColor,
   },
   // @ts-ignore
   title: false,

dashboard/config/defaultSettings.js

@@ -1,14 +1,19 @@
 const proSettings = {
   navTheme: 'dark',
-  // 拂晓蓝
-  primaryColor: '#1890ff',
+  // 主题颜色配置
+  primaryColor: '#1B58F4', // 全局主色
+  linkColor: '#1B58F4', // 链接色
+  linkHoverColor: '#1B58F4',
+  disabledBg: '#EBEBEB', // 失效背景色,
+  disabledColor: '#BEBEBE', // 失效文本色,
+  btnDisableColor: '#A4A4A4', // 禁用btn文字颜色
   layout: 'side',
   contentWidth: 'Fluid',
   fixedHeader: false,
   fixSiderbar: true,
   colorWeak: false,
   menu: {
-    locale: true,
+    locale: false,
   },
   title: 'Micro App Engine',
   pwa: false,

dashboard/config/proxy.js

@@ -8,11 +8,8 @@
 export default {
   dev: {
     '/api': {
-      target: 'http://123.56.222.218:8081/',
+      target: 'http://127.0.0.1:38081/',
       changeOrigin: true,
-      // pathRewrite: {
-      //   "^/api": "",
-      // },
     },
   },
   test: {

dashboard/src/components/AttachOneTrait/index.jsx

@@ -35,34 +35,44 @@ export default class CreateTraitItem extends React.PureComponent {
     return this.formRefStep2.current.getFieldsValue();
   };
 
+  resetFields = () => {
+    return this.formRefStep2.current.resetFields();
+  };
+
+  validateFields = () => {
+    return this.formRefStep2.current.validateFields();
+  };
+
   setDefaultValue = (traitType) => {
     this.formRefStep2.current.setFieldsValue({ name: traitType });
     this.traitSelectChange(traitType);
   };
 
   traitSelectChange = async (value, isType = 1) => {
-    const res = await this.props.dispatch({
-      type: 'trait/getTraitByName',
-      payload: {
-        traitName: value,
-      },
-    });
-    this.setState({
-      parameters: res.parameters,
-    });
-    if (isType === 2) {
-      this.formRefStep2.current.setFieldsValue(this.props.initialValues);
-    } else if (isType) {
-      // 进行默认值填写
-      const parameters = _.get(res, 'parameters', []);
-      if (parameters.length) {
-        const initialObj = {};
-        parameters.forEach((item) => {
-          if (item.default) {
-            initialObj[item.name] = item.default;
-          }
-        });
-        this.formRefStep2.current.setFieldsValue(initialObj);
+    if (value) {
+      const res = await this.props.dispatch({
+        type: 'trait/getTraitByName',
+        payload: {
+          traitName: value,
+        },
+      });
+      this.setState({
+        parameters: res.parameters,
+      });
+      if (isType === 2) {
+        this.formRefStep2.current.setFieldsValue(this.props.initialValues);
+      } else if (isType) {
+        // 进行默认值填写
+        const parameters = _.get(res, 'parameters', []);
+        if (parameters.length) {
+          const initialObj = {};
+          parameters.forEach((item) => {
+            if (item.default) {
+              initialObj[item.name] = item.default;
+            }
+          });
+          this.formRefStep2.current.setFieldsValue(initialObj);
+        }
       }
     }
   };
@@ -77,8 +87,12 @@ export default class CreateTraitItem extends React.PureComponent {
         name="control-ref"
         className="traitItem"
       >
-        <Form.Item name="name" label="Trait">
-          <Select placeholder="Select a Trait" allowClear onChange={this.traitSelectChange}>
+        <Form.Item
+          name="name"
+          label="Trait"
+          rules={[{ required: true, message: 'Please Select a Trait!' }]}
+        >
+          <Select placeholder="Select a Trait" onChange={this.traitSelectChange}>
             {availableTraitList.map((item) => {
               return (
                 <Option value={item.name} key={item.name}>
@@ -92,8 +106,34 @@ export default class CreateTraitItem extends React.PureComponent {
         <div className="relativeBox">
           {this.state.parameters ? (
             this.state.parameters.map((item) => {
-              return (
-                <Form.Item name={item.name} label={item.name} key={item.name}>
+              return item.type === 4 ? (
+                <Form.Item
+                  name={item.name}
+                  label={item.name}
+                  key={item.name}
+                  rules={[
+                    {
+                      required: item.required || false,
+                      message: `Please input ${item.name} !`,
+                    },
+                    { pattern: /^[0-9]*$/, message: `${item.name} only use digits(0-9).` },
+                  ]}
+                >
+                  <Input />
+                </Form.Item>
+              ) : (
+                <Form.Item
+                  name={item.name}
+                  label={item.name}
+                  key={item.name}
+                  rules={[
+                    {
+                      required: item.required || false,
+                      message: `Please input ${item.name} !`,
+                    },
+                    { pattern: /^[^\s]*$/, message: 'Spaces are not allowed!' },
+                  ]}
+                >
                   <Input />
                 </Form.Item>
               );

dashboard/src/components/GlobalHeader/WorkSpaceDropDown.jsx

@@ -23,9 +23,8 @@ export default class WorkSpaceDropDown extends React.Component {
         return env.current === '*';
       });
       this.setState({
-        envs: envs,
         workSpaceName: envName,
-        namespace: namespace,
+        namespace,
       });
       this.props.dispatch({
         type: 'globalData/currentEnv',

dashboard/src/components/Trait/index.jsx

@@ -1,23 +1,36 @@
 import React, { Fragment } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
-import { Button, Row, Col, Modal, Select, message } from 'antd';
+import { Button, Row, Col, Modal, Select, message, Breadcrumb, Form, Input } from 'antd';
 import './index.less';
 import { connect } from 'dva';
+import { Link } from 'umi';
 import _ from 'lodash';
 
 const { Option } = Select;
 
+const layout = {
+  labelCol: {
+    span: 8,
+  },
+  wrapperCol: {
+    span: 16,
+  },
+};
+
 @connect(({ loading, applist, globalData }) => ({
   loadingAll: loading.models.applist,
   currentEnv: globalData.currentEnv,
   returnObj: applist.returnObj,
 }))
 class Trait extends React.Component {
+  formRefStep2 = React.createRef();
+
   constructor(props) {
     super(props);
     this.state = {
       visible: false,
       selectValue: null,
+      compList: [],
     };
   }
 
@@ -25,6 +38,19 @@ class Trait extends React.Component {
     this.getInitialData();
   }
 
+  shouldComponentUpdate(nextProps) {
+    if (nextProps.currentEnv === this.props.currentEnv) {
+      return true;
+    }
+    this.props.dispatch({
+      type: 'applist/getList',
+      payload: {
+        url: `/api/envs/${nextProps.currentEnv}/apps/`,
+      },
+    });
+    return true;
+  }
+
   getInitialData = async () => {
     if (this.props.currentEnv) {
       await this.props.dispatch({
@@ -37,28 +63,64 @@ class Trait extends React.Component {
   };
 
   showModal = () => {
-    this.setState({
-      visible: true,
-    });
+    this.setState(
+      {
+        visible: true,
+      },
+      () => {
+        if (this.formRefStep2.current) {
+          this.formRefStep2.current.resetFields();
+        }
+      },
+    );
   };
 
-  handleOk = () => {
-    const { selectValue } = this.state;
-    if (selectValue) {
-      this.setState({
-        visible: false,
+  handleOk = async () => {
+    await this.formRefStep2.current.validateFields();
+    const { title } = this.props.propsObj;
+    if (title) {
+      const submitObj = {
+        name: title,
+        flags: [],
+      };
+      const submitData = this.formRefStep2.current.getFieldValue();
+      Object.keys(submitData).forEach((currentKey) => {
+        if (
+          currentKey !== 'name' &&
+          currentKey !== 'appName' &&
+          currentKey !== 'compName' &&
+          submitData[currentKey]
+        ) {
+          submitObj.flags.push({
+            name: currentKey,
+            value: submitData[currentKey].toString(),
+          });
+        }
       });
-      const { history } = this.props.propsObj;
-      history.push({
-        pathname: '/ApplicationList/ApplicationListDetail',
-        state: {
-          appName: selectValue,
-          envName: this.props.currentEnv,
-          traitType: this.props.propsObj.title,
-        },
-      });
-    } else {
-      message.warn('please select a application');
+      const { currentEnv: envName } = this.props;
+      const { appName, compName } = submitData;
+      if (envName && appName && compName) {
+        const res = await this.props.dispatch({
+          type: 'trait/attachOneTraits',
+          payload: {
+            envName,
+            appName,
+            compName,
+            params: submitObj,
+          },
+        });
+        if (res) {
+          this.setState({
+            visible: false,
+          });
+          message.success(res);
+          const { history } = this.props.propsObj;
+          history.push({
+            pathname: `/ApplicationList/${appName}/Components`,
+            state: { appName, envName },
+          });
+        }
+      }
     }
   };
 
@@ -68,107 +130,231 @@ class Trait extends React.Component {
     });
   };
 
-  onChange = (value) => {
+  onChange = async (value) => {
     this.setState({
       selectValue: value,
+      compList: [],
     });
+    const res = await this.props.dispatch({
+      type: 'applist/getAppDetail',
+      payload: {
+        envName: this.props.currentEnv,
+        appName: value,
+      },
+    });
+    if (res) {
+      const compData = _.get(res, 'components', []);
+      const compList = [];
+      compData.forEach((item) => {
+        compList.push({
+          compName: item.name,
+        });
+      });
+      this.setState({
+        compList,
+      });
+    }
   };
 
   onSearch = () => {};
 
   render() {
-    const { btnValue, title, settings, btnIsShow, crdInfo, appliesTo } = this.props.propsObj;
-    const appList = _.get(this.props, 'returnObj', []);
+    const { btnValue, title, settings = [], btnIsShow, crdInfo, appliesTo } = this.props.propsObj;
+    const initialObj = {};
+    if (settings.length) {
+      settings.forEach((item) => {
+        if (item.default) {
+          initialObj[item.name] = item.default;
+        }
+      });
+    }
+    let appList = _.get(this.props, 'returnObj', []);
+    if (!appList) {
+      appList = [];
+    }
+    const { compList = [] } = this.state;
     return (
-      <PageContainer>
-        <Row>
-          <Col span="11">
-            <div className="deployment">
-              <Row>
-                <Col span="22">
-                  <p className="title">{title}</p>
-                  {crdInfo ? (
-                    <p>
-                      {crdInfo.apiVersion}
-                      <span>,kind=</span>
-                      {crdInfo.kind}
-                    </p>
-                  ) : (
-                    <p />
-                  )}
-                </Col>
-              </Row>
-              <Row>
-                <Col span="22">
-                  <p className="title">Applies To</p>
-                  <p>{Array.isArray(appliesTo) ? appliesTo.join(', ') : appliesTo}</p>
-                </Col>
-              </Row>
-              <p className="title">Configurable Properties:</p>
-              {settings.map((item, index) => {
-                return (
-                  <Row key={index.toString()}>
-                    <Col span="8">
-                      <p>{item.name}</p>
-                    </Col>
-                    <Col span="16">
-                      <p>{item.default || item.usage}</p>
-                    </Col>
-                  </Row>
-                );
-              })}
-            </div>
-            <Button
-              type="primary"
-              className="create-button"
-              onClick={this.showModal}
-              style={{ display: btnIsShow ? 'block' : 'none' }}
-            >
-              {btnValue}
-            </Button>
-            <Modal
-              title="Select a Application"
-              visible={this.state.visible}
-              onOk={this.handleOk}
-              onCancel={this.handleCancel}
-              footer={[
-                <Button key="back" onClick={this.handleCancel}>
-                  Cancel
-                </Button>,
-                <Button key="submit" type="primary" onClick={this.handleOk}>
-                  Next
-                </Button>,
-              ]}
-            >
-              <Select
-                showSearch
-                allowClear
-                value={this.state.selectValue}
-                style={{ width: '100%' }}
-                placeholder="Select a Application"
-                optionFilterProp="children"
-                onChange={this.onChange}
-                onSearch={this.onSearch}
-                filterOption={(input, option) =>
-                  option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                }
+      <div>
+        <div className="breadCrumb">
+          <Breadcrumb>
+            <Breadcrumb.Item>
+              <Link to="/ApplicationList">Home</Link>
+            </Breadcrumb.Item>
+            <Breadcrumb.Item>Traits</Breadcrumb.Item>
+            <Breadcrumb.Item>{title}</Breadcrumb.Item>
+          </Breadcrumb>
+        </div>
+        <PageContainer>
+          <Row>
+            <Col span="11">
+              <div className="deployment">
+                <Row>
+                  <Col span="22">
+                    <p className="title">{title}</p>
+                    {crdInfo ? (
+                      <p>
+                        {crdInfo.apiVersion}
+                        <span>,kind=</span>
+                        {crdInfo.kind}
+                      </p>
+                    ) : (
+                      <p />
+                    )}
+                  </Col>
+                </Row>
+                <Row>
+                  <Col span="22">
+                    <p className="title">Applies To:</p>
+                    <p>{Array.isArray(appliesTo) ? appliesTo.join(', ') : appliesTo}</p>
+                  </Col>
+                </Row>
+                <p className="title">Configurable Properties:</p>
+                {settings.map((item, index) => {
+                  return (
+                    <Row key={index.toString()}>
+                      <Col span="8">
+                        <p>{item.name}</p>
+                      </Col>
+                      <Col span="16">
+                        <p>{item.default || item.usage}</p>
+                      </Col>
+                    </Row>
+                  );
+                })}
+              </div>
+              <Button
+                type="primary"
+                className="create-button"
+                onClick={this.showModal}
+                style={{ display: btnIsShow ? 'block' : 'none' }}
               >
-                {appList.length ? (
-                  appList.map((item) => {
-                    return (
-                      <Option key={item.name} value={item.name}>
-                        {item.name}
-                      </Option>
-                    );
-                  })
-                ) : (
-                  <Fragment />
-                )}
-              </Select>
-            </Modal>
-          </Col>
-        </Row>
-      </PageContainer>
+                {btnValue}
+              </Button>
+              <Modal
+                title="Attach Trait"
+                visible={this.state.visible}
+                onOk={this.handleOk}
+                onCancel={this.handleCancel}
+                footer={[
+                  <Button key="back" onClick={this.handleCancel}>
+                    Cancel
+                  </Button>,
+                  <Button key="submit" type="primary" onClick={this.handleOk}>
+                    Submit
+                  </Button>,
+                ]}
+              >
+                <Form
+                  labelAlign="left"
+                  {...layout}
+                  ref={this.formRefStep2}
+                  name="control-ref"
+                  className="traitItem"
+                  initialValues={initialObj}
+                >
+                  <Form.Item
+                    label="App"
+                    name="appName"
+                    rules={[{ required: true, message: 'Please Select a Application!' }]}
+                  >
+                    <Select
+                      showSearch
+                      value={this.state.selectValue}
+                      style={{ width: '100%' }}
+                      placeholder="Select a Application"
+                      optionFilterProp="children"
+                      onChange={this.onChange}
+                      onSearch={this.onSearch}
+                      filterOption={(input, option) =>
+                        option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                    >
+                      {appList.length ? (
+                        appList.map((item, index) => {
+                          return (
+                            <Option key={index.toString()} value={item.name}>
+                              {item.name}
+                            </Option>
+                          );
+                        })
+                      ) : (
+                        <Fragment />
+                      )}
+                    </Select>
+                  </Form.Item>
+                  <Form.Item
+                    label="Component"
+                    name="compName"
+                    rules={[{ required: true, message: 'Please Select a Component!' }]}
+                  >
+                    <Select
+                      allowClear
+                      // value={this.state.selectValue}
+                      style={{ width: '100%' }}
+                      placeholder="Select a Component"
+                    >
+                      {compList.length ? (
+                        compList.map((item) => {
+                          return (
+                            <Option key={item.compName} value={item.compName}>
+                              {item.compName}
+                            </Option>
+                          );
+                        })
+                      ) : (
+                        <Fragment />
+                      )}
+                    </Select>
+                  </Form.Item>
+                  <div className="relativeBox">
+                    <Form.Item label="Properties" />
+                    {settings ? (
+                      settings.map((item) => {
+                        return item.type === 4 ? (
+                          <Form.Item
+                            name={item.name}
+                            label={item.name}
+                            key={item.name}
+                            rules={[
+                              {
+                                required: item.required || false,
+                                message: `Please input ${item.name} !`,
+                              },
+                              {
+                                pattern: /^[0-9]*$/,
+                                message: `${item.name} only use digits(0-9).`,
+                              },
+                            ]}
+                          >
+                            <Input />
+                          </Form.Item>
+                        ) : (
+                          <Form.Item
+                            name={item.name}
+                            label={item.name}
+                            key={item.name}
+                            rules={[
+                              {
+                                required: item.required || false,
+                                message: `Please input ${item.name} !`,
+                              },
+                              { pattern: /^[^\s]*$/, message: 'Spaces are not allowed!' },
+                            ]}
+                          >
+                            <Input />
+                          </Form.Item>
+                        );
+                      })
+                    ) : (
+                      <></>
+                    )}
+                  </div>
+                </Form>
+              </Modal>
+            </Col>
+          </Row>
+        </PageContainer>
+      </div>
     );
   }
 }

dashboard/src/components/Workload/index.jsx

@@ -1,69 +1,226 @@
 import React, { Fragment } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
-import { Button, Row, Col } from 'antd';
+import { Button, Row, Col, Modal, Select, Breadcrumb, Form } from 'antd';
+import { connect } from 'dva';
 import { Link } from 'umi';
+import _ from 'lodash';
 import './index.less';
 
-export default class Workload extends React.PureComponent {
+const { Option } = Select;
+
+const layout = {
+  labelCol: {
+    span: 8,
+  },
+  wrapperCol: {
+    span: 16,
+  },
+};
+
+@connect(({ loading, applist, globalData }) => ({
+  loadingAll: loading.models.applist,
+  currentEnv: globalData.currentEnv,
+  returnObj: applist.returnObj,
+}))
+export default class Workload extends React.Component {
+  formRefStep2 = React.createRef();
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      visible: false,
+    };
+  }
+
+  componentDidMount() {
+    this.getInitialData();
+  }
+
+  shouldComponentUpdate(nextProps) {
+    if (nextProps.currentEnv === this.props.currentEnv) {
+      return true;
+    }
+    this.props.dispatch({
+      type: 'applist/getList',
+      payload: {
+        url: `/api/envs/${nextProps.currentEnv}/apps/`,
+      },
+    });
+    return true;
+  }
+
+  getInitialData = async () => {
+    if (this.props.currentEnv) {
+      await this.props.dispatch({
+        type: 'applist/getList',
+        payload: {
+          url: `/api/envs/${this.props.currentEnv}/apps/`,
+        },
+      });
+    }
+  };
+
+  showModal = () => {
+    this.setState(
+      {
+        visible: true,
+      },
+      () => {
+        if (this.formRefStep2.current) {
+          this.formRefStep2.current.resetFields();
+        }
+      },
+    );
+  };
+
+  handleOk = async () => {
+    const submitData = await this.formRefStep2.current.validateFields();
+    const { history } = this.props.propsObj;
+    history.push({
+      pathname: `/ApplicationList/${submitData.appName}/createComponent`,
+      state: {
+        ...submitData,
+        isCreate: false,
+        envName: this.props.currentEnv,
+        WorkloadType: this.props.propsObj.title,
+      },
+    });
+  };
+
+  handleCancel = () => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  onChange = () => {};
+
+  onSearch = () => {};
+
   render() {
-    const {
-      btnValue,
-      pathname,
-      title,
-      crdInfo,
-      state,
-      settings,
-      hrefAddress,
-      btnIsShow,
-    } = this.props.propsObj;
+    const { btnValue, title, crdInfo, settings, btnIsShow } = this.props.propsObj;
+    let appList = _.get(this.props, 'returnObj', []);
+    if (!appList) {
+      appList = [];
+    }
     return (
-      <PageContainer>
-        <Row>
-          <Col span="11">
-            <div className="deployment">
-              <a href={hrefAddress}>?</a>
-              <Row>
-                <Col span="22">
-                  <p className="title">{title}</p>
-                  {crdInfo ? (
-                    <p>
-                      {crdInfo.apiVersion}
-                      <span>,kind=</span>
-                      {crdInfo.kind}
-                    </p>
-                  ) : (
-                    <p />
-                  )}
-                </Col>
-              </Row>
-              <p className="title">Configurable Settings:</p>
-              {settings.map((item, index) => {
-                if (item.name === 'name') {
-                  return <Fragment key={index.toString()} />;
-                }
-                return (
-                  <Row key={index.toString()}>
-                    <Col span="8">
-                      <p>{item.name}</p>
-                    </Col>
-                    <Col span="16">
-                      {
-                        // eslint-disable-next-line consistent-return
-                      }
-                      <p>{item.default || item.usage}</p>
-                    </Col>
-                  </Row>
-                );
-              })}
-            </div>
-            <Link to={{ pathname, state }} style={{ display: btnIsShow ? 'block' : 'none' }}>
-              <Button type="primary" className="create-button">
+      <div>
+        <div className="breadCrumb">
+          <Breadcrumb>
+            <Breadcrumb.Item>
+              <Link to="/ApplicationList">Home</Link>
+            </Breadcrumb.Item>
+            <Breadcrumb.Item>Workloads</Breadcrumb.Item>
+            <Breadcrumb.Item>{title}</Breadcrumb.Item>
+          </Breadcrumb>
+        </div>
+        <PageContainer>
+          <Row>
+            <Col span="11">
+              <div className="deployment">
+                <Row>
+                  <Col span="22">
+                    <p className="title">{title}</p>
+                    {crdInfo ? (
+                      <p>
+                        {crdInfo.apiVersion}
+                        <span>,kind=</span>
+                        {crdInfo.kind}
+                      </p>
+                    ) : (
+                      <p />
+                    )}
+                  </Col>
+                </Row>
+                <p className="title">Configurable Settings:</p>
+                {settings.map((item, index) => {
+                  if (item.name === 'name') {
+                    return <Fragment key={index.toString()} />;
+                  }
+                  return (
+                    <Row key={index.toString()}>
+                      <Col span="8">
+                        <p>{item.name}</p>
+                      </Col>
+                      <Col span="16">
+                        {
+                          // eslint-disable-next-line consistent-return
+                        }
+                        <p>{item.default || item.usage}</p>
+                      </Col>
+                    </Row>
+                  );
+                })}
+              </div>
+              {/* <Link to={{ pathname, state }} style={{ display: btnIsShow ? 'block' : 'none' }}>
+                <Button type="primary" className="create-button">
+                  {btnValue}
+                </Button>
+              </Link> */}
+              <Button
+                type="primary"
+                className="create-button"
+                onClick={() => this.showModal()}
+                style={{ display: btnIsShow ? 'block' : 'none' }}
+              >
                 {btnValue}
               </Button>
-            </Link>
-          </Col>
-        </Row>
-      </PageContainer>
+            </Col>
+          </Row>
+          <Modal
+            title="Add Component"
+            visible={this.state.visible}
+            onOk={this.handleOk}
+            onCancel={this.handleCancel}
+            footer={[
+              <Button key="back" onClick={this.handleCancel}>
+                Cancel
+              </Button>,
+              <Button key="submit" type="primary" onClick={this.handleOk}>
+                Next
+              </Button>,
+            ]}
+          >
+            <Form
+              labelAlign="left"
+              {...layout}
+              ref={this.formRefStep2}
+              name="control-ref"
+              className="traitItem"
+            >
+              <Form.Item
+                label="App"
+                name="appName"
+                rules={[{ required: true, message: 'Please Select a Application!' }]}
+              >
+                <Select
+                  showSearch
+                  style={{ width: '100%' }}
+                  placeholder="Select a Application"
+                  optionFilterProp="children"
+                  onChange={this.onChange}
+                  onSearch={this.onSearch}
+                  filterOption={(input, option) =>
+                    option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                  }
+                >
+                  {appList.length ? (
+                    appList.map((item, index) => {
+                      return (
+                        <Option key={index.toString()} value={item.name}>
+                          {item.name}
+                        </Option>
+                      );
+                    })
+                  ) : (
+                    <Fragment />
+                  )}
+                </Select>
+              </Form.Item>
+            </Form>
+          </Modal>
+        </PageContainer>
+      </div>
     );
   }
 }

dashboard/src/e2e/baseLayout.e2e.js

@@ -29,13 +29,6 @@ beforeEach(async () => {
 describe('Ant Design Pro E2E test', () => {
   const testPage = (path) => async () => {
     await page.goto(`${BASE_URL}${path}`);
-    await page.waitForSelector('footer', {
-      timeout: 2000,
-    });
-    const haveFooter = await page.evaluate(
-      () => document.getElementsByTagName('footer').length > 0,
-    );
-    expect(haveFooter).toBeTruthy();
   };
 
   const routers = formatter(RouterConfig);
@@ -46,12 +39,5 @@ describe('Ant Design Pro E2E test', () => {
   it('topmenu should have footer', async () => {
     const params = '?navTheme=light&layout=topmenu';
     await page.goto(`${BASE_URL}${params}`);
-    await page.waitForSelector('footer', {
-      timeout: 2000,
-    });
-    const haveFooter = await page.evaluate(
-      () => document.getElementsByTagName('footer').length > 0,
-    );
-    expect(haveFooter).toBeTruthy();
   });
 });

dashboard/src/global.less

@@ -69,3 +69,35 @@ ol {
 .ant-page-header-heading {
   display: none !important;
 }
+.ant-pro-page-container-warp {
+  display: none;
+}
+.ant-pro-basicLayout-content {
+  margin: 0 !important;
+}
+.ant-pro-basicLayout-content .ant-pro-page-container {
+  margin: 0 !important;
+}
+.breadCrumb {
+  padding: 12px 24px;
+  background: #fff;
+}
+.ant-breadcrumb a:hover {
+  color: #1b58f4 !important;
+}
+// 对齐
+.ant-form-item-label > label::before {
+  display: inline-block;
+  width: 7.09px;
+  height: 14px;
+  margin-right: 4px;
+  color: rgb(255, 77, 79);
+  font-size: 14px;
+  font-family: SimSun, sans-serif;
+  line-height: 1;
+  content: '';
+}
+
+.ant-spin-nested-loading {
+  height: calc(100% - 46px) !important;
+}

dashboard/src/layouts/BasicLayout.jsx

@@ -4,7 +4,7 @@
  * https://github.com/ant-design/ant-design-pro-layout
  */
 import ProLayout from '@ant-design/pro-layout';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { Link, useIntl, connect, history } from 'umi';
 import RightContent from '@/components/GlobalHeader/RightContent';
 import {
@@ -16,15 +16,6 @@ import {
 } from '@ant-design/icons';
 import _ from 'lodash';
 
-// const menuDataRender = (menuList) => {
-//   return menuList.map((item) => {
-//     const localItem = {
-//       ...item,
-//       children: item.children ? menuDataRender(item.children) : undefined,
-//     };
-//     return localItem;
-//   });
-// };
 const AddIcon = (menuData) => {
   return menuData.map((item) => {
     const name = _.get(item, 'name', '');
@@ -52,18 +43,43 @@ const AddIcon = (menuData) => {
 
 const BasicLayout = (props) => {
   const { settings, dispatch, menus } = props;
+  const [currentSelectKeys, setCurrentSelectedKeys] = useState('');
+  const timerRef = useRef();
+  const getCurrentSelectKeys = () => {
+    const pathnameCur = props.history.location.pathname;
+    if (pathnameCur) {
+      if (pathnameCur.includes('Application')) {
+        setCurrentSelectedKeys(['applist']);
+      } else if (pathnameCur.includes('Capability')) {
+        setCurrentSelectedKeys(['Capability']);
+      } else if (pathnameCur.includes('System/Env')) {
+        setCurrentSelectedKeys(['Env']);
+      } else if (pathnameCur.includes('Workload')) {
+        const arr = pathnameCur.split('/');
+        const key = arr[arr.length - 1];
+        setCurrentSelectedKeys([key]);
+      } else if (pathnameCur.includes('Traits')) {
+        const arr = pathnameCur.split('/');
+        const key = arr[arr.length - 1];
+        setCurrentSelectedKeys([key]);
+      }
+    }
+  };
   useEffect(() => {
     if (dispatch) {
-      // dispatch({
-      //     type: 'user/fetchCurrent',
-      // });
-      // dispatch({
-      //     type: 'settings/getSetting',
-      // });
       dispatch({
         type: 'menus/getMenuData',
       });
     }
+    timerRef.current = props.history.listen((route) => {
+      getCurrentSelectKeys(route.pathname);
+    });
+    return () => {
+      if (timerRef.current) {
+        timerRef.current = null;
+      }
+    };
+    // setCurrentSelectedKeys('applist')
   }, []);
 
   const { formatMessage } = useIntl();
@@ -75,9 +91,19 @@ const BasicLayout = (props) => {
         if (menuItemProps.isUrl || !menuItemProps.path) {
           return defaultDom;
         }
-
-        return <Link to={menuItemProps.path}>{defaultDom}</Link>;
+        // return <Link to={menuItemProps.path}>{defaultDom}</Link>;
+        return (
+          <div
+            onClick={() => {
+              setCurrentSelectedKeys([menuItemProps.key]);
+              history.push(menuItemProps.path);
+            }}
+          >
+            {defaultDom}
+          </div>
+        );
       }}
+      selectedKeys={currentSelectKeys}
       breadcrumbRender={(routers = []) => [
         {
           path: '/',

dashboard/src/models/application.js

@@ -2,17 +2,15 @@ import { getapplist, createApp, getAppDetail, deleteApp } from '@/services/appli
 
 const TestModel = {
   namespace: 'applist',
-  state: {
-    // initailState: '8880'
-  },
+  state: {},
   effects: {
     *getList({ payload }, { call, put }) {
       const res = yield call(getapplist, payload);
       // getlist是引入services层那个js文件的getlist方法，payload是后台要求传递的参数，res就是后台返过来的数据
       yield put({
-        type: 'addList', // 这就是reducer的addNum方法，put用来触发reducer中的方法，payload是传过去的参数。同时也能触发同等级effects中的方法
+        type: 'addList',
         payload: {
-          returnObj: res, // 把后台返回的数据赋值给num,假如哪个reducer中的方法是由这里effects去触发的，哪个num名必须是这里的名字num，如果reducer中的方法不是这触发，那名字可以随意取
+          returnObj: res,
         },
       });
     },

dashboard/src/models/capability.js

@@ -10,9 +10,7 @@ import {
 
 const TestModel = {
   namespace: 'capability',
-  state: {
-    // initailState: '8880'
-  },
+  state: {},
   effects: {
     *getCapabilityCenterlist({ payload }, { call }) {
       const res = yield call(getCapabilityCenterlist, payload);

dashboard/src/models/components.js

@@ -0,0 +1,22 @@
+import { getComponentList, getComponentDetail, deleteComponent } from '@/services/components.js';
+
+const TestModel = {
+  namespace: 'components',
+  state: {},
+  effects: {
+    *getComponentList({ payload }, { call }) {
+      const res = yield call(getComponentList, payload);
+      return res;
+    },
+    *getComponentDetail({ payload }, { call }) {
+      const res = yield call(getComponentDetail, payload);
+      return res;
+    },
+    *deleteComponent({ payload }, { call }) {
+      const res = yield call(deleteComponent, payload);
+      return res;
+    },
+  },
+  reducers: {},
+};
+export default TestModel;

dashboard/src/models/global.js

@@ -6,7 +6,7 @@ const globalModel = {
   effects: {
     *currentEnv({ payload }, { put }) {
       yield put({
-        type: 'setCurrentEnv', // 这就是reducer的addNum方法，put用来触发reducer中的方法，payload是传过去的参数。同时也能触发同等级effects中的方法
+        type: 'setCurrentEnv',
         payload,
       });
     },

dashboard/src/models/menu.js

@@ -1,36 +1,31 @@
-import { capabilityList } from '@/services/capability.js';
+import { getTraits } from '@/services/trait.js';
+import { getWorkload } from '@/services/workload.js';
 
-function getMenuList(response) {
+function getMenuList(workload, trait) {
   let workloadList = [];
   let traitList = [];
-  // eslint-disable-next-line no-param-reassign
-  response = response.filter((item) => {
-    return item.status === 'installed';
-  });
-  response.forEach((item) => {
-    if (item.type === 'workload') {
-      workloadList.push(item.name);
-    } else if (item.type === 'trait') {
-      traitList.push(item.name);
-    }
-  });
-  // 在此之前要对workloadList和traitList进行一次去重操作
-  workloadList = workloadList.map((item) => {
-    // eslint-disable-next-line no-param-reassign
-    item = item.charAt(0).toUpperCase() + item.slice(1);
-    return {
-      name: item,
-      path: `/Workload/${item}`,
-    };
-  });
-  traitList = traitList.map((item) => {
-    // eslint-disable-next-line no-param-reassign
-    item = item.charAt(0).toUpperCase() + item.slice(1);
-    return {
-      name: item,
-      path: `/Traits/${item}`,
-    };
-  });
+  if (workload) {
+    workloadList = workload.map((item) => {
+      let name1 = item.name;
+      name1 = name1.charAt(0).toUpperCase() + name1.slice(1);
+      return {
+        name: name1,
+        path: `/Workload/${name1}`,
+        key: name1,
+      };
+    });
+  }
+  if (trait) {
+    traitList = trait.map((item) => {
+      let name1 = item.name;
+      name1 = name1.charAt(0).toUpperCase() + name1.slice(1);
+      return {
+        name: name1,
+        path: `/Traits/${name1}`,
+        key: name1,
+      };
+    });
+  }
   // 只是动态生成侧边栏(name,path,icon)，路由还是config.js里面配置的路由
   const menuList = [
     {
@@ -41,6 +36,7 @@ function getMenuList(response) {
       name: 'ApplicationList',
       icon: 'Table',
       path: `/ApplicationList`,
+      key: 'applist',
     },
     {
       name: 'ApplicationList.ApplicationListDetail',
@@ -76,13 +72,10 @@ function getMenuList(response) {
         },
       ],
     },
-    // {
-    //   name: 'Release',
-    //   path: '/Release',
-    // },
     {
       name: 'Capability',
       path: '/Capability',
+      key: 'Capability',
     },
     {
       path: '/System',
@@ -91,6 +84,7 @@ function getMenuList(response) {
         {
           name: 'Env',
           path: '/System/Env',
+          key: 'Env',
         },
       ],
     },
@@ -110,8 +104,9 @@ const TestModel = {
   },
   effects: {
     *getMenuData({ payload }, { call, put }) {
-      let response = yield call(capabilityList, payload);
-      response = getMenuList(response);
+      const workloadList = yield call(getWorkload, payload);
+      const traitList = yield call(getTraits, payload);
+      const response = getMenuList(workloadList, traitList);
       yield put({
         type: 'saveMenuData',
         payload: response,

dashboard/src/models/trait.js

@@ -2,9 +2,7 @@ import { getTraitByName, getTraits, attachOneTraits, deleteOneTrait } from '@/se
 
 const TestModel = {
   namespace: 'trait',
-  state: {
-    // initailState: '8880'
-  },
+  state: {},
   effects: {
     *getTraitByName({ payload }, { call }) {
       const res = yield call(getTraitByName, payload);

dashboard/src/models/workload.js

@@ -2,9 +2,7 @@ import { createWorkload, getWorkload, getWorkloadByName } from '@/services/workl
 
 const TestModel = {
   namespace: 'workload',
-  state: {
-    // initailState: '8880'
-  },
+  state: {},
   effects: {
     *createWorkload({ payload }, { call }) {
       const res = yield call(createWorkload, payload);

dashboard/src/pages/ApplicationList/ComponentDetail/Topology.jsx

@@ -43,8 +43,6 @@ const Topology = () => {
     ],
   };
 
-  // const width = document.getElementById('container').scrollWidth;
-  // const height = document.getElementById('container').scrollHeight || 500;
   const width = 1000;
   const height = 400;