Fix: stores workflow status in revison if it is restarted (#5604) (#5672)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

.github/workflows/apiserver-test.yaml

@@ -78,6 +78,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
+          sudo sed -i 's/azure\.//' /etc/apt/sources.list
+          sudo apt-get update
           sudo apt-get install -y golang-ginkgo-dev
 
       - name: Start MongoDB

.github/workflows/definition-lint.yml

@@ -0,0 +1,44 @@
+name: Definition-Lint
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - master
+      - release-*
+
+env:
+  # Common versions
+  GO_VERSION: '1.19'
+
+jobs:
+  definition-doc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Setup K3d
+        uses: nolar/setup-k3d-k3s@v1.0.9
+        with:
+          version: v1.20
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Definition Doc generate check
+        run: |
+          go build -o docgen hack/docgen/def/gen.go
+          ./docgen --type=comp --force-example-doc --path=./comp-def-check.md
+          ./docgen --type=trait --force-example-doc --path=./trait-def-check.md
+          ./docgen --type=wf --force-example-doc --path=./wf-def-check.md
+          ./docgen --type=policy --force-example-doc --path=./policy-def-check.md

.github/workflows/go.yml

@@ -141,3 +141,35 @@ jobs:
               
       - name: Cleanup binary
         run: make build-cleanup
+
+  check-windows:
+    runs-on: windows-latest
+    needs: detect-noop
+    if: needs.detect-noop.outputs.noop != 'true'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
+      - name: Run Build CLI
+        run: make vela-cli
+
+      - name: Run CLI for version
+        shell: cmd
+        run: |
+          move .\bin\vela .\bin\vela.exe
+          .\bin\vela.exe version

.github/workflows/unit-test.yml

@@ -58,6 +58,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
+          sudo sed -i 's/azure\.//' /etc/apt/sources.list
+          sudo apt-get update
           sudo apt-get install -y golang-ginkgo-dev
 
       - name: Setup K3d

apis/core.oam.dev/common/types.go

@@ -189,8 +189,6 @@ type Status struct {
 type ApplicationPhase string
 
 const (
-	// ApplicationRollingOut means the app is in the middle of rolling out
-	ApplicationRollingOut ApplicationPhase = "rollingOut"
 	// ApplicationStarting means the app is preparing for reconcile
 	ApplicationStarting ApplicationPhase = "starting"
 	// ApplicationRendering means the app is rendering
@@ -205,8 +203,6 @@ const (
 	ApplicationWorkflowTerminated ApplicationPhase = "workflowTerminated"
 	// ApplicationWorkflowFailed means the app's workflow is failed
 	ApplicationWorkflowFailed ApplicationPhase = "workflowFailed"
-	// ApplicationWorkflowFinished means the app's workflow is finished
-	ApplicationWorkflowFinished ApplicationPhase = "workflowFinished"
 	// ApplicationRunning means the app finished rendering and applied result to the cluster
 	ApplicationRunning ApplicationPhase = "running"
 	// ApplicationUnhealthy means the app finished rendering and applied result to the cluster, but still unhealthy
@@ -337,7 +333,8 @@ type WorkflowStatus struct {
 	Steps          []workflowv1alpha1.WorkflowStepStatus `json:"steps,omitempty"`
 
 	StartTime metav1.Time `json:"startTime,omitempty"`
-	EndTime   metav1.Time `json:"endTime,omitempty"`
+	// +nullable
+	EndTime metav1.Time `json:"endTime,omitempty"`
 }
 
 // DefinitionType describes the type of DefinitionRevision.

apis/types/types.go

@@ -64,6 +64,8 @@ const (
 	LabelDefinitionDeprecated = "custom.definition.oam.dev/deprecated"
 	// LabelDefinitionHidden is the label which describe whether the capability is hidden by UI
 	LabelDefinitionHidden = "custom.definition.oam.dev/ui-hidden"
+	// LabelDefinitionScope is the label which describe whether the capability's scope
+	LabelDefinitionScope = "custom.definition.oam.dev/scope"
 	// LabelNodeRoleGateway gateway role of node
 	LabelNodeRoleGateway = "node-role.kubernetes.io/gateway"
 	// LabelNodeRoleWorker worker role of node

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

@@ -499,7 +499,7 @@ spec:
                         description: Components record the related Components created
                           by Application Controller
                         items:
-                          description: 'ObjectReference contains enough information
+                          description: "ObjectReference contains enough information
                             to let you inspect or modify the referred object. ---
                             New uses of this type are discouraged because of difficulty
                             describing its usage when embedded in APIs.  1. Ignored
@@ -508,25 +508,25 @@ spec:
                             are both very rarely valid in actual usage.  2. Invalid
                             usage help.  It is impossible to add specific help for
                             individual usage.  In most embedded usages, there are
-                            particular     restrictions like, "must refer only to
-                            types A and B" or "UID not honored" or "name must be restricted".     Those
-                            cannot be well described when embedded.  3. Inconsistent
-                            validation.  Because the usages are different, the validation
-                            rules are different by usage, which makes it hard for
-                            users to predict what will happen.  4. The fields are
-                            both imprecise and overly precise.  Kind is not a precise
-                            mapping to a URL. This can produce ambiguity     during
-                            interpretation and require a REST mapping.  In most cases,
-                            the dependency is on the group,resource tuple     and
-                            the version of the actual struct is irrelevant.  5. We
-                            cannot easily change it.  Because this type is embedded
-                            in many locations, updates to this type     will affect
-                            numerous schemas.  Don''t make new APIs embed an underspecified
-                            API type they do not control. Instead of using this type,
-                            create a locally provided and used type that is well-focused
-                            on your reference. For example, ServiceReferences for
-                            admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                            .'
+                            particular     restrictions like, \"must refer only to
+                            types A and B\" or \"UID not honored\" or \"name must
+                            be restricted\".     Those cannot be well described when
+                            embedded.  3. Inconsistent validation.  Because the usages
+                            are different, the validation rules are different by usage,
+                            which makes it hard for users to predict what will happen.
+                            \ 4. The fields are both imprecise and overly precise.
+                            \ Kind is not a precise mapping to a URL. This can produce
+                            ambiguity     during interpretation and require a REST
+                            mapping.  In most cases, the dependency is on the group,resource
+                            tuple     and the version of the actual struct is irrelevant.
+                            \ 5. We cannot easily change it.  Because this type is
+                            embedded in many locations, updates to this type     will
+                            affect numerous schemas.  Don't make new APIs embed an
+                            underspecified API type they do not control. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                            ."
                           properties:
                             apiVersion:
                               description: API version of the referent.
@@ -659,7 +659,7 @@ spec:
                               type: string
                             scopes:
                               items:
-                                description: 'ObjectReference contains enough information
+                                description: "ObjectReference contains enough information
                                   to let you inspect or modify the referred object.
                                   --- New uses of this type are discouraged because
                                   of difficulty describing its usage when embedded
@@ -668,28 +668,28 @@ spec:
                                   ResourceVersion and FieldPath are both very rarely
                                   valid in actual usage.  2. Invalid usage help.  It
                                   is impossible to add specific help for individual
-                                  usage.  In most embedded usages, there are particular     restrictions
-                                  like, "must refer only to types A and B" or "UID
-                                  not honored" or "name must be restricted".     Those
-                                  cannot be well described when embedded.  3. Inconsistent
-                                  validation.  Because the usages are different, the
-                                  validation rules are different by usage, which makes
-                                  it hard for users to predict what will happen.  4.
-                                  The fields are both imprecise and overly precise.  Kind
-                                  is not a precise mapping to a URL. This can produce
-                                  ambiguity     during interpretation and require
-                                  a REST mapping.  In most cases, the dependency is
-                                  on the group,resource tuple     and the version
-                                  of the actual struct is irrelevant.  5. We cannot
-                                  easily change it.  Because this type is embedded
-                                  in many locations, updates to this type     will
-                                  affect numerous schemas.  Don''t make new APIs embed
-                                  an underspecified API type they do not control.
-                                  Instead of using this type, create a locally provided
-                                  and used type that is well-focused on your reference.
-                                  For example, ServiceReferences for admission registration:
-                                  https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                  .'
+                                  usage.  In most embedded usages, there are particular
+                                  \    restrictions like, \"must refer only to types
+                                  A and B\" or \"UID not honored\" or \"name must
+                                  be restricted\".     Those cannot be well described
+                                  when embedded.  3. Inconsistent validation.  Because
+                                  the usages are different, the validation rules are
+                                  different by usage, which makes it hard for users
+                                  to predict what will happen.  4. The fields are
+                                  both imprecise and overly precise.  Kind is not
+                                  a precise mapping to a URL. This can produce ambiguity
+                                  \    during interpretation and require a REST mapping.
+                                  \ In most cases, the dependency is on the group,resource
+                                  tuple     and the version of the actual struct is
+                                  irrelevant.  5. We cannot easily change it.  Because
+                                  this type is embedded in many locations, updates
+                                  to this type     will affect numerous schemas.  Don't
+                                  make new APIs embed an underspecified API type they
+                                  do not control. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                  ."
                                 properties:
                                   apiVersion:
                                     description: API version of the referent.
@@ -776,7 +776,7 @@ spec:
                           appRevision:
                             type: string
                           contextBackend:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -785,11 +785,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -798,13 +798,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -844,6 +844,7 @@ spec:
                             type: object
                           endTime:
                             format: date-time
+                            nullable: true
                             type: string
                           finished:
                             type: boolean
@@ -2414,7 +2415,7 @@ spec:
                         description: Components record the related Components created
                           by Application Controller
                         items:
-                          description: 'ObjectReference contains enough information
+                          description: "ObjectReference contains enough information
                             to let you inspect or modify the referred object. ---
                             New uses of this type are discouraged because of difficulty
                             describing its usage when embedded in APIs.  1. Ignored
@@ -2423,25 +2424,25 @@ spec:
                             are both very rarely valid in actual usage.  2. Invalid
                             usage help.  It is impossible to add specific help for
                             individual usage.  In most embedded usages, there are
-                            particular     restrictions like, "must refer only to
-                            types A and B" or "UID not honored" or "name must be restricted".     Those
-                            cannot be well described when embedded.  3. Inconsistent
-                            validation.  Because the usages are different, the validation
-                            rules are different by usage, which makes it hard for
-                            users to predict what will happen.  4. The fields are
-                            both imprecise and overly precise.  Kind is not a precise
-                            mapping to a URL. This can produce ambiguity     during
-                            interpretation and require a REST mapping.  In most cases,
-                            the dependency is on the group,resource tuple     and
-                            the version of the actual struct is irrelevant.  5. We
-                            cannot easily change it.  Because this type is embedded
-                            in many locations, updates to this type     will affect
-                            numerous schemas.  Don''t make new APIs embed an underspecified
-                            API type they do not control. Instead of using this type,
-                            create a locally provided and used type that is well-focused
-                            on your reference. For example, ServiceReferences for
-                            admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                            .'
+                            particular     restrictions like, \"must refer only to
+                            types A and B\" or \"UID not honored\" or \"name must
+                            be restricted\".     Those cannot be well described when
+                            embedded.  3. Inconsistent validation.  Because the usages
+                            are different, the validation rules are different by usage,
+                            which makes it hard for users to predict what will happen.
+                            \ 4. The fields are both imprecise and overly precise.
+                            \ Kind is not a precise mapping to a URL. This can produce
+                            ambiguity     during interpretation and require a REST
+                            mapping.  In most cases, the dependency is on the group,resource
+                            tuple     and the version of the actual struct is irrelevant.
+                            \ 5. We cannot easily change it.  Because this type is
+                            embedded in many locations, updates to this type     will
+                            affect numerous schemas.  Don't make new APIs embed an
+                            underspecified API type they do not control. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                            ."
                           properties:
                             apiVersion:
                               description: API version of the referent.
@@ -2574,7 +2575,7 @@ spec:
                               type: string
                             scopes:
                               items:
-                                description: 'ObjectReference contains enough information
+                                description: "ObjectReference contains enough information
                                   to let you inspect or modify the referred object.
                                   --- New uses of this type are discouraged because
                                   of difficulty describing its usage when embedded
@@ -2583,28 +2584,28 @@ spec:
                                   ResourceVersion and FieldPath are both very rarely
                                   valid in actual usage.  2. Invalid usage help.  It
                                   is impossible to add specific help for individual
-                                  usage.  In most embedded usages, there are particular     restrictions
-                                  like, "must refer only to types A and B" or "UID
-                                  not honored" or "name must be restricted".     Those
-                                  cannot be well described when embedded.  3. Inconsistent
-                                  validation.  Because the usages are different, the
-                                  validation rules are different by usage, which makes
-                                  it hard for users to predict what will happen.  4.
-                                  The fields are both imprecise and overly precise.  Kind
-                                  is not a precise mapping to a URL. This can produce
-                                  ambiguity     during interpretation and require
-                                  a REST mapping.  In most cases, the dependency is
-                                  on the group,resource tuple     and the version
-                                  of the actual struct is irrelevant.  5. We cannot
-                                  easily change it.  Because this type is embedded
-                                  in many locations, updates to this type     will
-                                  affect numerous schemas.  Don''t make new APIs embed
-                                  an underspecified API type they do not control.
-                                  Instead of using this type, create a locally provided
-                                  and used type that is well-focused on your reference.
-                                  For example, ServiceReferences for admission registration:
-                                  https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                  .'
+                                  usage.  In most embedded usages, there are particular
+                                  \    restrictions like, \"must refer only to types
+                                  A and B\" or \"UID not honored\" or \"name must
+                                  be restricted\".     Those cannot be well described
+                                  when embedded.  3. Inconsistent validation.  Because
+                                  the usages are different, the validation rules are
+                                  different by usage, which makes it hard for users
+                                  to predict what will happen.  4. The fields are
+                                  both imprecise and overly precise.  Kind is not
+                                  a precise mapping to a URL. This can produce ambiguity
+                                  \    during interpretation and require a REST mapping.
+                                  \ In most cases, the dependency is on the group,resource
+                                  tuple     and the version of the actual struct is
+                                  irrelevant.  5. We cannot easily change it.  Because
+                                  this type is embedded in many locations, updates
+                                  to this type     will affect numerous schemas.  Don't
+                                  make new APIs embed an underspecified API type they
+                                  do not control. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                  ."
                                 properties:
                                   apiVersion:
                                     description: API version of the referent.
@@ -2691,7 +2692,7 @@ spec:
                           appRevision:
                             type: string
                           contextBackend:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -2700,11 +2701,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -2713,13 +2714,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -2759,6 +2760,7 @@ spec:
                             type: object
                           endTime:
                             format: date-time
+                            nullable: true
                             type: string
                           finished:
                             type: boolean
@@ -4752,31 +4754,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -4813,6 +4816,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean

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

@@ -450,31 +450,31 @@ spec:
                 description: Components record the related Components created by Application
                   Controller
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -601,7 +601,7 @@ spec:
                       type: string
                     scopes:
                       items:
-                        description: 'ObjectReference contains enough information
+                        description: "ObjectReference contains enough information
                           to let you inspect or modify the referred object. --- New
                           uses of this type are discouraged because of difficulty
                           describing its usage when embedded in APIs.  1. Ignored
@@ -610,24 +610,24 @@ spec:
                           both very rarely valid in actual usage.  2. Invalid usage
                           help.  It is impossible to add specific help for individual
                           usage.  In most embedded usages, there are particular     restrictions
-                          like, "must refer only to types A and B" or "UID not honored"
-                          or "name must be restricted".     Those cannot be well described
-                          when embedded.  3. Inconsistent validation.  Because the
-                          usages are different, the validation rules are different
-                          by usage, which makes it hard for users to predict what
-                          will happen.  4. The fields are both imprecise and overly
-                          precise.  Kind is not a precise mapping to a URL. This can
-                          produce ambiguity     during interpretation and require
-                          a REST mapping.  In most cases, the dependency is on the
-                          group,resource tuple     and the version of the actual struct
-                          is irrelevant.  5. We cannot easily change it.  Because
-                          this type is embedded in many locations, updates to this
-                          type     will affect numerous schemas.  Don''t make new
-                          APIs embed an underspecified API type they do not control.
-                          Instead of using this type, create a locally provided and
-                          used type that is well-focused on your reference. For example,
-                          ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                          .'
+                          like, \"must refer only to types A and B\" or \"UID not
+                          honored\" or \"name must be restricted\".     Those cannot
+                          be well described when embedded.  3. Inconsistent validation.
+                          \ Because the usages are different, the validation rules
+                          are different by usage, which makes it hard for users to
+                          predict what will happen.  4. The fields are both imprecise
+                          and overly precise.  Kind is not a precise mapping to a
+                          URL. This can produce ambiguity     during interpretation
+                          and require a REST mapping.  In most cases, the dependency
+                          is on the group,resource tuple     and the version of the
+                          actual struct is irrelevant.  5. We cannot easily change
+                          it.  Because this type is embedded in many locations, updates
+                          to this type     will affect numerous schemas.  Don't make
+                          new APIs embed an underspecified API type they do not control.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                          ."
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -707,31 +707,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -768,6 +769,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean
@@ -1212,31 +1214,31 @@ spec:
                 description: Components record the related Components created by Application
                   Controller
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -1363,7 +1365,7 @@ spec:
                       type: string
                     scopes:
                       items:
-                        description: 'ObjectReference contains enough information
+                        description: "ObjectReference contains enough information
                           to let you inspect or modify the referred object. --- New
                           uses of this type are discouraged because of difficulty
                           describing its usage when embedded in APIs.  1. Ignored
@@ -1372,24 +1374,24 @@ spec:
                           both very rarely valid in actual usage.  2. Invalid usage
                           help.  It is impossible to add specific help for individual
                           usage.  In most embedded usages, there are particular     restrictions
-                          like, "must refer only to types A and B" or "UID not honored"
-                          or "name must be restricted".     Those cannot be well described
-                          when embedded.  3. Inconsistent validation.  Because the
-                          usages are different, the validation rules are different
-                          by usage, which makes it hard for users to predict what
-                          will happen.  4. The fields are both imprecise and overly
-                          precise.  Kind is not a precise mapping to a URL. This can
-                          produce ambiguity     during interpretation and require
-                          a REST mapping.  In most cases, the dependency is on the
-                          group,resource tuple     and the version of the actual struct
-                          is irrelevant.  5. We cannot easily change it.  Because
-                          this type is embedded in many locations, updates to this
-                          type     will affect numerous schemas.  Don''t make new
-                          APIs embed an underspecified API type they do not control.
-                          Instead of using this type, create a locally provided and
-                          used type that is well-focused on your reference. For example,
-                          ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                          .'
+                          like, \"must refer only to types A and B\" or \"UID not
+                          honored\" or \"name must be restricted\".     Those cannot
+                          be well described when embedded.  3. Inconsistent validation.
+                          \ Because the usages are different, the validation rules
+                          are different by usage, which makes it hard for users to
+                          predict what will happen.  4. The fields are both imprecise
+                          and overly precise.  Kind is not a precise mapping to a
+                          URL. This can produce ambiguity     during interpretation
+                          and require a REST mapping.  In most cases, the dependency
+                          is on the group,resource tuple     and the version of the
+                          actual struct is irrelevant.  5. We cannot easily change
+                          it.  Because this type is embedded in many locations, updates
+                          to this type     will affect numerous schemas.  Don't make
+                          new APIs embed an underspecified API type they do not control.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                          ."
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -1469,31 +1471,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -1530,6 +1533,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean

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

@@ -59,7 +59,7 @@ spec:
                             type: string
                           traits:
                             items:
-                              description: 'ObjectReference contains enough information
+                              description: "ObjectReference contains enough information
                                 to let you inspect or modify the referred object.
                                 --- New uses of this type are discouraged because
                                 of difficulty describing its usage when embedded in
@@ -69,26 +69,26 @@ spec:
                                 usage.  2. Invalid usage help.  It is impossible to
                                 add specific help for individual usage.  In most embedded
                                 usages, there are particular     restrictions like,
-                                "must refer only to types A and B" or "UID not honored"
-                                or "name must be restricted".     Those cannot be
-                                well described when embedded.  3. Inconsistent validation.  Because
-                                the usages are different, the validation rules are
-                                different by usage, which makes it hard for users
-                                to predict what will happen.  4. The fields are both
-                                imprecise and overly precise.  Kind is not a precise
-                                mapping to a URL. This can produce ambiguity     during
-                                interpretation and require a REST mapping.  In most
-                                cases, the dependency is on the group,resource tuple     and
-                                the version of the actual struct is irrelevant.  5.
-                                We cannot easily change it.  Because this type is
-                                embedded in many locations, updates to this type     will
-                                affect numerous schemas.  Don''t make new APIs embed
-                                an underspecified API type they do not control. Instead
-                                of using this type, create a locally provided and
-                                used type that is well-focused on your reference.
-                                For example, ServiceReferences for admission registration:
-                                https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                .'
+                                \"must refer only to types A and B\" or \"UID not
+                                honored\" or \"name must be restricted\".     Those
+                                cannot be well described when embedded.  3. Inconsistent
+                                validation.  Because the usages are different, the
+                                validation rules are different by usage, which makes
+                                it hard for users to predict what will happen.  4.
+                                The fields are both imprecise and overly precise.
+                                \ Kind is not a precise mapping to a URL. This can
+                                produce ambiguity     during interpretation and require
+                                a REST mapping.  In most cases, the dependency is
+                                on the group,resource tuple     and the version of
+                                the actual struct is irrelevant.  5. We cannot easily
+                                change it.  Because this type is embedded in many
+                                locations, updates to this type     will affect numerous
+                                schemas.  Don't make new APIs embed an underspecified
+                                API type they do not control. \n Instead of using
+                                this type, create a locally provided and used type
+                                that is well-focused on your reference. For example,
+                                ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                ."
                               properties:
                                 apiVersion:
                                   description: API version of the referent.
@@ -129,7 +129,7 @@ spec:
                               type: object
                             type: array
                           workload:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -138,11 +138,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -151,13 +151,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -213,31 +213,31 @@ spec:
                 description: WorkloadReferences to the workloads that are in this
                   scope.
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -305,7 +305,7 @@ spec:
                             description: HealthStatus represents health status strings.
                             type: string
                           targetWorkload:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -314,11 +314,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -327,13 +327,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -461,7 +461,7 @@ spec:
                       description: HealthStatus represents health status strings.
                       type: string
                     targetWorkload:
-                      description: 'ObjectReference contains enough information to
+                      description: "ObjectReference contains enough information to
                         let you inspect or modify the referred object. --- New uses
                         of this type are discouraged because of difficulty describing
                         its usage when embedded in APIs.  1. Ignored fields.  It includes
@@ -469,24 +469,25 @@ spec:
                         ResourceVersion and FieldPath are both very rarely valid in
                         actual usage.  2. Invalid usage help.  It is impossible to
                         add specific help for individual usage.  In most embedded
-                        usages, there are particular     restrictions like, "must
-                        refer only to types A and B" or "UID not honored" or "name
-                        must be restricted".     Those cannot be well described when
+                        usages, there are particular     restrictions like, \"must
+                        refer only to types A and B\" or \"UID not honored\" or \"name
+                        must be restricted\".     Those cannot be well described when
                         embedded.  3. Inconsistent validation.  Because the usages
                         are different, the validation rules are different by usage,
-                        which makes it hard for users to predict what will happen.  4.
-                        The fields are both imprecise and overly precise.  Kind is
-                        not a precise mapping to a URL. This can produce ambiguity     during
-                        interpretation and require a REST mapping.  In most cases,
-                        the dependency is on the group,resource tuple     and the
-                        version of the actual struct is irrelevant.  5. We cannot
-                        easily change it.  Because this type is embedded in many locations,
-                        updates to this type     will affect numerous schemas.  Don''t
-                        make new APIs embed an underspecified API type they do not
-                        control. Instead of using this type, create a locally provided
-                        and used type that is well-focused on your reference. For
-                        example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                        .'
+                        which makes it hard for users to predict what will happen.
+                        \ 4. The fields are both imprecise and overly precise.  Kind
+                        is not a precise mapping to a URL. This can produce ambiguity
+                        \    during interpretation and require a REST mapping.  In
+                        most cases, the dependency is on the group,resource tuple
+                        \    and the version of the actual struct is irrelevant.  5.
+                        We cannot easily change it.  Because this type is embedded
+                        in many locations, updates to this type     will affect numerous
+                        schemas.  Don't make new APIs embed an underspecified API
+                        type they do not control. \n Instead of using this type, create
+                        a locally provided and used type that is well-focused on your
+                        reference. For example, ServiceReferences for admission registration:
+                        https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                        ."
                       properties:
                         apiVersion:
                           description: API version of the referent.

charts/vela-core/templates/defwithtemplate/apply-application-in-parallel.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply components of an application in parallel for your workflow steps
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application-in-parallel
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-core/templates/defwithtemplate/apply-application.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply application for your workflow steps, it has no arguments, should be used for custom steps before or after application applied.
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-core/templates/defwithtemplate/apply-component.yaml

@@ -0,0 +1,23 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/apply-component.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply a specific component and its corresponding traits in application
+  labels:
+    custom.definition.oam.dev/scope: Application
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: apply-component
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        parameter: {
+        	// +usage=Specify the component name to apply
+        	component: string
+        	// +usage=Specify the cluster
+        	cluster: *"" | string
+        }
+

charts/vela-core/templates/defwithtemplate/apply-remaining.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply remaining components and traits
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-remaining
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-core/templates/defwithtemplate/container-image.yaml

@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: close(#PatchParams) | close({
+        parameter: *#PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })

charts/vela-core/templates/defwithtemplate/deploy-cloud-resource.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Deploy cloud resource and deliver secret to multi clusters.
+  labels:
+    custom.definition.oam.dev/scope: Application
   name: deploy-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: A powerful and unified deploy step for components multi-cluster delivery with policies.
+  labels:
+    custom.definition.oam.dev/scope: Application
   name: deploy
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Deploy env binding component to target env
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2env
   namespace: {{ include "systemDefinitionNamespace" . }}

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

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Deploy application to runtime clusters
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-core/templates/defwithtemplate/print-message-in-status.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: pring message in workflow status
+    definition.oam.dev/description: print message in workflow step status
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: print-message-in-status

charts/vela-core/templates/defwithtemplate/share-cloud-resource.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
+  labels:
+    custom.definition.oam.dev/scope: Application
   name: share-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -13,6 +13,7 @@ spec:
       template: |
         import (
         	"strconv"
+        	"strings"
         )
 
         mountsArray: [
@@ -167,7 +168,11 @@ spec:
         									name: v.name
         								}
         								if v.name == _|_ {
-        									name: "port-" + strconv.FormatInt(v.port, 10)
+        									_name: "port-" + strconv.FormatInt(v.port, 10)
+        									name:  *_name | string
+        									if v.protocol != "TCP" {
+        										name: _name + "-" + strings.ToLower(v.protocol)
+        									}
         								}
         							}}]
         					}
@@ -283,11 +288,18 @@ spec:
         			name: v.name
         		}
         		if v.name == _|_ {
-        			name: "port-" + strconv.FormatInt(v.port, 10)
+        			_name: "port-" + strconv.FormatInt(v.port, 10)
+        			name:  *_name | string
+        			if v.protocol != "TCP" {
+        				name: _name + "-" + strings.ToLower(v.protocol)
+        			}
         		}
         		if v.nodePort != _|_ && parameter.exposeType == "NodePort" {
         			nodePort: v.nodePort
         		}
+        		if v.protocol != _|_ {
+        			protocol: v.protocol
+        		}
         	},
         ]
         outputs: {

charts/vela-core/templates/kubevela-controller.yaml

@@ -116,6 +116,39 @@ subjects:
     name: {{ include "kubevela.serviceAccountName" . }}
 
 ---
+# permissions to read the view of VelaQL, schemas, and templates.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "kubevela.fullname" . }}:template-reader-role
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps/status
+    verbs:
+      - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "kubevela.fullname" . }}:template-reader-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "kubevela.fullname" . }}:template-reader-role
+subjects:
+  - kind: Group
+    name: template-reader
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/vela-minimal/crds/core.oam.dev_applicationrevisions.yaml

@@ -499,7 +499,7 @@ spec:
                         description: Components record the related Components created
                           by Application Controller
                         items:
-                          description: 'ObjectReference contains enough information
+                          description: "ObjectReference contains enough information
                             to let you inspect or modify the referred object. ---
                             New uses of this type are discouraged because of difficulty
                             describing its usage when embedded in APIs.  1. Ignored
@@ -508,25 +508,25 @@ spec:
                             are both very rarely valid in actual usage.  2. Invalid
                             usage help.  It is impossible to add specific help for
                             individual usage.  In most embedded usages, there are
-                            particular     restrictions like, "must refer only to
-                            types A and B" or "UID not honored" or "name must be restricted".     Those
-                            cannot be well described when embedded.  3. Inconsistent
-                            validation.  Because the usages are different, the validation
-                            rules are different by usage, which makes it hard for
-                            users to predict what will happen.  4. The fields are
-                            both imprecise and overly precise.  Kind is not a precise
-                            mapping to a URL. This can produce ambiguity     during
-                            interpretation and require a REST mapping.  In most cases,
-                            the dependency is on the group,resource tuple     and
-                            the version of the actual struct is irrelevant.  5. We
-                            cannot easily change it.  Because this type is embedded
-                            in many locations, updates to this type     will affect
-                            numerous schemas.  Don''t make new APIs embed an underspecified
-                            API type they do not control. Instead of using this type,
-                            create a locally provided and used type that is well-focused
-                            on your reference. For example, ServiceReferences for
-                            admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                            .'
+                            particular     restrictions like, \"must refer only to
+                            types A and B\" or \"UID not honored\" or \"name must
+                            be restricted\".     Those cannot be well described when
+                            embedded.  3. Inconsistent validation.  Because the usages
+                            are different, the validation rules are different by usage,
+                            which makes it hard for users to predict what will happen.
+                            \ 4. The fields are both imprecise and overly precise.
+                            \ Kind is not a precise mapping to a URL. This can produce
+                            ambiguity     during interpretation and require a REST
+                            mapping.  In most cases, the dependency is on the group,resource
+                            tuple     and the version of the actual struct is irrelevant.
+                            \ 5. We cannot easily change it.  Because this type is
+                            embedded in many locations, updates to this type     will
+                            affect numerous schemas.  Don't make new APIs embed an
+                            underspecified API type they do not control. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                            ."
                           properties:
                             apiVersion:
                               description: API version of the referent.
@@ -659,7 +659,7 @@ spec:
                               type: string
                             scopes:
                               items:
-                                description: 'ObjectReference contains enough information
+                                description: "ObjectReference contains enough information
                                   to let you inspect or modify the referred object.
                                   --- New uses of this type are discouraged because
                                   of difficulty describing its usage when embedded
@@ -668,28 +668,28 @@ spec:
                                   ResourceVersion and FieldPath are both very rarely
                                   valid in actual usage.  2. Invalid usage help.  It
                                   is impossible to add specific help for individual
-                                  usage.  In most embedded usages, there are particular     restrictions
-                                  like, "must refer only to types A and B" or "UID
-                                  not honored" or "name must be restricted".     Those
-                                  cannot be well described when embedded.  3. Inconsistent
-                                  validation.  Because the usages are different, the
-                                  validation rules are different by usage, which makes
-                                  it hard for users to predict what will happen.  4.
-                                  The fields are both imprecise and overly precise.  Kind
-                                  is not a precise mapping to a URL. This can produce
-                                  ambiguity     during interpretation and require
-                                  a REST mapping.  In most cases, the dependency is
-                                  on the group,resource tuple     and the version
-                                  of the actual struct is irrelevant.  5. We cannot
-                                  easily change it.  Because this type is embedded
-                                  in many locations, updates to this type     will
-                                  affect numerous schemas.  Don''t make new APIs embed
-                                  an underspecified API type they do not control.
-                                  Instead of using this type, create a locally provided
-                                  and used type that is well-focused on your reference.
-                                  For example, ServiceReferences for admission registration:
-                                  https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                  .'
+                                  usage.  In most embedded usages, there are particular
+                                  \    restrictions like, \"must refer only to types
+                                  A and B\" or \"UID not honored\" or \"name must
+                                  be restricted\".     Those cannot be well described
+                                  when embedded.  3. Inconsistent validation.  Because
+                                  the usages are different, the validation rules are
+                                  different by usage, which makes it hard for users
+                                  to predict what will happen.  4. The fields are
+                                  both imprecise and overly precise.  Kind is not
+                                  a precise mapping to a URL. This can produce ambiguity
+                                  \    during interpretation and require a REST mapping.
+                                  \ In most cases, the dependency is on the group,resource
+                                  tuple     and the version of the actual struct is
+                                  irrelevant.  5. We cannot easily change it.  Because
+                                  this type is embedded in many locations, updates
+                                  to this type     will affect numerous schemas.  Don't
+                                  make new APIs embed an underspecified API type they
+                                  do not control. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                  ."
                                 properties:
                                   apiVersion:
                                     description: API version of the referent.
@@ -776,7 +776,7 @@ spec:
                           appRevision:
                             type: string
                           contextBackend:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -785,11 +785,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -798,13 +798,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -844,6 +844,7 @@ spec:
                             type: object
                           endTime:
                             format: date-time
+                            nullable: true
                             type: string
                           finished:
                             type: boolean
@@ -2414,7 +2415,7 @@ spec:
                         description: Components record the related Components created
                           by Application Controller
                         items:
-                          description: 'ObjectReference contains enough information
+                          description: "ObjectReference contains enough information
                             to let you inspect or modify the referred object. ---
                             New uses of this type are discouraged because of difficulty
                             describing its usage when embedded in APIs.  1. Ignored
@@ -2423,25 +2424,25 @@ spec:
                             are both very rarely valid in actual usage.  2. Invalid
                             usage help.  It is impossible to add specific help for
                             individual usage.  In most embedded usages, there are
-                            particular     restrictions like, "must refer only to
-                            types A and B" or "UID not honored" or "name must be restricted".     Those
-                            cannot be well described when embedded.  3. Inconsistent
-                            validation.  Because the usages are different, the validation
-                            rules are different by usage, which makes it hard for
-                            users to predict what will happen.  4. The fields are
-                            both imprecise and overly precise.  Kind is not a precise
-                            mapping to a URL. This can produce ambiguity     during
-                            interpretation and require a REST mapping.  In most cases,
-                            the dependency is on the group,resource tuple     and
-                            the version of the actual struct is irrelevant.  5. We
-                            cannot easily change it.  Because this type is embedded
-                            in many locations, updates to this type     will affect
-                            numerous schemas.  Don''t make new APIs embed an underspecified
-                            API type they do not control. Instead of using this type,
-                            create a locally provided and used type that is well-focused
-                            on your reference. For example, ServiceReferences for
-                            admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                            .'
+                            particular     restrictions like, \"must refer only to
+                            types A and B\" or \"UID not honored\" or \"name must
+                            be restricted\".     Those cannot be well described when
+                            embedded.  3. Inconsistent validation.  Because the usages
+                            are different, the validation rules are different by usage,
+                            which makes it hard for users to predict what will happen.
+                            \ 4. The fields are both imprecise and overly precise.
+                            \ Kind is not a precise mapping to a URL. This can produce
+                            ambiguity     during interpretation and require a REST
+                            mapping.  In most cases, the dependency is on the group,resource
+                            tuple     and the version of the actual struct is irrelevant.
+                            \ 5. We cannot easily change it.  Because this type is
+                            embedded in many locations, updates to this type     will
+                            affect numerous schemas.  Don't make new APIs embed an
+                            underspecified API type they do not control. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                            ."
                           properties:
                             apiVersion:
                               description: API version of the referent.
@@ -2574,7 +2575,7 @@ spec:
                               type: string
                             scopes:
                               items:
-                                description: 'ObjectReference contains enough information
+                                description: "ObjectReference contains enough information
                                   to let you inspect or modify the referred object.
                                   --- New uses of this type are discouraged because
                                   of difficulty describing its usage when embedded
@@ -2583,28 +2584,28 @@ spec:
                                   ResourceVersion and FieldPath are both very rarely
                                   valid in actual usage.  2. Invalid usage help.  It
                                   is impossible to add specific help for individual
-                                  usage.  In most embedded usages, there are particular     restrictions
-                                  like, "must refer only to types A and B" or "UID
-                                  not honored" or "name must be restricted".     Those
-                                  cannot be well described when embedded.  3. Inconsistent
-                                  validation.  Because the usages are different, the
-                                  validation rules are different by usage, which makes
-                                  it hard for users to predict what will happen.  4.
-                                  The fields are both imprecise and overly precise.  Kind
-                                  is not a precise mapping to a URL. This can produce
-                                  ambiguity     during interpretation and require
-                                  a REST mapping.  In most cases, the dependency is
-                                  on the group,resource tuple     and the version
-                                  of the actual struct is irrelevant.  5. We cannot
-                                  easily change it.  Because this type is embedded
-                                  in many locations, updates to this type     will
-                                  affect numerous schemas.  Don''t make new APIs embed
-                                  an underspecified API type they do not control.
-                                  Instead of using this type, create a locally provided
-                                  and used type that is well-focused on your reference.
-                                  For example, ServiceReferences for admission registration:
-                                  https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                  .'
+                                  usage.  In most embedded usages, there are particular
+                                  \    restrictions like, \"must refer only to types
+                                  A and B\" or \"UID not honored\" or \"name must
+                                  be restricted\".     Those cannot be well described
+                                  when embedded.  3. Inconsistent validation.  Because
+                                  the usages are different, the validation rules are
+                                  different by usage, which makes it hard for users
+                                  to predict what will happen.  4. The fields are
+                                  both imprecise and overly precise.  Kind is not
+                                  a precise mapping to a URL. This can produce ambiguity
+                                  \    during interpretation and require a REST mapping.
+                                  \ In most cases, the dependency is on the group,resource
+                                  tuple     and the version of the actual struct is
+                                  irrelevant.  5. We cannot easily change it.  Because
+                                  this type is embedded in many locations, updates
+                                  to this type     will affect numerous schemas.  Don't
+                                  make new APIs embed an underspecified API type they
+                                  do not control. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                  ."
                                 properties:
                                   apiVersion:
                                     description: API version of the referent.
@@ -2691,7 +2692,7 @@ spec:
                           appRevision:
                             type: string
                           contextBackend:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -2700,11 +2701,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -2713,13 +2714,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -2759,6 +2760,7 @@ spec:
                             type: object
                           endTime:
                             format: date-time
+                            nullable: true
                             type: string
                           finished:
                             type: boolean
@@ -4752,31 +4754,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -4813,6 +4816,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean

charts/vela-minimal/crds/core.oam.dev_applications.yaml

@@ -450,31 +450,31 @@ spec:
                 description: Components record the related Components created by Application
                   Controller
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -601,7 +601,7 @@ spec:
                       type: string
                     scopes:
                       items:
-                        description: 'ObjectReference contains enough information
+                        description: "ObjectReference contains enough information
                           to let you inspect or modify the referred object. --- New
                           uses of this type are discouraged because of difficulty
                           describing its usage when embedded in APIs.  1. Ignored
@@ -610,24 +610,24 @@ spec:
                           both very rarely valid in actual usage.  2. Invalid usage
                           help.  It is impossible to add specific help for individual
                           usage.  In most embedded usages, there are particular     restrictions
-                          like, "must refer only to types A and B" or "UID not honored"
-                          or "name must be restricted".     Those cannot be well described
-                          when embedded.  3. Inconsistent validation.  Because the
-                          usages are different, the validation rules are different
-                          by usage, which makes it hard for users to predict what
-                          will happen.  4. The fields are both imprecise and overly
-                          precise.  Kind is not a precise mapping to a URL. This can
-                          produce ambiguity     during interpretation and require
-                          a REST mapping.  In most cases, the dependency is on the
-                          group,resource tuple     and the version of the actual struct
-                          is irrelevant.  5. We cannot easily change it.  Because
-                          this type is embedded in many locations, updates to this
-                          type     will affect numerous schemas.  Don''t make new
-                          APIs embed an underspecified API type they do not control.
-                          Instead of using this type, create a locally provided and
-                          used type that is well-focused on your reference. For example,
-                          ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                          .'
+                          like, \"must refer only to types A and B\" or \"UID not
+                          honored\" or \"name must be restricted\".     Those cannot
+                          be well described when embedded.  3. Inconsistent validation.
+                          \ Because the usages are different, the validation rules
+                          are different by usage, which makes it hard for users to
+                          predict what will happen.  4. The fields are both imprecise
+                          and overly precise.  Kind is not a precise mapping to a
+                          URL. This can produce ambiguity     during interpretation
+                          and require a REST mapping.  In most cases, the dependency
+                          is on the group,resource tuple     and the version of the
+                          actual struct is irrelevant.  5. We cannot easily change
+                          it.  Because this type is embedded in many locations, updates
+                          to this type     will affect numerous schemas.  Don't make
+                          new APIs embed an underspecified API type they do not control.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                          ."
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -707,31 +707,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -768,6 +769,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean
@@ -1212,31 +1214,31 @@ spec:
                 description: Components record the related Components created by Application
                   Controller
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -1363,7 +1365,7 @@ spec:
                       type: string
                     scopes:
                       items:
-                        description: 'ObjectReference contains enough information
+                        description: "ObjectReference contains enough information
                           to let you inspect or modify the referred object. --- New
                           uses of this type are discouraged because of difficulty
                           describing its usage when embedded in APIs.  1. Ignored
@@ -1372,24 +1374,24 @@ spec:
                           both very rarely valid in actual usage.  2. Invalid usage
                           help.  It is impossible to add specific help for individual
                           usage.  In most embedded usages, there are particular     restrictions
-                          like, "must refer only to types A and B" or "UID not honored"
-                          or "name must be restricted".     Those cannot be well described
-                          when embedded.  3. Inconsistent validation.  Because the
-                          usages are different, the validation rules are different
-                          by usage, which makes it hard for users to predict what
-                          will happen.  4. The fields are both imprecise and overly
-                          precise.  Kind is not a precise mapping to a URL. This can
-                          produce ambiguity     during interpretation and require
-                          a REST mapping.  In most cases, the dependency is on the
-                          group,resource tuple     and the version of the actual struct
-                          is irrelevant.  5. We cannot easily change it.  Because
-                          this type is embedded in many locations, updates to this
-                          type     will affect numerous schemas.  Don''t make new
-                          APIs embed an underspecified API type they do not control.
-                          Instead of using this type, create a locally provided and
-                          used type that is well-focused on your reference. For example,
-                          ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                          .'
+                          like, \"must refer only to types A and B\" or \"UID not
+                          honored\" or \"name must be restricted\".     Those cannot
+                          be well described when embedded.  3. Inconsistent validation.
+                          \ Because the usages are different, the validation rules
+                          are different by usage, which makes it hard for users to
+                          predict what will happen.  4. The fields are both imprecise
+                          and overly precise.  Kind is not a precise mapping to a
+                          URL. This can produce ambiguity     during interpretation
+                          and require a REST mapping.  In most cases, the dependency
+                          is on the group,resource tuple     and the version of the
+                          actual struct is irrelevant.  5. We cannot easily change
+                          it.  Because this type is embedded in many locations, updates
+                          to this type     will affect numerous schemas.  Don't make
+                          new APIs embed an underspecified API type they do not control.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                          ."
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -1469,31 +1471,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -1530,6 +1533,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean

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

@@ -59,7 +59,7 @@ spec:
                             type: string
                           traits:
                             items:
-                              description: 'ObjectReference contains enough information
+                              description: "ObjectReference contains enough information
                                 to let you inspect or modify the referred object.
                                 --- New uses of this type are discouraged because
                                 of difficulty describing its usage when embedded in
@@ -69,26 +69,26 @@ spec:
                                 usage.  2. Invalid usage help.  It is impossible to
                                 add specific help for individual usage.  In most embedded
                                 usages, there are particular     restrictions like,
-                                "must refer only to types A and B" or "UID not honored"
-                                or "name must be restricted".     Those cannot be
-                                well described when embedded.  3. Inconsistent validation.  Because
-                                the usages are different, the validation rules are
-                                different by usage, which makes it hard for users
-                                to predict what will happen.  4. The fields are both
-                                imprecise and overly precise.  Kind is not a precise
-                                mapping to a URL. This can produce ambiguity     during
-                                interpretation and require a REST mapping.  In most
-                                cases, the dependency is on the group,resource tuple     and
-                                the version of the actual struct is irrelevant.  5.
-                                We cannot easily change it.  Because this type is
-                                embedded in many locations, updates to this type     will
-                                affect numerous schemas.  Don''t make new APIs embed
-                                an underspecified API type they do not control. Instead
-                                of using this type, create a locally provided and
-                                used type that is well-focused on your reference.
-                                For example, ServiceReferences for admission registration:
-                                https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                .'
+                                \"must refer only to types A and B\" or \"UID not
+                                honored\" or \"name must be restricted\".     Those
+                                cannot be well described when embedded.  3. Inconsistent
+                                validation.  Because the usages are different, the
+                                validation rules are different by usage, which makes
+                                it hard for users to predict what will happen.  4.
+                                The fields are both imprecise and overly precise.
+                                \ Kind is not a precise mapping to a URL. This can
+                                produce ambiguity     during interpretation and require
+                                a REST mapping.  In most cases, the dependency is
+                                on the group,resource tuple     and the version of
+                                the actual struct is irrelevant.  5. We cannot easily
+                                change it.  Because this type is embedded in many
+                                locations, updates to this type     will affect numerous
+                                schemas.  Don't make new APIs embed an underspecified
+                                API type they do not control. \n Instead of using
+                                this type, create a locally provided and used type
+                                that is well-focused on your reference. For example,
+                                ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                ."
                               properties:
                                 apiVersion:
                                   description: API version of the referent.
@@ -129,7 +129,7 @@ spec:
                               type: object
                             type: array
                           workload:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -138,11 +138,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -151,13 +151,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -213,31 +213,31 @@ spec:
                 description: WorkloadReferences to the workloads that are in this
                   scope.
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -305,7 +305,7 @@ spec:
                             description: HealthStatus represents health status strings.
                             type: string
                           targetWorkload:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -314,11 +314,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -327,13 +327,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -461,7 +461,7 @@ spec:
                       description: HealthStatus represents health status strings.
                       type: string
                     targetWorkload:
-                      description: 'ObjectReference contains enough information to
+                      description: "ObjectReference contains enough information to
                         let you inspect or modify the referred object. --- New uses
                         of this type are discouraged because of difficulty describing
                         its usage when embedded in APIs.  1. Ignored fields.  It includes
@@ -469,24 +469,25 @@ spec:
                         ResourceVersion and FieldPath are both very rarely valid in
                         actual usage.  2. Invalid usage help.  It is impossible to
                         add specific help for individual usage.  In most embedded
-                        usages, there are particular     restrictions like, "must
-                        refer only to types A and B" or "UID not honored" or "name
-                        must be restricted".     Those cannot be well described when
+                        usages, there are particular     restrictions like, \"must
+                        refer only to types A and B\" or \"UID not honored\" or \"name
+                        must be restricted\".     Those cannot be well described when
                         embedded.  3. Inconsistent validation.  Because the usages
                         are different, the validation rules are different by usage,
-                        which makes it hard for users to predict what will happen.  4.
-                        The fields are both imprecise and overly precise.  Kind is
-                        not a precise mapping to a URL. This can produce ambiguity     during
-                        interpretation and require a REST mapping.  In most cases,
-                        the dependency is on the group,resource tuple     and the
-                        version of the actual struct is irrelevant.  5. We cannot
-                        easily change it.  Because this type is embedded in many locations,
-                        updates to this type     will affect numerous schemas.  Don''t
-                        make new APIs embed an underspecified API type they do not
-                        control. Instead of using this type, create a locally provided
-                        and used type that is well-focused on your reference. For
-                        example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                        .'
+                        which makes it hard for users to predict what will happen.
+                        \ 4. The fields are both imprecise and overly precise.  Kind
+                        is not a precise mapping to a URL. This can produce ambiguity
+                        \    during interpretation and require a REST mapping.  In
+                        most cases, the dependency is on the group,resource tuple
+                        \    and the version of the actual struct is irrelevant.  5.
+                        We cannot easily change it.  Because this type is embedded
+                        in many locations, updates to this type     will affect numerous
+                        schemas.  Don't make new APIs embed an underspecified API
+                        type they do not control. \n Instead of using this type, create
+                        a locally provided and used type that is well-focused on your
+                        reference. For example, ServiceReferences for admission registration:
+                        https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                        ."
                       properties:
                         apiVersion:
                           description: API version of the referent.

charts/vela-minimal/templates/defwithtemplate/apply-application-in-parallel.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply components of an application in parallel for your workflow steps
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application-in-parallel
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-minimal/templates/defwithtemplate/apply-application.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply application for your workflow steps, it has no arguments, should be used for custom steps before or after application applied.
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-minimal/templates/defwithtemplate/apply-component.yaml

@@ -0,0 +1,23 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/apply-component.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Apply a specific component and its corresponding traits in application
+  labels:
+    custom.definition.oam.dev/scope: Application
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: apply-component
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        parameter: {
+        	// +usage=Specify the component name to apply
+        	component: string
+        	// +usage=Specify the cluster
+        	cluster: *"" | string
+        }
+

charts/vela-minimal/templates/defwithtemplate/apply-remaining.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply remaining components and traits
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-remaining
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-minimal/templates/defwithtemplate/container-image.yaml

@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: close(#PatchParams) | close({
+        parameter: *#PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })

charts/vela-minimal/templates/defwithtemplate/deploy-cloud-resource.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Deploy cloud resource and deliver secret to multi clusters.
+  labels:
+    custom.definition.oam.dev/scope: Application
   name: deploy-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

charts/vela-minimal/templates/defwithtemplate/deploy.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: A powerful and unified deploy step for components multi-cluster delivery with policies.
+  labels:
+    custom.definition.oam.dev/scope: Application
   name: deploy
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

charts/vela-minimal/templates/defwithtemplate/deploy2runtime.yaml

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Deploy application to runtime clusters
   labels:
     custom.definition.oam.dev/deprecated: "true"
+    custom.definition.oam.dev/scope: Application
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
   namespace: {{ include "systemDefinitionNamespace" . }}

charts/vela-minimal/templates/defwithtemplate/print-message-in-status.yaml

@@ -4,7 +4,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: WorkflowStepDefinition
 metadata:
   annotations:
-    definition.oam.dev/description: pring message in workflow status
+    definition.oam.dev/description: print message in workflow step status
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: print-message-in-status

charts/vela-minimal/templates/defwithtemplate/share-cloud-resource.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
+  labels:
+    custom.definition.oam.dev/scope: Application
   name: share-cloud-resource
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -13,6 +13,7 @@ spec:
       template: |
         import (
         	"strconv"
+        	"strings"
         )
 
         mountsArray: [
@@ -167,7 +168,11 @@ spec:
         									name: v.name
         								}
         								if v.name == _|_ {
-        									name: "port-" + strconv.FormatInt(v.port, 10)
+        									_name: "port-" + strconv.FormatInt(v.port, 10)
+        									name:  *_name | string
+        									if v.protocol != "TCP" {
+        										name: _name + "-" + strings.ToLower(v.protocol)
+        									}
         								}
         							}}]
         					}
@@ -283,11 +288,18 @@ spec:
         			name: v.name
         		}
         		if v.name == _|_ {
-        			name: "port-" + strconv.FormatInt(v.port, 10)
+        			_name: "port-" + strconv.FormatInt(v.port, 10)
+        			name:  *_name | string
+        			if v.protocol != "TCP" {
+        				name: _name + "-" + strings.ToLower(v.protocol)
+        			}
         		}
         		if v.nodePort != _|_ && parameter.exposeType == "NodePort" {
         			nodePort: v.nodePort
         		}
+        		if v.protocol != _|_ {
+        			protocol: v.protocol
+        		}
         	},
         ]
         outputs: {

cmd/apiserver/main.go

@@ -30,10 +30,10 @@ import (
 	"github.com/go-openapi/spec"
 	"github.com/google/uuid"
 	flag "github.com/spf13/pflag"
+	"k8s.io/klog/v2"
 
 	"github.com/oam-dev/kubevela/pkg/apiserver"
 	"github.com/oam-dev/kubevela/pkg/apiserver/config"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/features"
 	"github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/version"
@@ -61,24 +61,24 @@ func main() {
 		func() {
 			swagger, err := s.buildSwagger()
 			if err != nil {
-				log.Logger.Fatal(err.Error())
+				klog.Fatal(err.Error())
 			}
 			outData, err := json.MarshalIndent(swagger, "", "\t")
 			if err != nil {
-				log.Logger.Fatal(err.Error())
+				klog.Fatal(err.Error())
 			}
 			swaggerFile, err := os.OpenFile(os.Args[2], os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
 			if err != nil {
-				log.Logger.Fatal(err.Error())
+				klog.Fatal(err.Error())
 			}
 			defer func() {
 				if err := swaggerFile.Close(); err != nil {
-					log.Logger.Errorf("close swagger file failure %s", err.Error())
+					klog.Errorf("close swagger file failure %s", err.Error())
 				}
 			}()
 			_, err = swaggerFile.Write(outData)
 			if err != nil {
-				log.Logger.Fatal(err.Error())
+				klog.Fatal(err.Error())
 			}
 			fmt.Println("build swagger config file success")
 		}()
@@ -107,11 +107,11 @@ func main() {
 
 	select {
 	case <-term:
-		log.Logger.Infof("Received SIGTERM, exiting gracefully...")
+		klog.Infof("Received SIGTERM, exiting gracefully...")
 	case err := <-errChan:
-		log.Logger.Errorf("Received an error: %s, exiting gracefully...", err.Error())
+		klog.Errorf("Received an error: %s, exiting gracefully...", err.Error())
 	}
-	log.Logger.Infof("See you next time!")
+	klog.Infof("See you next time!")
 }
 
 // Server apiserver
@@ -120,7 +120,7 @@ type Server struct {
 }
 
 func (s *Server) run(ctx context.Context, errChan chan error) error {
-	log.Logger.Infof("KubeVela information: version: %v, gitRevision: %v", version.VelaVersion, version.GitRevision)
+	klog.Infof("KubeVela information: version: %v, gitRevision: %v", version.VelaVersion, version.GitRevision)
 
 	server := apiserver.New(s.serverConfig)
 

e2e/addon/addon_test.go

@@ -74,6 +74,12 @@ var _ = Describe("Addon Test", func() {
 			Expect(output).To(ContainSubstring("enabled successfully."))
 		})
 
+		It("Enable addon with specified registry ", func() {
+			output, err := e2e.LongTimeExec("vela addon enable KubeVela/test-addon", 300*time.Second)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("enabled successfully."))
+		})
+
 		It("Disable addon test-addon", func() {
 			output, err := e2e.LongTimeExec("vela addon disable test-addon", 600*time.Second)
 			Expect(err).NotTo(HaveOccurred())

e2e/addon/mock/testdata/mock-dep-addon/metadata.yaml

@@ -0,0 +1,8 @@
+name: mock-dep-addon
+version: v1.0.0
+description: Vela test addon named mock-dep-addon
+icon: https://www.test.com/icon
+url: https://www.test.com
+
+dependencies:
+  - name: mock-be-dep-addon

e2e/addon/mock/testrepo/helm-repo/index.yaml

@@ -34,4 +34,39 @@ entries:
       urls:
         - http://127.0.0.1:9098/helm/vela-workflow-v0.3.1.tgz
       version: v0.3.1
+  foo:
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named foo
+      home:  https://www.foo.com/icon
+      icon: https://www.foo.com
+      name: foo
+      urls:
+        - http://127.0.0.1:9098/helm/foo-v1.0.0.tgz
+      version: v1.0.0
+  bar:
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named bar
+      home:  https://www.bar.com/icon
+      icon: https://www.bar.com
+      name: foo
+      urls:
+        - http://127.0.0.1:9098/helm/bar-v1.0.0.tgz
+      version: v1.0.0
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named bar
+      home:  https://www.bar.com/icon
+      icon: https://www.bar.com
+      name: foo
+      urls:
+        - http://127.0.0.1:9098/helm/bar-v2.0.0.tgz
+      version: v2.0.0
+  mock-be-dep-addon:
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named mock-be-dep-addon
+      home:  https://www.test.com/icon
+      icon: https://www.test.com
+      name: mock-be-dep-addon
+      urls:
+        - http://127.0.0.1:9098/helm/mock-be-dep-addon-v1.0.0.tgz
+      version: v1.0.0
 generated: "2022-06-15T13:17:04.733573+08:00"

e2e/addon/mock/vela_addon_mock_server.go

@@ -131,6 +131,30 @@ var helmHandler http.HandlerFunc = func(rw http.ResponseWriter, req *http.Reques
 			_, _ = rw.Write([]byte(err.Error()))
 		}
 		rw.Write(file)
+	case strings.Contains(req.URL.Path, "foo-v1.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/foo-v1.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
+	case strings.Contains(req.URL.Path, "bar-v1.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/bar-v1.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
+	case strings.Contains(req.URL.Path, "bar-v2.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/bar-v2.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
+	case strings.Contains(req.URL.Path, "mock-be-dep-addon-v1.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/mock-be-dep-addon-v1.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
 	}
 
 }

e2e/application/application_test.go

@@ -47,6 +47,9 @@ var (
 	appbasicJsonAppFile         = `{"name":"app-basic","services":{"app-basic":{"type":"webservice","image":"nginx:1.9.4","ports":[{port: 80, expose: true}]}}}`
 	appbasicAddTraitJsonAppFile = `{"name":"app-basic","services":{"app-basic":{"type":"webservice","image":"nginx:1.9.4","ports":[{port: 80, expose: true}],"scaler":{"replicas":2}}}}`
 	velaQL                      = "test-component-pod-view{appNs=default,appName=nginx-vela,name=nginx}"
+
+	waitAppfileToSuccess = `{"name":"app-wait-success","services":{"app-basic1":{"type":"webservice","image":"nginx:1.9.4","ports":[{port: 80, expose: true}]}}}`
+	waitAppfileToFail    = `{"name":"app-wait-fail","services":{"app-basic2":{"type":"webservice","image":"nginx:fail","ports":[{port: 80, expose: true}]}}}`
 )
 
 var _ = ginkgo.Describe("Test Vela Application", func() {
@@ -75,6 +78,9 @@ var _ = ginkgo.Describe("Test Vela Application", func() {
 
 	e2e.JsonAppFileContext("json appfile apply", testDeleteJsonAppFile)
 	VelaQLPodListContext("ql", velaQL)
+
+	e2e.JsonAppFileContextWithWait("json appfile apply with wait", waitAppfileToSuccess)
+	e2e.JsonAppFileContextWithTimeout("json appfile apply with wait but timeout", waitAppfileToFail, "3s")
 })
 
 var ApplicationStatusContext = func(context string, applicationName string, workloadType string) bool {
@@ -182,7 +188,7 @@ var ApplicationInitIntercativeCliContext = func(context string, appName string,
 				c.ExpectEOF()
 			})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			gomega.Expect(output).To(gomega.ContainSubstring("Checking Status"))
+			gomega.Expect(output).To(gomega.ContainSubstring("Waiting app to be healthy"))
 		})
 	})
 }

e2e/commonContext.go

@@ -84,6 +84,30 @@ var (
 		})
 	}
 
+	JsonAppFileContextWithWait = func(context, jsonAppFile string) bool {
+		return ginkgo.Context(context, func() {
+			ginkgo.It("Start the application through the app file in JSON format.", func() {
+				writeStatus := os.WriteFile("vela.json", []byte(jsonAppFile), 0644)
+				gomega.Expect(writeStatus).NotTo(gomega.HaveOccurred())
+				output, err := Exec("vela up -f vela.json --wait")
+				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+				gomega.Expect(output).To(gomega.ContainSubstring("Application Deployed Successfully!"))
+			})
+		})
+	}
+
+	JsonAppFileContextWithTimeout = func(context, jsonAppFile, duration string) bool {
+		return ginkgo.Context(context, func() {
+			ginkgo.It("Start the application through the app file in JSON format.", func() {
+				writeStatus := os.WriteFile("vela.json", []byte(jsonAppFile), 0644)
+				gomega.Expect(writeStatus).NotTo(gomega.HaveOccurred())
+				output, err := Exec("vela up -f vela.json --wait --timeout=" + duration)
+				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+				gomega.Expect(output).To(gomega.ContainSubstring("Timeout waiting Application to be healthy!"))
+			})
+		})
+	}
+
 	DeleteEnvFunc = func(context string, envName string) bool {
 		return ginkgo.Context(context, func() {
 			ginkgo.It("should print env does not exist message", func() {

go.mod

@@ -14,11 +14,12 @@ require (
 	github.com/alibabacloud-go/tea v1.1.19
 	github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
 	github.com/barnettZQG/inject v0.0.1
+	github.com/bluele/gcache v0.0.2
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
 	github.com/briandowns/spinner v1.11.1
 	github.com/chartmuseum/helm-push v0.10.2
 	github.com/cloudtty/cloudtty v0.2.0
-	github.com/containerd/containerd v1.5.13
+	github.com/containerd/containerd v1.6.6
 	github.com/coreos/go-oidc v2.1.0+incompatible
 	github.com/coreos/prometheus-operator v0.41.1
 	github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd
@@ -27,7 +28,7 @@ require (
 	github.com/deckarep/golang-set v1.7.1
 	github.com/emicklei/go-restful-openapi/v2 v2.3.0
 	github.com/emicklei/go-restful/v3 v3.8.0
-	github.com/evanphx/json-patch v4.12.0+incompatible
+	github.com/evanphx/json-patch v5.6.0+incompatible
 	github.com/fatih/camelcase v1.0.0
 	github.com/fatih/color v1.13.0
 	github.com/fluxcd/helm-controller/api v0.21.0
@@ -37,31 +38,31 @@ require (
 	github.com/gertd/go-pluralize v0.1.7
 	github.com/getkin/kin-openapi v0.94.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-logr/logr v1.2.2
+	github.com/go-logr/logr v1.2.3
 	github.com/go-openapi/spec v0.19.8
 	github.com/go-playground/validator/v10 v10.9.0
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/golang/mock v1.6.0
-	github.com/google/go-cmp v0.5.8
+	github.com/google/go-cmp v0.5.9
 	github.com/google/go-containerregistry v0.9.0
 	github.com/google/go-github/v32 v32.1.0
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/gosuri/uilive v0.0.4
 	github.com/gosuri/uitable v0.0.4
-	github.com/hashicorp/go-version v1.3.0
+	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/hcl/v2 v2.9.1
 	github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174
 	github.com/imdario/mergo v0.3.12
-	github.com/klauspost/compress v1.15.11
+	github.com/klauspost/compress v1.15.12
 	github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c
-	github.com/kubevela/pkg v0.0.0-20221024115939-a103acee6db2
+	github.com/kubevela/pkg v0.0.0-20230105054759-263dc191bf51
 	github.com/kubevela/prism v1.5.1-0.20220915071949-6bf3ad33f84f
-	github.com/kubevela/workflow v0.3.1
+	github.com/kubevela/workflow v0.3.6
 	github.com/kyokomi/emoji v2.2.4+incompatible
 	github.com/mitchellh/hashstructure/v2 v2.0.1
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
-	github.com/oam-dev/cluster-gateway v1.4.0
+	github.com/oam-dev/cluster-gateway v1.7.0-alpha.1
 	github.com/oam-dev/cluster-register v1.0.4-0.20220928064144-5f76a9d7ca8c
 	github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28
 	github.com/oam-dev/terraform-controller v0.7.0
@@ -75,43 +76,41 @@ require (
 	github.com/rivo/tview v0.0.0-20220709181631-73bf2902b59a
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.9.0
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.4.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.6.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.8.0
 	github.com/tidwall/gjson v1.9.3
 	github.com/wercker/stern v0.0.0-20190705090245-4fa46dd6987f
 	github.com/wonderflow/cert-manager-api v1.0.4-0.20210304051430-e08aa76f6c5f
 	github.com/xanzy/go-gitlab v0.60.0
 	github.com/xlab/treeprint v1.1.0
 	go.mongodb.org/mongo-driver v1.5.1
-	go.uber.org/zap v1.21.0
-	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
+	golang.org/x/crypto v0.1.0
 	golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
-	golang.org/x/text v0.3.8
+	golang.org/x/term v0.1.0
+	golang.org/x/text v0.4.0
 	gomodules.xyz/jsonpatch/v2 v2.2.0
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools v2.2.0+incompatible
-	helm.sh/helm/v3 v3.7.2
+	helm.sh/helm/v3 v3.10.3
 	istio.io/client-go v1.13.4
-	k8s.io/api v0.23.6
-	k8s.io/apiextensions-apiserver v0.23.6
-	k8s.io/apimachinery v0.23.6
-	k8s.io/apiserver v0.23.6
-	k8s.io/cli-runtime v0.23.6
-	k8s.io/client-go v0.23.6
-	k8s.io/component-base v0.23.6
+	k8s.io/api v0.25.3
+	k8s.io/apiextensions-apiserver v0.25.2
+	k8s.io/apimachinery v0.25.3
+	k8s.io/apiserver v0.25.3
+	k8s.io/cli-runtime v0.25.2
+	k8s.io/client-go v0.25.3
+	k8s.io/component-base v0.25.3
 	k8s.io/helm v2.17.0+incompatible
-	k8s.io/klog v1.0.0
-	k8s.io/klog/v2 v2.60.1
-	k8s.io/kube-aggregator v0.23.0
-	k8s.io/kubectl v0.23.6
-	k8s.io/metrics v0.23.6
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
+	k8s.io/klog/v2 v2.70.1
+	k8s.io/kube-aggregator v0.25.3
+	k8s.io/kubectl v0.25.2
+	k8s.io/metrics v0.25.2
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 	open-cluster-management.io/api v0.7.0
-	sigs.k8s.io/controller-runtime v0.11.2
+	sigs.k8s.io/controller-runtime v0.12.3
 	sigs.k8s.io/controller-tools v0.6.2
 	sigs.k8s.io/gateway-api v0.4.3
 	sigs.k8s.io/kind v0.9.0
@@ -121,20 +120,20 @@ require (
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+	github.com/Azure/go-autorest/autorest v0.11.27 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/BurntSushi/toml v0.4.1 // indirect
-	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
+	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
-	github.com/Masterminds/squirrel v1.5.2 // indirect
+	github.com/Masterminds/squirrel v1.5.3 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/Microsoft/hcsshim v0.8.24 // indirect
+	github.com/Microsoft/hcsshim v0.9.3 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -153,26 +152,25 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
 	github.com/aws/aws-sdk-go v1.36.30 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
+	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
-	github.com/containerd/continuity v0.1.0 // indirect
+	github.com/containerd/continuity v0.3.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/creack/pty v1.1.11 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
-	github.com/docker/cli v20.10.16+incompatible // indirect
+	github.com/docker/cli v20.10.17+incompatible // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/docker v20.10.16+incompatible // indirect
+	github.com/docker/docker v20.10.17+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
-	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
 	github.com/emicklei/proto v1.10.0 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.1.0 // indirect
@@ -182,11 +180,12 @@ require (
 	github.com/fluxcd/pkg/apis/acl v0.0.3 // indirect
 	github.com/fluxcd/pkg/apis/kustomize v0.3.3 // indirect
 	github.com/fluxcd/pkg/apis/meta v0.13.0 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/go-errors/errors v1.0.1 // indirect
-	github.com/go-logr/zapr v1.2.0 // indirect
+	github.com/go-gorp/gorp/v3 v3.0.2 // indirect
+	github.com/go-logr/zapr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
@@ -196,25 +195,26 @@ require (
 	github.com/gobuffalo/flect v0.2.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/google/btree v1.0.1 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jmoiron/sqlx v1.3.1 // indirect
+	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
@@ -224,14 +224,14 @@ require (
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/lib/pq v1.10.3 // indirect
+	github.com/lib/pq v1.10.6 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/mattn/go-colorable v0.1.11 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -239,7 +239,7 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
-	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
+	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
@@ -249,21 +249,21 @@ require (
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
-	github.com/openshift/library-go v0.0.0-20220112153822-ac82336bd076 // indirect
+	github.com/openshift/library-go v0.0.0-20221111030555-73ed40c0a938 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect
+	github.com/pquerna/cachecontrol v0.1.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc // indirect
+	github.com/rubenv/sql-migrate v1.1.2 // indirect
 	github.com/russross/blackfriday v1.6.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
-	github.com/spf13/afero v1.8.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/src-d/gcfg v1.4.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
@@ -276,37 +276,37 @@ require (
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	github.com/zclconf/go-cty v1.8.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.4 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.4 // indirect
 	go.opentelemetry.io/contrib v0.20.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
-	go.opentelemetry.io/otel v0.20.0 // indirect
+	go.opentelemetry.io/otel v1.3.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
 	go.opentelemetry.io/otel/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/sdk v0.20.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.3.0 // indirect
 	go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
-	go.opentelemetry.io/otel/trace v0.20.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.7.0 // indirect
+	go.opentelemetry.io/otel/trace v1.3.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.11.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
-	golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
+	go.uber.org/zap v1.21.0 // indirect
+	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/net v0.1.1-0.20221104162952-702349b0e862 // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
+	golang.org/x/sys v0.1.0 // indirect
 	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/grpc v1.48.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
-	gopkg.in/gorp.v1 v1.7.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
@@ -314,15 +314,16 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	istio.io/api v0.0.0-20220512212136-561ffec82582 // indirect
 	istio.io/gogo-genproto v0.0.0-20211208193508-5ab4acc9eb1e // indirect
-	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	oras.land/oras-go v0.4.0 // indirect
+	k8s.io/klog v1.0.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+	oras.land/oras-go v1.2.0 // indirect
 	sigs.k8s.io/apiserver-network-proxy v0.0.30 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
-	sigs.k8s.io/apiserver-runtime v1.1.1 // indirect
-	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
-	sigs.k8s.io/kustomize/api v0.10.1 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
+	sigs.k8s.io/apiserver-runtime v1.1.2-0.20221102045245-fb656940062f // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/kustomize/api v0.12.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 require (
@@ -330,19 +331,26 @@ require (
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
-	github.com/magiconair/properties v1.8.5
+	github.com/magiconair/properties v1.8.6
 	github.com/nacos-group/nacos-sdk-go/v2 v2.1.0
 	github.com/opencontainers/runc v1.1.3 // indirect
 	github.com/openkruise/rollouts v0.1.1-0.20220622054609-149e5a48da5e
-	github.com/pelletier/go-toml v1.9.4
+	github.com/pelletier/go-toml v1.9.5
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 replace (
+	cuelang.org/go => github.com/kubevela/cue v0.4.4-0.20221107123854-a976b0e340be
 	github.com/docker/cli => github.com/docker/cli v20.10.9+incompatible
 	github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
 	github.com/wercker/stern => github.com/oam-dev/stern v1.13.2
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
+	go.opentelemetry.io/otel => go.opentelemetry.io/otel v0.20.0
+	go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.20.0
+	go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v0.20.0
+	go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
+	go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24
 )

hack/docgen/def/gen.go

@@ -42,6 +42,7 @@ func main() {
 	defdir := flag.String("def-dir", "", "path of definition dir")
 	tp := flag.String("type", "", "choose one of the definition to print")
 	i18nfile := flag.String("i18n", "../kubevela.io/static/reference-i18n.json", "file path of i18n data")
+	forceExample := flag.Bool("force-example-doc", false, "example must be provided for definitions")
 	flag.Parse()
 
 	if *i18nfile != "" {
@@ -52,21 +53,29 @@ func main() {
 		fmt.Println("you must specify a type with definition ref path specified ")
 		os.Exit(1)
 	}
+
+	opt := mods.Options{
+		Path:          *path,
+		Location:      *location,
+		DefDir:        *defdir,
+		ForceExamples: *forceExample,
+	}
+
 	fmt.Printf("creating docs with args path=%s, location=%s, defdir=%s, type=%s.\n", *path, *location, *defdir, *tp)
 	switch types.CapType(*tp) {
 	case types.TypeComponentDefinition, "component", "comp":
-		mods.ComponentDef(ctx, c, path, location, *defdir)
+		mods.ComponentDef(ctx, c, opt)
 	case types.TypeTrait:
-		mods.TraitDef(ctx, c, path, location, *defdir)
+		mods.TraitDef(ctx, c, opt)
 	case types.TypePolicy:
-		mods.PolicyDef(ctx, c, path, location, *defdir)
+		mods.PolicyDef(ctx, c, opt)
 	case types.TypeWorkflowStep, "workflow", "wf":
-		mods.WorkflowDef(ctx, c, path, location, *defdir)
+		mods.WorkflowDef(ctx, c, opt)
 	case "":
-		mods.ComponentDef(ctx, c, path, location, *defdir)
-		mods.TraitDef(ctx, c, path, location, *defdir)
-		mods.PolicyDef(ctx, c, path, location, *defdir)
-		mods.WorkflowDef(ctx, c, path, location, *defdir)
+		mods.ComponentDef(ctx, c, opt)
+		mods.TraitDef(ctx, c, opt)
+		mods.PolicyDef(ctx, c, opt)
+		mods.WorkflowDef(ctx, c, opt)
 	default:
 		fmt.Printf("type %s not supported\n", *tp)
 		os.Exit(1)

hack/docgen/def/mods/component.go

@@ -19,7 +19,6 @@ package mods
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -60,12 +59,13 @@ title: 内置组件列表
 ` + fmt.Sprintf("> 本文档由[脚本](../../contributor/cli-ref-doc)自动生成，请勿手动修改，上次更新于 %s。\n\n", time.Now().Format(time.RFC3339))
 
 // ComponentDef generate component def reference doc
-func ComponentDef(ctx context.Context, c common.Args, path, location *string, defdir string) {
-	if defdir == "" {
-		defdir = ComponentDefDir
+func ComponentDef(ctx context.Context, c common.Args, opt Options) {
+	if opt.DefDir == "" {
+		opt.DefDir = ComponentDefDir
 	}
 	ref := &docgen.MarkdownReference{
-		AllInOne: true,
+		AllInOne:     true,
+		ForceExample: opt.ForceExamples,
 		Filter: func(capability types.Capability) bool {
 			if capability.Type != types.TypeComponentDefinition || capability.Category != types.CUECategory {
 				return false
@@ -74,9 +74,9 @@ func ComponentDef(ctx context.Context, c common.Args, path, location *string, de
 				return false
 			}
 			// only print capability which contained in cue def
-			files, err := ioutil.ReadDir(defdir)
+			files, err := os.ReadDir(opt.DefDir)
 			if err != nil {
-				fmt.Println("read dir err", defdir, err)
+				fmt.Println("read dir err", opt.DefDir, err)
 				return false
 			}
 			for _, f := range files {
@@ -96,19 +96,20 @@ func ComponentDef(ctx context.Context, c common.Args, path, location *string, de
 		return
 	}
 	ref.DiscoveryMapper = dm
-	if *path != "" {
+	if opt.Path != "" {
 		ref.I18N = &docgen.En
-		if strings.Contains(*location, "zh") || strings.Contains(*location, "chinese") {
+		if strings.Contains(opt.Location, "zh") || strings.Contains(opt.Location, "chinese") {
 			ref.I18N = &docgen.Zh
 			ref.CustomDocHeader = CustomComponentHeaderZH
 		}
-		if err := ref.GenerateReferenceDocs(ctx, c, *path); err != nil {
+		if err := ref.GenerateReferenceDocs(ctx, c, opt.Path); err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		fmt.Printf("component reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), *path)
+		fmt.Printf("component reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), opt.Path)
+		return
 	}
-	if *location == "" || *location == "en" {
+	if opt.Location == "" || opt.Location == "en" {
 		ref.I18N = &docgen.En
 		if err := ref.GenerateReferenceDocs(ctx, c, ComponentDefRefPath); err != nil {
 			fmt.Println(err)
@@ -116,7 +117,7 @@ func ComponentDef(ctx context.Context, c common.Args, path, location *string, de
 		}
 		fmt.Printf("component reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), ComponentDefRefPath)
 	}
-	if *location == "" || *location == "zh" {
+	if opt.Location == "" || opt.Location == "zh" {
 		ref.I18N = &docgen.Zh
 		ref.CustomDocHeader = CustomComponentHeaderZH
 		if err := ref.GenerateReferenceDocs(ctx, c, ComponentDefRefPathZh); err != nil {

hack/docgen/def/mods/policy.go

@@ -19,7 +19,6 @@ package mods
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -58,12 +57,13 @@ title: 内置策略列表
 ` + fmt.Sprintf("> 本文档由[脚本](../../contributor/cli-ref-doc)自动生成，请勿手动修改，上次更新于 %s。\n\n", time.Now().Format(time.RFC3339))
 
 // PolicyDef generate policy def reference doc
-func PolicyDef(ctx context.Context, c common.Args, path, location *string, defdir string) {
-	if defdir == "" {
-		defdir = PolicyDefDir
+func PolicyDef(ctx context.Context, c common.Args, opt Options) {
+	if opt.DefDir == "" {
+		opt.DefDir = PolicyDefDir
 	}
 	ref := &docgen.MarkdownReference{
-		AllInOne: true,
+		AllInOne:     true,
+		ForceExample: opt.ForceExamples,
 		Filter: func(capability types.Capability) bool {
 			if capability.Type != types.TypePolicy || capability.Category != types.CUECategory {
 				return false
@@ -72,9 +72,9 @@ func PolicyDef(ctx context.Context, c common.Args, path, location *string, defdi
 				return false
 			}
 			// only print capability which contained in cue def
-			files, err := ioutil.ReadDir(defdir)
+			files, err := os.ReadDir(opt.DefDir)
 			if err != nil {
-				fmt.Println("read dir err", defdir, err)
+				fmt.Println("read dir err", opt.DefDir, err)
 				return false
 			}
 			for _, f := range files {
@@ -86,20 +86,21 @@ func PolicyDef(ctx context.Context, c common.Args, path, location *string, defdi
 		},
 		CustomDocHeader: CustomPolicyHeaderEN,
 	}
-	ref.Remote = &docgen.FromCluster{Namespace: types.DefaultKubeVelaNS}
-	if *path != "" {
+	ref.Local = &docgen.FromLocal{Path: PolicyDefDir}
+	if opt.Path != "" {
 		ref.I18N = &docgen.En
-		if strings.Contains(*location, "zh") || strings.Contains(*location, "chinese") {
+		if strings.Contains(opt.Location, "zh") || strings.Contains(opt.Location, "chinese") {
 			ref.I18N = &docgen.Zh
 			ref.CustomDocHeader = CustomPolicyHeaderZH
 		}
-		if err := ref.GenerateReferenceDocs(ctx, c, *path); err != nil {
+		if err := ref.GenerateReferenceDocs(ctx, c, opt.Path); err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		fmt.Printf("policy reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), *path)
+		fmt.Printf("policy reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), opt.Path)
+		return
 	}
-	if *location == "" || *location == "en" {
+	if opt.Location == "" || opt.Location == "en" {
 		ref.I18N = &docgen.En
 		if err := ref.GenerateReferenceDocs(ctx, c, PolicyDefRefPath); err != nil {
 			fmt.Println(err)
@@ -107,7 +108,7 @@ func PolicyDef(ctx context.Context, c common.Args, path, location *string, defdi
 		}
 		fmt.Printf("policy reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), PolicyDefRefPath)
 	}
-	if *location == "" || *location == "zh" {
+	if opt.Location == "" || opt.Location == "zh" {
 		ref.I18N = &docgen.Zh
 		ref.CustomDocHeader = CustomPolicyHeaderZH
 		if err := ref.GenerateReferenceDocs(ctx, c, PolicyDefRefPathZh); err != nil {

hack/docgen/def/mods/trait.go

@@ -19,7 +19,6 @@ package mods
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -58,12 +57,13 @@ title: 内置运维特征列表
 ` + fmt.Sprintf("> 本文档由[脚本](../../contributor/cli-ref-doc)自动生成，请勿手动修改，上次更新于 %s。\n\n", time.Now().Format(time.RFC3339))
 
 // TraitDef generate trait def reference doc
-func TraitDef(ctx context.Context, c common.Args, path, location *string, defdir string) {
-	if defdir == "" {
-		defdir = TraitDefDir
+func TraitDef(ctx context.Context, c common.Args, opt Options) {
+	if opt.DefDir == "" {
+		opt.DefDir = TraitDefDir
 	}
 	ref := &docgen.MarkdownReference{
-		AllInOne: true,
+		AllInOne:     true,
+		ForceExample: opt.ForceExamples,
 		Filter: func(capability types.Capability) bool {
 			if capability.Type != types.TypeTrait || capability.Category != types.CUECategory {
 				return false
@@ -72,9 +72,9 @@ func TraitDef(ctx context.Context, c common.Args, path, location *string, defdir
 				return false
 			}
 			// only print capability which contained in cue def
-			files, err := ioutil.ReadDir(defdir)
+			files, err := os.ReadDir(opt.DefDir)
 			if err != nil {
-				fmt.Println("read dir err", defdir, err)
+				fmt.Println("read dir err", opt.DefDir, err)
 				return false
 			}
 			for _, f := range files {
@@ -90,20 +90,20 @@ func TraitDef(ctx context.Context, c common.Args, path, location *string, defdir
 		Path: TraitDefDir,
 	}
 
-	if *path != "" {
+	if opt.Path != "" {
 		ref.I18N = &docgen.En
-		if strings.Contains(*location, "zh") || strings.Contains(*location, "chinese") {
+		if strings.Contains(opt.Location, "zh") || strings.Contains(opt.Location, "chinese") {
 			ref.I18N = &docgen.Zh
 			ref.CustomDocHeader = CustomTraitHeaderZH
 		}
-		if err := ref.GenerateReferenceDocs(ctx, c, *path); err != nil {
+		if err := ref.GenerateReferenceDocs(ctx, c, opt.Path); err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		fmt.Printf("trait reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), *path)
+		fmt.Printf("trait reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), opt.Path)
 	} else {
 		// Generate to default path depends on language
-		if *location == "" || *location == "en" {
+		if opt.Location == "" || opt.Location == "en" {
 			ref.I18N = &docgen.En
 			if err := ref.GenerateReferenceDocs(ctx, c, TraitDefRefPath); err != nil {
 				fmt.Println(err)
@@ -111,7 +111,7 @@ func TraitDef(ctx context.Context, c common.Args, path, location *string, defdir
 			}
 			fmt.Printf("trait reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), TraitDefRefPath)
 		}
-		if *location == "" || *location == "zh" {
+		if opt.Location == "" || opt.Location == "zh" {
 			ref.I18N = &docgen.Zh
 			ref.CustomDocHeader = CustomTraitHeaderZH
 			if err := ref.GenerateReferenceDocs(ctx, c, TraitDefRefPathZh); err != nil {

hack/docgen/def/mods/types.go

@@ -0,0 +1,25 @@
+/*
+ Copyright 2022 The KubeVela Authors.
+
+ 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 mods
+
+// Options defines the doc generate options
+type Options struct {
+	Path          string
+	Location      string
+	DefDir        string
+	ForceExamples bool
+}

hack/docgen/def/mods/workflow.go

@@ -19,7 +19,6 @@ package mods
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -58,12 +57,13 @@ title: 内置工作流步骤列表
 ` + fmt.Sprintf("> 本文档由[脚本](../../contributor/cli-ref-doc)自动生成，请勿手动修改，上次更新于 %s。\n\n", time.Now().Format(time.RFC3339))
 
 // WorkflowDef generate workflow def reference doc
-func WorkflowDef(ctx context.Context, c common.Args, path, location *string, defdir string) {
-	if defdir == "" {
-		defdir = WorkflowDefDir
+func WorkflowDef(ctx context.Context, c common.Args, opt Options) {
+	if opt.DefDir == "" {
+		opt.DefDir = WorkflowDefDir
 	}
 	ref := &docgen.MarkdownReference{
-		AllInOne: true,
+		AllInOne:     true,
+		ForceExample: opt.ForceExamples,
 		Filter: func(capability types.Capability) bool {
 
 			if capability.Type != types.TypeWorkflowStep || capability.Category != types.CUECategory {
@@ -74,9 +74,9 @@ func WorkflowDef(ctx context.Context, c common.Args, path, location *string, def
 				return false
 			}
 			// only print capability which contained in cue def
-			files, err := ioutil.ReadDir(defdir)
+			files, err := os.ReadDir(opt.DefDir)
 			if err != nil {
-				fmt.Println("read dir err", defdir, err)
+				fmt.Println("read dir err", opt.DefDir, err)
 				return false
 			}
 			for _, f := range files {
@@ -88,21 +88,22 @@ func WorkflowDef(ctx context.Context, c common.Args, path, location *string, def
 		},
 		CustomDocHeader: CustomWorkflowHeaderEN,
 	}
-	ref.Remote = &docgen.FromCluster{Namespace: types.DefaultKubeVelaNS}
+	ref.Local = &docgen.FromLocal{Path: WorkflowDefDir}
 
-	if *path != "" {
+	if opt.Path != "" {
 		ref.I18N = &docgen.En
-		if strings.Contains(*location, "zh") || strings.Contains(*location, "chinese") {
+		if strings.Contains(opt.Location, "zh") || strings.Contains(opt.Location, "chinese") {
 			ref.I18N = &docgen.Zh
 			ref.CustomDocHeader = CustomWorkflowHeaderZH
 		}
-		if err := ref.GenerateReferenceDocs(ctx, c, *path); err != nil {
+		if err := ref.GenerateReferenceDocs(ctx, c, opt.Path); err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		fmt.Printf("workflow reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), *path)
+		fmt.Printf("workflow reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), opt.Path)
+		return
 	}
-	if *location == "" || *location == "en" {
+	if opt.Location == "" || opt.Location == "en" {
 		ref.I18N = &docgen.En
 		if err := ref.GenerateReferenceDocs(ctx, c, WorkflowDefRefPath); err != nil {
 			fmt.Println(err)
@@ -110,7 +111,7 @@ func WorkflowDef(ctx context.Context, c common.Args, path, location *string, def
 		}
 		fmt.Printf("workflow reference docs (%s) successfully generated in %s \n", ref.I18N.Language(), WorkflowDefRefPath)
 	}
-	if *location == "" || *location == "zh" {
+	if opt.Location == "" || opt.Location == "zh" {
 		ref.I18N = &docgen.Zh
 		ref.CustomDocHeader = CustomWorkflowHeaderZH
 		if err := ref.GenerateReferenceDocs(ctx, c, WorkflowDefRefPathZh); err != nil {

legacy/charts/vela-core-legacy/crds/core.oam.dev_applicationrevisions.yaml

@@ -499,7 +499,7 @@ spec:
                         description: Components record the related Components created
                           by Application Controller
                         items:
-                          description: 'ObjectReference contains enough information
+                          description: "ObjectReference contains enough information
                             to let you inspect or modify the referred object. ---
                             New uses of this type are discouraged because of difficulty
                             describing its usage when embedded in APIs.  1. Ignored
@@ -508,25 +508,25 @@ spec:
                             are both very rarely valid in actual usage.  2. Invalid
                             usage help.  It is impossible to add specific help for
                             individual usage.  In most embedded usages, there are
-                            particular     restrictions like, "must refer only to
-                            types A and B" or "UID not honored" or "name must be restricted".     Those
-                            cannot be well described when embedded.  3. Inconsistent
-                            validation.  Because the usages are different, the validation
-                            rules are different by usage, which makes it hard for
-                            users to predict what will happen.  4. The fields are
-                            both imprecise and overly precise.  Kind is not a precise
-                            mapping to a URL. This can produce ambiguity     during
-                            interpretation and require a REST mapping.  In most cases,
-                            the dependency is on the group,resource tuple     and
-                            the version of the actual struct is irrelevant.  5. We
-                            cannot easily change it.  Because this type is embedded
-                            in many locations, updates to this type     will affect
-                            numerous schemas.  Don''t make new APIs embed an underspecified
-                            API type they do not control. Instead of using this type,
-                            create a locally provided and used type that is well-focused
-                            on your reference. For example, ServiceReferences for
-                            admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                            .'
+                            particular     restrictions like, \"must refer only to
+                            types A and B\" or \"UID not honored\" or \"name must
+                            be restricted\".     Those cannot be well described when
+                            embedded.  3. Inconsistent validation.  Because the usages
+                            are different, the validation rules are different by usage,
+                            which makes it hard for users to predict what will happen.
+                            \ 4. The fields are both imprecise and overly precise.
+                            \ Kind is not a precise mapping to a URL. This can produce
+                            ambiguity     during interpretation and require a REST
+                            mapping.  In most cases, the dependency is on the group,resource
+                            tuple     and the version of the actual struct is irrelevant.
+                            \ 5. We cannot easily change it.  Because this type is
+                            embedded in many locations, updates to this type     will
+                            affect numerous schemas.  Don't make new APIs embed an
+                            underspecified API type they do not control. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                            ."
                           properties:
                             apiVersion:
                               description: API version of the referent.
@@ -659,7 +659,7 @@ spec:
                               type: string
                             scopes:
                               items:
-                                description: 'ObjectReference contains enough information
+                                description: "ObjectReference contains enough information
                                   to let you inspect or modify the referred object.
                                   --- New uses of this type are discouraged because
                                   of difficulty describing its usage when embedded
@@ -668,28 +668,28 @@ spec:
                                   ResourceVersion and FieldPath are both very rarely
                                   valid in actual usage.  2. Invalid usage help.  It
                                   is impossible to add specific help for individual
-                                  usage.  In most embedded usages, there are particular     restrictions
-                                  like, "must refer only to types A and B" or "UID
-                                  not honored" or "name must be restricted".     Those
-                                  cannot be well described when embedded.  3. Inconsistent
-                                  validation.  Because the usages are different, the
-                                  validation rules are different by usage, which makes
-                                  it hard for users to predict what will happen.  4.
-                                  The fields are both imprecise and overly precise.  Kind
-                                  is not a precise mapping to a URL. This can produce
-                                  ambiguity     during interpretation and require
-                                  a REST mapping.  In most cases, the dependency is
-                                  on the group,resource tuple     and the version
-                                  of the actual struct is irrelevant.  5. We cannot
-                                  easily change it.  Because this type is embedded
-                                  in many locations, updates to this type     will
-                                  affect numerous schemas.  Don''t make new APIs embed
-                                  an underspecified API type they do not control.
-                                  Instead of using this type, create a locally provided
-                                  and used type that is well-focused on your reference.
-                                  For example, ServiceReferences for admission registration:
-                                  https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                  .'
+                                  usage.  In most embedded usages, there are particular
+                                  \    restrictions like, \"must refer only to types
+                                  A and B\" or \"UID not honored\" or \"name must
+                                  be restricted\".     Those cannot be well described
+                                  when embedded.  3. Inconsistent validation.  Because
+                                  the usages are different, the validation rules are
+                                  different by usage, which makes it hard for users
+                                  to predict what will happen.  4. The fields are
+                                  both imprecise and overly precise.  Kind is not
+                                  a precise mapping to a URL. This can produce ambiguity
+                                  \    during interpretation and require a REST mapping.
+                                  \ In most cases, the dependency is on the group,resource
+                                  tuple     and the version of the actual struct is
+                                  irrelevant.  5. We cannot easily change it.  Because
+                                  this type is embedded in many locations, updates
+                                  to this type     will affect numerous schemas.  Don't
+                                  make new APIs embed an underspecified API type they
+                                  do not control. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                  ."
                                 properties:
                                   apiVersion:
                                     description: API version of the referent.
@@ -776,7 +776,7 @@ spec:
                           appRevision:
                             type: string
                           contextBackend:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -785,11 +785,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -798,13 +798,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -844,6 +844,7 @@ spec:
                             type: object
                           endTime:
                             format: date-time
+                            nullable: true
                             type: string
                           finished:
                             type: boolean
@@ -2414,7 +2415,7 @@ spec:
                         description: Components record the related Components created
                           by Application Controller
                         items:
-                          description: 'ObjectReference contains enough information
+                          description: "ObjectReference contains enough information
                             to let you inspect or modify the referred object. ---
                             New uses of this type are discouraged because of difficulty
                             describing its usage when embedded in APIs.  1. Ignored
@@ -2423,25 +2424,25 @@ spec:
                             are both very rarely valid in actual usage.  2. Invalid
                             usage help.  It is impossible to add specific help for
                             individual usage.  In most embedded usages, there are
-                            particular     restrictions like, "must refer only to
-                            types A and B" or "UID not honored" or "name must be restricted".     Those
-                            cannot be well described when embedded.  3. Inconsistent
-                            validation.  Because the usages are different, the validation
-                            rules are different by usage, which makes it hard for
-                            users to predict what will happen.  4. The fields are
-                            both imprecise and overly precise.  Kind is not a precise
-                            mapping to a URL. This can produce ambiguity     during
-                            interpretation and require a REST mapping.  In most cases,
-                            the dependency is on the group,resource tuple     and
-                            the version of the actual struct is irrelevant.  5. We
-                            cannot easily change it.  Because this type is embedded
-                            in many locations, updates to this type     will affect
-                            numerous schemas.  Don''t make new APIs embed an underspecified
-                            API type they do not control. Instead of using this type,
-                            create a locally provided and used type that is well-focused
-                            on your reference. For example, ServiceReferences for
-                            admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                            .'
+                            particular     restrictions like, \"must refer only to
+                            types A and B\" or \"UID not honored\" or \"name must
+                            be restricted\".     Those cannot be well described when
+                            embedded.  3. Inconsistent validation.  Because the usages
+                            are different, the validation rules are different by usage,
+                            which makes it hard for users to predict what will happen.
+                            \ 4. The fields are both imprecise and overly precise.
+                            \ Kind is not a precise mapping to a URL. This can produce
+                            ambiguity     during interpretation and require a REST
+                            mapping.  In most cases, the dependency is on the group,resource
+                            tuple     and the version of the actual struct is irrelevant.
+                            \ 5. We cannot easily change it.  Because this type is
+                            embedded in many locations, updates to this type     will
+                            affect numerous schemas.  Don't make new APIs embed an
+                            underspecified API type they do not control. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                            ."
                           properties:
                             apiVersion:
                               description: API version of the referent.
@@ -2574,7 +2575,7 @@ spec:
                               type: string
                             scopes:
                               items:
-                                description: 'ObjectReference contains enough information
+                                description: "ObjectReference contains enough information
                                   to let you inspect or modify the referred object.
                                   --- New uses of this type are discouraged because
                                   of difficulty describing its usage when embedded
@@ -2583,28 +2584,28 @@ spec:
                                   ResourceVersion and FieldPath are both very rarely
                                   valid in actual usage.  2. Invalid usage help.  It
                                   is impossible to add specific help for individual
-                                  usage.  In most embedded usages, there are particular     restrictions
-                                  like, "must refer only to types A and B" or "UID
-                                  not honored" or "name must be restricted".     Those
-                                  cannot be well described when embedded.  3. Inconsistent
-                                  validation.  Because the usages are different, the
-                                  validation rules are different by usage, which makes
-                                  it hard for users to predict what will happen.  4.
-                                  The fields are both imprecise and overly precise.  Kind
-                                  is not a precise mapping to a URL. This can produce
-                                  ambiguity     during interpretation and require
-                                  a REST mapping.  In most cases, the dependency is
-                                  on the group,resource tuple     and the version
-                                  of the actual struct is irrelevant.  5. We cannot
-                                  easily change it.  Because this type is embedded
-                                  in many locations, updates to this type     will
-                                  affect numerous schemas.  Don''t make new APIs embed
-                                  an underspecified API type they do not control.
-                                  Instead of using this type, create a locally provided
-                                  and used type that is well-focused on your reference.
-                                  For example, ServiceReferences for admission registration:
-                                  https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                  .'
+                                  usage.  In most embedded usages, there are particular
+                                  \    restrictions like, \"must refer only to types
+                                  A and B\" or \"UID not honored\" or \"name must
+                                  be restricted\".     Those cannot be well described
+                                  when embedded.  3. Inconsistent validation.  Because
+                                  the usages are different, the validation rules are
+                                  different by usage, which makes it hard for users
+                                  to predict what will happen.  4. The fields are
+                                  both imprecise and overly precise.  Kind is not
+                                  a precise mapping to a URL. This can produce ambiguity
+                                  \    during interpretation and require a REST mapping.
+                                  \ In most cases, the dependency is on the group,resource
+                                  tuple     and the version of the actual struct is
+                                  irrelevant.  5. We cannot easily change it.  Because
+                                  this type is embedded in many locations, updates
+                                  to this type     will affect numerous schemas.  Don't
+                                  make new APIs embed an underspecified API type they
+                                  do not control. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                  ."
                                 properties:
                                   apiVersion:
                                     description: API version of the referent.
@@ -2691,7 +2692,7 @@ spec:
                           appRevision:
                             type: string
                           contextBackend:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -2700,11 +2701,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -2713,13 +2714,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -2759,6 +2760,7 @@ spec:
                             type: object
                           endTime:
                             format: date-time
+                            nullable: true
                             type: string
                           finished:
                             type: boolean
@@ -4752,31 +4754,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -4813,6 +4816,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean

legacy/charts/vela-core-legacy/crds/core.oam.dev_applications.yaml

@@ -451,31 +451,31 @@ spec:
                 description: Components record the related Components created by Application
                   Controller
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -602,7 +602,7 @@ spec:
                       type: string
                     scopes:
                       items:
-                        description: 'ObjectReference contains enough information
+                        description: "ObjectReference contains enough information
                           to let you inspect or modify the referred object. --- New
                           uses of this type are discouraged because of difficulty
                           describing its usage when embedded in APIs.  1. Ignored
@@ -611,24 +611,24 @@ spec:
                           both very rarely valid in actual usage.  2. Invalid usage
                           help.  It is impossible to add specific help for individual
                           usage.  In most embedded usages, there are particular     restrictions
-                          like, "must refer only to types A and B" or "UID not honored"
-                          or "name must be restricted".     Those cannot be well described
-                          when embedded.  3. Inconsistent validation.  Because the
-                          usages are different, the validation rules are different
-                          by usage, which makes it hard for users to predict what
-                          will happen.  4. The fields are both imprecise and overly
-                          precise.  Kind is not a precise mapping to a URL. This can
-                          produce ambiguity     during interpretation and require
-                          a REST mapping.  In most cases, the dependency is on the
-                          group,resource tuple     and the version of the actual struct
-                          is irrelevant.  5. We cannot easily change it.  Because
-                          this type is embedded in many locations, updates to this
-                          type     will affect numerous schemas.  Don''t make new
-                          APIs embed an underspecified API type they do not control.
-                          Instead of using this type, create a locally provided and
-                          used type that is well-focused on your reference. For example,
-                          ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                          .'
+                          like, \"must refer only to types A and B\" or \"UID not
+                          honored\" or \"name must be restricted\".     Those cannot
+                          be well described when embedded.  3. Inconsistent validation.
+                          \ Because the usages are different, the validation rules
+                          are different by usage, which makes it hard for users to
+                          predict what will happen.  4. The fields are both imprecise
+                          and overly precise.  Kind is not a precise mapping to a
+                          URL. This can produce ambiguity     during interpretation
+                          and require a REST mapping.  In most cases, the dependency
+                          is on the group,resource tuple     and the version of the
+                          actual struct is irrelevant.  5. We cannot easily change
+                          it.  Because this type is embedded in many locations, updates
+                          to this type     will affect numerous schemas.  Don't make
+                          new APIs embed an underspecified API type they do not control.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                          ."
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -708,31 +708,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -769,6 +770,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean
@@ -1213,31 +1215,31 @@ spec:
                 description: Components record the related Components created by Application
                   Controller
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -1364,7 +1366,7 @@ spec:
                       type: string
                     scopes:
                       items:
-                        description: 'ObjectReference contains enough information
+                        description: "ObjectReference contains enough information
                           to let you inspect or modify the referred object. --- New
                           uses of this type are discouraged because of difficulty
                           describing its usage when embedded in APIs.  1. Ignored
@@ -1373,24 +1375,24 @@ spec:
                           both very rarely valid in actual usage.  2. Invalid usage
                           help.  It is impossible to add specific help for individual
                           usage.  In most embedded usages, there are particular     restrictions
-                          like, "must refer only to types A and B" or "UID not honored"
-                          or "name must be restricted".     Those cannot be well described
-                          when embedded.  3. Inconsistent validation.  Because the
-                          usages are different, the validation rules are different
-                          by usage, which makes it hard for users to predict what
-                          will happen.  4. The fields are both imprecise and overly
-                          precise.  Kind is not a precise mapping to a URL. This can
-                          produce ambiguity     during interpretation and require
-                          a REST mapping.  In most cases, the dependency is on the
-                          group,resource tuple     and the version of the actual struct
-                          is irrelevant.  5. We cannot easily change it.  Because
-                          this type is embedded in many locations, updates to this
-                          type     will affect numerous schemas.  Don''t make new
-                          APIs embed an underspecified API type they do not control.
-                          Instead of using this type, create a locally provided and
-                          used type that is well-focused on your reference. For example,
-                          ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                          .'
+                          like, \"must refer only to types A and B\" or \"UID not
+                          honored\" or \"name must be restricted\".     Those cannot
+                          be well described when embedded.  3. Inconsistent validation.
+                          \ Because the usages are different, the validation rules
+                          are different by usage, which makes it hard for users to
+                          predict what will happen.  4. The fields are both imprecise
+                          and overly precise.  Kind is not a precise mapping to a
+                          URL. This can produce ambiguity     during interpretation
+                          and require a REST mapping.  In most cases, the dependency
+                          is on the group,resource tuple     and the version of the
+                          actual struct is irrelevant.  5. We cannot easily change
+                          it.  Because this type is embedded in many locations, updates
+                          to this type     will affect numerous schemas.  Don't make
+                          new APIs embed an underspecified API type they do not control.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                          ."
                         properties:
                           apiVersion:
                             description: API version of the referent.
@@ -1470,31 +1472,32 @@ spec:
                   appRevision:
                     type: string
                   contextBackend:
-                    description: 'ObjectReference contains enough information to let
+                    description: "ObjectReference contains enough information to let
                       you inspect or modify the referred object. --- New uses of this
                       type are discouraged because of difficulty describing its usage
                       when embedded in APIs.  1. Ignored fields.  It includes many
                       fields which are not generally honored.  For instance, ResourceVersion
                       and FieldPath are both very rarely valid in actual usage.  2.
                       Invalid usage help.  It is impossible to add specific help for
-                      individual usage.  In most embedded usages, there are particular     restrictions
-                      like, "must refer only to types A and B" or "UID not honored"
-                      or "name must be restricted".     Those cannot be well described
-                      when embedded.  3. Inconsistent validation.  Because the usages
-                      are different, the validation rules are different by usage,
-                      which makes it hard for users to predict what will happen.  4.
-                      The fields are both imprecise and overly precise.  Kind is not
-                      a precise mapping to a URL. This can produce ambiguity     during
-                      interpretation and require a REST mapping.  In most cases, the
-                      dependency is on the group,resource tuple     and the version
-                      of the actual struct is irrelevant.  5. We cannot easily change
-                      it.  Because this type is embedded in many locations, updates
-                      to this type     will affect numerous schemas.  Don''t make
-                      new APIs embed an underspecified API type they do not control.
-                      Instead of using this type, create a locally provided and used
-                      type that is well-focused on your reference. For example, ServiceReferences
-                      for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                      .'
+                      individual usage.  In most embedded usages, there are particular
+                      \    restrictions like, \"must refer only to types A and B\"
+                      or \"UID not honored\" or \"name must be restricted\".     Those
+                      cannot be well described when embedded.  3. Inconsistent validation.
+                      \ Because the usages are different, the validation rules are
+                      different by usage, which makes it hard for users to predict
+                      what will happen.  4. The fields are both imprecise and overly
+                      precise.  Kind is not a precise mapping to a URL. This can produce
+                      ambiguity     during interpretation and require a REST mapping.
+                      \ In most cases, the dependency is on the group,resource tuple
+                      \    and the version of the actual struct is irrelevant.  5.
+                      We cannot easily change it.  Because this type is embedded in
+                      many locations, updates to this type     will affect numerous
+                      schemas.  Don't make new APIs embed an underspecified API type
+                      they do not control. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                      ."
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -1531,6 +1534,7 @@ spec:
                     type: object
                   endTime:
                     format: date-time
+                    nullable: true
                     type: string
                   finished:
                     type: boolean

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

@@ -59,7 +59,7 @@ spec:
                             type: string
                           traits:
                             items:
-                              description: 'ObjectReference contains enough information
+                              description: "ObjectReference contains enough information
                                 to let you inspect or modify the referred object.
                                 --- New uses of this type are discouraged because
                                 of difficulty describing its usage when embedded in
@@ -69,26 +69,26 @@ spec:
                                 usage.  2. Invalid usage help.  It is impossible to
                                 add specific help for individual usage.  In most embedded
                                 usages, there are particular     restrictions like,
-                                "must refer only to types A and B" or "UID not honored"
-                                or "name must be restricted".     Those cannot be
-                                well described when embedded.  3. Inconsistent validation.  Because
-                                the usages are different, the validation rules are
-                                different by usage, which makes it hard for users
-                                to predict what will happen.  4. The fields are both
-                                imprecise and overly precise.  Kind is not a precise
-                                mapping to a URL. This can produce ambiguity     during
-                                interpretation and require a REST mapping.  In most
-                                cases, the dependency is on the group,resource tuple     and
-                                the version of the actual struct is irrelevant.  5.
-                                We cannot easily change it.  Because this type is
-                                embedded in many locations, updates to this type     will
-                                affect numerous schemas.  Don''t make new APIs embed
-                                an underspecified API type they do not control. Instead
-                                of using this type, create a locally provided and
-                                used type that is well-focused on your reference.
-                                For example, ServiceReferences for admission registration:
-                                https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                                .'
+                                \"must refer only to types A and B\" or \"UID not
+                                honored\" or \"name must be restricted\".     Those
+                                cannot be well described when embedded.  3. Inconsistent
+                                validation.  Because the usages are different, the
+                                validation rules are different by usage, which makes
+                                it hard for users to predict what will happen.  4.
+                                The fields are both imprecise and overly precise.
+                                \ Kind is not a precise mapping to a URL. This can
+                                produce ambiguity     during interpretation and require
+                                a REST mapping.  In most cases, the dependency is
+                                on the group,resource tuple     and the version of
+                                the actual struct is irrelevant.  5. We cannot easily
+                                change it.  Because this type is embedded in many
+                                locations, updates to this type     will affect numerous
+                                schemas.  Don't make new APIs embed an underspecified
+                                API type they do not control. \n Instead of using
+                                this type, create a locally provided and used type
+                                that is well-focused on your reference. For example,
+                                ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                                ."
                               properties:
                                 apiVersion:
                                   description: API version of the referent.
@@ -129,7 +129,7 @@ spec:
                               type: object
                             type: array
                           workload:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -138,11 +138,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -151,13 +151,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -213,31 +213,31 @@ spec:
                 description: WorkloadReferences to the workloads that are in this
                   scope.
                 items:
-                  description: 'ObjectReference contains enough information to let
+                  description: "ObjectReference contains enough information to let
                     you inspect or modify the referred object. --- New uses of this
                     type are discouraged because of difficulty describing its usage
                     when embedded in APIs.  1. Ignored fields.  It includes many fields
                     which are not generally honored.  For instance, ResourceVersion
                     and FieldPath are both very rarely valid in actual usage.  2.
                     Invalid usage help.  It is impossible to add specific help for
-                    individual usage.  In most embedded usages, there are particular     restrictions
-                    like, "must refer only to types A and B" or "UID not honored"
-                    or "name must be restricted".     Those cannot be well described
-                    when embedded.  3. Inconsistent validation.  Because the usages
-                    are different, the validation rules are different by usage, which
-                    makes it hard for users to predict what will happen.  4. The fields
-                    are both imprecise and overly precise.  Kind is not a precise
-                    mapping to a URL. This can produce ambiguity     during interpretation
-                    and require a REST mapping.  In most cases, the dependency is
-                    on the group,resource tuple     and the version of the actual
-                    struct is irrelevant.  5. We cannot easily change it.  Because
-                    this type is embedded in many locations, updates to this type     will
-                    affect numerous schemas.  Don''t make new APIs embed an underspecified
-                    API type they do not control. Instead of using this type, create
-                    a locally provided and used type that is well-focused on your
-                    reference. For example, ServiceReferences for admission registration:
-                    https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                    .'
+                    individual usage.  In most embedded usages, there are particular
+                    \    restrictions like, \"must refer only to types A and B\" or
+                    \"UID not honored\" or \"name must be restricted\".     Those
+                    cannot be well described when embedded.  3. Inconsistent validation.
+                    \ Because the usages are different, the validation rules are different
+                    by usage, which makes it hard for users to predict what will happen.
+                    \ 4. The fields are both imprecise and overly precise.  Kind is
+                    not a precise mapping to a URL. This can produce ambiguity     during
+                    interpretation and require a REST mapping.  In most cases, the
+                    dependency is on the group,resource tuple     and the version
+                    of the actual struct is irrelevant.  5. We cannot easily change
+                    it.  Because this type is embedded in many locations, updates
+                    to this type     will affect numerous schemas.  Don't make new
+                    APIs embed an underspecified API type they do not control. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                    ."
                   properties:
                     apiVersion:
                       description: API version of the referent.
@@ -305,7 +305,7 @@ spec:
                             description: HealthStatus represents health status strings.
                             type: string
                           targetWorkload:
-                            description: 'ObjectReference contains enough information
+                            description: "ObjectReference contains enough information
                               to let you inspect or modify the referred object. ---
                               New uses of this type are discouraged because of difficulty
                               describing its usage when embedded in APIs.  1. Ignored
@@ -314,11 +314,11 @@ spec:
                               are both very rarely valid in actual usage.  2. Invalid
                               usage help.  It is impossible to add specific help for
                               individual usage.  In most embedded usages, there are
-                              particular     restrictions like, "must refer only to
-                              types A and B" or "UID not honored" or "name must be
-                              restricted".     Those cannot be well described when
-                              embedded.  3. Inconsistent validation.  Because the
-                              usages are different, the validation rules are different
+                              particular     restrictions like, \"must refer only
+                              to types A and B\" or \"UID not honored\" or \"name
+                              must be restricted\".     Those cannot be well described
+                              when embedded.  3. Inconsistent validation.  Because
+                              the usages are different, the validation rules are different
                               by usage, which makes it hard for users to predict what
                               will happen.  4. The fields are both imprecise and overly
                               precise.  Kind is not a precise mapping to a URL. This
@@ -327,13 +327,13 @@ spec:
                               is on the group,resource tuple     and the version of
                               the actual struct is irrelevant.  5. We cannot easily
                               change it.  Because this type is embedded in many locations,
-                              updates to this type     will affect numerous schemas.  Don''t
-                              make new APIs embed an underspecified API type they
-                              do not control. Instead of using this type, create a
-                              locally provided and used type that is well-focused
+                              updates to this type     will affect numerous schemas.
+                              \ Don't make new APIs embed an underspecified API type
+                              they do not control. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
                               on your reference. For example, ServiceReferences for
                               admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                              .'
+                              ."
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -461,7 +461,7 @@ spec:
                       description: HealthStatus represents health status strings.
                       type: string
                     targetWorkload:
-                      description: 'ObjectReference contains enough information to
+                      description: "ObjectReference contains enough information to
                         let you inspect or modify the referred object. --- New uses
                         of this type are discouraged because of difficulty describing
                         its usage when embedded in APIs.  1. Ignored fields.  It includes
@@ -469,24 +469,25 @@ spec:
                         ResourceVersion and FieldPath are both very rarely valid in
                         actual usage.  2. Invalid usage help.  It is impossible to
                         add specific help for individual usage.  In most embedded
-                        usages, there are particular     restrictions like, "must
-                        refer only to types A and B" or "UID not honored" or "name
-                        must be restricted".     Those cannot be well described when
+                        usages, there are particular     restrictions like, \"must
+                        refer only to types A and B\" or \"UID not honored\" or \"name
+                        must be restricted\".     Those cannot be well described when
                         embedded.  3. Inconsistent validation.  Because the usages
                         are different, the validation rules are different by usage,
-                        which makes it hard for users to predict what will happen.  4.
-                        The fields are both imprecise and overly precise.  Kind is
-                        not a precise mapping to a URL. This can produce ambiguity     during
-                        interpretation and require a REST mapping.  In most cases,
-                        the dependency is on the group,resource tuple     and the
-                        version of the actual struct is irrelevant.  5. We cannot
-                        easily change it.  Because this type is embedded in many locations,
-                        updates to this type     will affect numerous schemas.  Don''t
-                        make new APIs embed an underspecified API type they do not
-                        control. Instead of using this type, create a locally provided
-                        and used type that is well-focused on your reference. For
-                        example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
-                        .'
+                        which makes it hard for users to predict what will happen.
+                        \ 4. The fields are both imprecise and overly precise.  Kind
+                        is not a precise mapping to a URL. This can produce ambiguity
+                        \    during interpretation and require a REST mapping.  In
+                        most cases, the dependency is on the group,resource tuple
+                        \    and the version of the actual struct is irrelevant.  5.
+                        We cannot easily change it.  Because this type is embedded
+                        in many locations, updates to this type     will affect numerous
+                        schemas.  Don't make new APIs embed an underspecified API
+                        type they do not control. \n Instead of using this type, create
+                        a locally provided and used type that is well-focused on your
+                        reference. For example, ServiceReferences for admission registration:
+                        https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+                        ."
                       properties:
                         apiVersion:
                           description: API version of the referent.

makefiles/e2e.mk

@@ -6,8 +6,8 @@ e2e-setup-core-pre-hook:
 e2e-setup-core-post-hook:
 	kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s
 	helm install kruise https://github.com/openkruise/charts/releases/download/kruise-1.1.0/kruise-1.1.0.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true" --set daemon.socketLocation=/run/k3s/containerd/
+	kill -9 $(lsof -it:9098) || true
 	go run ./e2e/addon/mock &
-	sleep 15
 	bin/vela addon enable ./e2e/addon/mock/testdata/fluxcd
 	bin/vela addon enable ./e2e/addon/mock/testdata/rollout
 	bin/vela addon enable ./e2e/addon/mock/testdata/terraform
@@ -82,14 +82,9 @@ e2e-api-test:
 	ginkgo -v -skipPackage capability,setup,application -r e2e
 	ginkgo -v -r e2e/application
 
-ADDONSERVER = $(shell pgrep vela_addon_mock_server)
-
 
 .PHONY: e2e-apiserver-test
 e2e-apiserver-test:
-	pkill vela_addon_mock_server || true
-	go run ./e2e/addon/mock/vela_addon_mock_server.go &
-	sleep 15
 	go test -v -coverpkg=./... -coverprofile=/tmp/e2e_apiserver_test.out ./test/e2e-apiserver-test
 	@$(OK) tests pass
 

pkg/addon/addon.go

@@ -60,7 +60,6 @@ import (
 	common2 "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 	"github.com/oam-dev/kubevela/apis/types"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/config"
 	"github.com/oam-dev/kubevela/pkg/cue/script"
 	"github.com/oam-dev/kubevela/pkg/definition"
@@ -932,10 +931,12 @@ type Installer struct {
 
 	dryRun     bool
 	dryRunBuff *bytes.Buffer
+
+	registries []Registry
 }
 
 // NewAddonInstaller will create an installer for addon
-func NewAddonInstaller(ctx context.Context, cli client.Client, discoveryClient *discovery.DiscoveryClient, apply apply.Applicator, config *rest.Config, r *Registry, args map[string]interface{}, cache *Cache, opts ...InstallOption) Installer {
+func NewAddonInstaller(ctx context.Context, cli client.Client, discoveryClient *discovery.DiscoveryClient, apply apply.Applicator, config *rest.Config, r *Registry, args map[string]interface{}, cache *Cache, registries []Registry, opts ...InstallOption) Installer {
 	i := Installer{
 		ctx:        ctx,
 		config:     config,
@@ -946,6 +947,7 @@ func NewAddonInstaller(ctx context.Context, cli client.Client, discoveryClient *
 		cache:      cache,
 		dc:         discoveryClient,
 		dryRunBuff: &bytes.Buffer{},
+		registries: registries,
 	}
 	for _, opt := range opts {
 		opt(&i)
@@ -1042,16 +1044,41 @@ func (h *Installer) installDependency(addon *InstallPackage) error {
 		if h.dryRun {
 			continue
 		}
-		// always install addon's latest version
-		depAddon, err := h.loadInstallPackage(dep.Name, "")
-		if err != nil {
-			return err
-		}
 		depHandler := *h
 		depHandler.args = nil
-		if err = depHandler.enableAddon(depAddon); err != nil {
-			return errors.Wrap(err, "fail to dispatch dependent addon resource")
+		var depAddon *InstallPackage
+		// try to install the dependent addon from the same registry with the current addon
+		depAddon, err = h.loadInstallPackage(dep.Name, dep.Version)
+		if err == nil {
+			if err = depHandler.enableAddon(depAddon); err != nil {
+				return errors.Wrap(err, "fail to dispatch dependent addon resource")
+			}
+			return nil
 		}
+		if !errors.Is(err, ErrNotExist) {
+			return err
+		}
+		for _, registry := range h.registries {
+			// try to install dependent addon from other registries
+			depHandler.r = &Registry{
+				Name: registry.Name, Helm: registry.Helm, OSS: registry.OSS, Git: registry.Git, Gitee: registry.Gitee, Gitlab: registry.Gitlab,
+			}
+			depAddon, err = depHandler.loadInstallPackage(dep.Name, dep.Version)
+			if err == nil {
+				break
+			}
+			if errors.Is(err, ErrNotExist) {
+				continue
+			}
+			return err
+		}
+		if err == nil {
+			if err = depHandler.enableAddon(depAddon); err != nil {
+				return errors.Wrap(err, "fail to dispatch dependent addon resource")
+			}
+			return nil
+		}
+		return fmt.Errorf("dependency addon: %s with version: %s cannot be found from all registries", dep.Name, dep.Version)
 	}
 	if h.dryRun && len(dependencies) > 0 {
 		klog.Warningf("dry run addon won't install dependencies, please make sure your system has already installed these addons: %v", strings.Join(dependencies, ", "))
@@ -1372,12 +1399,12 @@ func checkSemVer(actual string, require string) (bool, error) {
 	l := strings.ReplaceAll(require, "v", " ")
 	constraint, err := semver.NewConstraint(l)
 	if err != nil {
-		log.Logger.Errorf("fail to new constraint: %s", err.Error())
+		klog.Errorf("fail to new constraint: %s", err.Error())
 		return false, err
 	}
 	v, err := semver.NewVersion(semVer)
 	if err != nil {
-		log.Logger.Errorf("fail to new version %s: %s", semVer, err.Error())
+		klog.Errorf("fail to new version %s: %s", semVer, err.Error())
 		return false, err
 	}
 	if constraint.Check(v) {
@@ -1391,7 +1418,7 @@ func checkSemVer(actual string, require string) (bool, error) {
 		}
 		v, err := semver.NewVersion(semVer)
 		if err != nil {
-			log.Logger.Errorf("fail to new version %s: %s", semVer, err.Error())
+			klog.Errorf("fail to new version %s: %s", semVer, err.Error())
 			return false, err
 		}
 		if constraint.Check(v) {

pkg/addon/addon_suite_test.go

@@ -355,7 +355,7 @@ var _ = Describe("func addon update ", func() {
 		}, time.Millisecond*500, 30*time.Second).Should(BeNil())
 
 		pkg := &InstallPackage{Meta: Meta{Name: "test-update", Version: "1.3.0"}}
-		h := NewAddonInstaller(context.Background(), k8sClient, nil, nil, nil, &Registry{Name: "test"}, nil, nil)
+		h := NewAddonInstaller(context.Background(), k8sClient, nil, nil, nil, &Registry{Name: "test"}, nil, nil, nil)
 		h.addon = pkg
 		Expect(h.dispatchAddonResource(pkg)).Should(BeNil())
 
@@ -418,7 +418,7 @@ var _ = Describe("test dry-run addon from local dir", func() {
 		pkg, err := GetInstallPackageFromReader(r, &meta, UIData)
 		Expect(err).Should(BeNil())
 
-		h := NewAddonInstaller(ctx, k8sClient, dc, apply.NewAPIApplicator(k8sClient), cfg, &Registry{Name: LocalAddonRegistryName}, map[string]interface{}{"example": "test-dry-run"}, nil, DryRunAddon)
+		h := NewAddonInstaller(ctx, k8sClient, dc, apply.NewAPIApplicator(k8sClient), cfg, &Registry{Name: LocalAddonRegistryName}, map[string]interface{}{"example": "test-dry-run"}, nil, nil, DryRunAddon)
 
 		err = h.enableAddon(pkg)
 		Expect(err).Should(BeNil())

pkg/addon/cache.go

@@ -23,7 +23,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
+	"k8s.io/klog/v2"
+
 	"github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/pkg/utils/common"
 )
@@ -113,7 +114,7 @@ func (u *Cache) GetUIData(r Registry, addonName, version string) (*UIData, error
 		})
 		addon, err = versionedRegistry.GetAddonUIData(context.Background(), addonName, version)
 		if err != nil {
-			log.Logger.Errorf("fail to get addons from registry %s for cache updating, %v", utils.Sanitize(r.Name), err)
+			klog.Errorf("fail to get addons from registry %s for cache updating, %v", utils.Sanitize(r.Name), err)
 			return nil, err
 		}
 	}
@@ -278,7 +279,7 @@ func (u *Cache) putVersionedUIData2Cache(registryName, addonName, version string
 func (u *Cache) discoverAndRefreshRegistry() {
 	registries, err := u.ds.ListRegistries(context.Background())
 	if err != nil {
-		log.Logger.Errorf("fail to get registry %v", err)
+		klog.Errorf("fail to get registry %v", err)
 		return
 	}
 	u.putRegistry2Cache(registries)
@@ -301,13 +302,13 @@ func (u *Cache) discoverAndRefreshRegistry() {
 func (u *Cache) listUIDataAndCache(r Registry) ([]*UIData, error) {
 	registryMeta, err := r.ListAddonMeta()
 	if err != nil {
-		log.Logger.Errorf("fail to list registry %s metadata,  %v", r.Name, err)
+		klog.Errorf("fail to list registry %s metadata,  %v", r.Name, err)
 		return nil, err
 	}
 	u.putAddonMeta2Cache(r.Name, registryMeta)
 	uiData, err := r.ListUIData(registryMeta, UIMetaOptions)
 	if err != nil {
-		log.Logger.Errorf("fail to get addons from registry %s for cache updating, %v", r.Name, err)
+		klog.Errorf("fail to get addons from registry %s for cache updating, %v", r.Name, err)
 		return nil, err
 	}
 	u.putAddonUIData2Cache(r.Name, uiData)
@@ -322,13 +323,13 @@ func (u *Cache) listVersionRegistryUIDataAndCache(r Registry) ([]*UIData, error)
 	})
 	uiDatas, err := versionedRegistry.ListAddon()
 	if err != nil {
-		log.Logger.Errorf("fail to get addons from registry %s for cache updating, %v", r.Name, err)
+		klog.Errorf("fail to get addons from registry %s for cache updating, %v", r.Name, err)
 		return nil, err
 	}
 	for _, addon := range uiDatas {
 		uiData, err := versionedRegistry.GetAddonUIData(context.Background(), addon.Name, addon.Version)
 		if err != nil {
-			log.Logger.Errorf("fail to get addon from versioned registry %s, addon %s version %s for cache updating, %v", r.Name, addon.Name, addon.Version, err)
+			klog.Errorf("fail to get addon from versioned registry %s, addon %s version %s for cache updating, %v", r.Name, addon.Name, addon.Version, err)
 			continue
 		}
 		u.putVersionedUIData2Cache(r.Name, addon.Name, addon.Version, uiData)

pkg/addon/error.go

@@ -43,6 +43,9 @@ var (
 
 	// ErrBothCueAndYamlTmpl means yaml and cue app template are exist in addon
 	ErrBothCueAndYamlTmpl = NewAddonError("yaml and cue app template are exist in addon, should only keep one of them")
+
+	// ErrFetch means fetch addon package error(package not exist or parse archive error and so on)
+	ErrFetch = NewAddonError("cannot fetch addon package")
 )
 
 // WrapErrRateLimit return ErrRateLimit if is the situation, or return error directly

pkg/addon/helper.go

@@ -22,13 +22,13 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"k8s.io/client-go/discovery"
-	"k8s.io/klog/v2"
-
+	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	commontypes "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -55,8 +55,8 @@ const (
 )
 
 // EnableAddon will enable addon with dependency check, source is where addon from.
-func EnableAddon(ctx context.Context, name string, version string, cli client.Client, discoveryClient *discovery.DiscoveryClient, apply apply.Applicator, config *rest.Config, r Registry, args map[string]interface{}, cache *Cache, opts ...InstallOption) error {
-	h := NewAddonInstaller(ctx, cli, discoveryClient, apply, config, &r, args, cache, opts...)
+func EnableAddon(ctx context.Context, name string, version string, cli client.Client, discoveryClient *discovery.DiscoveryClient, apply apply.Applicator, config *rest.Config, r Registry, args map[string]interface{}, cache *Cache, registries []Registry, opts ...InstallOption) error {
+	h := NewAddonInstaller(ctx, cli, discoveryClient, apply, config, &r, args, cache, registries, opts...)
 	pkg, err := h.loadInstallPackage(name, version)
 	if err != nil {
 		return err
@@ -83,7 +83,7 @@ func DisableAddon(ctx context.Context, cli client.Client, name string, config *r
 			return err
 		}
 		if len(usingAddonApp) != 0 {
-			return fmt.Errorf(fmt.Sprintf("%s please delete them first", usingAppsInfo(usingAddonApp)))
+			return errors.New(appsDependsOnAddonErrInfo(usingAddonApp))
 		}
 	}
 
@@ -113,7 +113,7 @@ func EnableAddonByLocalDir(ctx context.Context, name string, dir string, cli cli
 	if err != nil {
 		return err
 	}
-	h := NewAddonInstaller(ctx, cli, dc, applicator, config, &Registry{Name: LocalAddonRegistryName}, args, nil, opts...)
+	h := NewAddonInstaller(ctx, cli, dc, applicator, config, &Registry{Name: LocalAddonRegistryName}, args, nil, nil, opts...)
 	needEnableAddonNames, err := h.checkDependency(pkg)
 	if err != nil {
 		return err
@@ -280,8 +280,8 @@ func GetObservabilityAccessibilityInfo(ctx context.Context, k8sClient client.Cli
 	return domains, nil
 }
 
-// FindWholeAddonPackagesFromRegistry find addons' WholeInstallPackage from registries, empty registryName indicates matching all
-func FindWholeAddonPackagesFromRegistry(ctx context.Context, k8sClient client.Client, addonNames []string, registryNames []string) ([]*WholeAddonPackage, error) {
+// FindAddonPackagesDetailFromRegistry find addons' WholeInstallPackage from registries, empty registryName indicates matching all
+func FindAddonPackagesDetailFromRegistry(ctx context.Context, k8sClient client.Client, addonNames []string, registryNames []string) ([]*WholeAddonPackage, error) {
 	var addons []*WholeAddonPackage
 	var registries []Registry
 

pkg/addon/helper_test.go

@@ -17,9 +17,12 @@ limitations under the License.
 package addon
 
 import (
+	"bytes"
 	"context"
 	"errors"
+	"net/http"
 	"net/http/httptest"
+	"os"
 	"strings"
 
 	v1 "k8s.io/api/core/v1"
@@ -29,33 +32,68 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("test FindWholeAddonPackagesFromRegistry", func() {
+func setupMockServer() *httptest.Server {
+	var listenURL string
+	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		fileList := []string{
+			"index.yaml",
+			"fluxcd-test-version-1.0.0.tgz",
+			"fluxcd-test-version-2.0.0.tgz",
+			"vela-workflow-v0.3.5.tgz",
+			"foo-v1.0.0.tgz",
+			"bar-v1.0.0.tgz",
+			"bar-v2.0.0.tgz",
+			"mock-be-dep-addon-v1.0.0.tgz",
+		}
+		for _, f := range fileList {
+			if strings.Contains(req.URL.Path, f) {
+				file, err := os.ReadFile("../../e2e/addon/mock/testrepo/helm-repo/" + f)
+				if err != nil {
+					_, _ = w.Write([]byte(err.Error()))
+				}
+				if f == "index.yaml" {
+					// in index.yaml, url is hardcoded to 127.0.0.1:9098,
+					// so we need to replace it with the real random listen url
+					file = bytes.ReplaceAll(file, []byte("http://127.0.0.1:9098"), []byte(listenURL))
+				}
+				_, _ = w.Write(file)
+			}
+		}
+	}))
+	listenURL = s.URL
+	return s
+}
+
+var _ = Describe("test FindAddonPackagesDetailFromRegistry", func() {
 	Describe("when no registry is added, no matter what you do, it will just return error", func() {
 		Context("when empty addonNames and registryNames is supplied", func() {
 			It("should return error", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{}, []string{})
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{}, []string{})
 				Expect(err).To(HaveOccurred())
 			})
 			It("should return error", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, nil, nil)
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, nil, nil)
 				Expect(err).To(HaveOccurred())
 			})
 		})
 		Context("when non-empty addonNames and registryNames is supplied", func() {
 			It("should return error saying ErrRegistryNotExist", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"fluxcd"}, []string{"some-registry"})
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"fluxcd"}, []string{"some-registry"})
 				Expect(errors.Is(err, ErrRegistryNotExist)).To(BeTrue())
 			})
 		})
 	})
 
 	Describe("one versioned registry is added", func() {
+		var s *httptest.Server
+
 		BeforeEach(func() {
-			// Prepare KubeVela registry
+			s = setupMockServer()
+			// Prepare registry
 			reg := &Registry{
-				Name: "KubeVela",
+				Name: "addon_helper_test",
 				Helm: &HelmSource{
-					URL: "https://addons.kubevela.net",
+					URL: s.URL,
 				},
 			}
 			ds := NewRegistryDataStore(k8sClient)
@@ -63,44 +101,42 @@ var _ = Describe("test FindWholeAddonPackagesFromRegistry", func() {
 		})
 
 		AfterEach(func() {
-			// Clean up KubeVela registry
+			// Clean up registry
 			ds := NewRegistryDataStore(k8sClient)
-			Expect(ds.DeleteRegistry(context.Background(), "KubeVela")).To(Succeed())
+			Expect(ds.DeleteRegistry(context.Background(), "addon_helper_test")).To(Succeed())
+			s.Close()
 		})
 
 		Context("when empty addonNames and registryNames is supplied", func() {
 			It("should return error, empty addonNames are not allowed", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{}, []string{"KubeVela"})
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{}, []string{"addon_helper_test"})
 				Expect(err).To(HaveOccurred())
 			})
 			It("should return error, empty addonNames are not allowed", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, nil, []string{"KubeVela"})
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, nil, []string{"addon_helper_test"})
 				Expect(err).To(HaveOccurred())
 			})
 		})
 
 		Context("one existing addon name provided", func() {
 			It("should return one valid result, matching all registries", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"velaux"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"foo"}, nil)
+
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(1))
-				Expect(res[0].Name).To(Equal("velaux"))
-				Expect(res[0].InstallPackage).ToNot(BeNil())
-				Expect(res[0].APISchema).ToNot(BeNil())
+				Expect(res[0].Name).To(Equal("foo"))
 			})
 			It("should return one valid result, matching one registry", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"velaux"}, []string{"KubeVela"})
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"foo"}, []string{"addon_helper_test"})
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(1))
-				Expect(res[0].Name).To(Equal("velaux"))
-				Expect(res[0].InstallPackage).ToNot(BeNil())
-				Expect(res[0].APISchema).ToNot(BeNil())
+				Expect(res[0].Name).To(Equal("foo"))
 			})
 		})
 
 		Context("one non-existent addon name provided", func() {
 			It("should return error as ErrNotExist", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"non-existent-addon"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"non-existent-addon"}, nil)
 				Expect(errors.Is(err, ErrNotExist)).To(BeTrue())
 				Expect(res).To(BeNil())
 			})
@@ -108,26 +144,20 @@ var _ = Describe("test FindWholeAddonPackagesFromRegistry", func() {
 
 		Context("two existing addon names provided", func() {
 			It("should return two valid result", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"velaux", "traefik"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"foo", "bar"}, nil)
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(2))
-				Expect(res[0].Name).To(Equal("velaux"))
-				Expect(res[0].InstallPackage).ToNot(BeNil())
-				Expect(res[0].APISchema).ToNot(BeNil())
-				Expect(res[1].Name).To(Equal("traefik"))
-				Expect(res[1].InstallPackage).ToNot(BeNil())
-				Expect(res[1].APISchema).ToNot(BeNil())
+				Expect(res[0].Name).To(Equal("foo"))
+				Expect(res[1].Name).To(Equal("bar"))
 			})
 		})
 
 		Context("one existing addon name and one non-existent addon name provided", func() {
 			It("should return only one valid result", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"velaux", "non-existent-addon"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"foo", "non-existent-addon"}, nil)
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(1))
-				Expect(res[0].Name).To(Equal("velaux"))
-				Expect(res[0].InstallPackage).ToNot(BeNil())
-				Expect(res[0].APISchema).ToNot(BeNil())
+				Expect(res[0].Name).To(Equal("foo"))
 			})
 		})
 	})
@@ -151,25 +181,25 @@ var _ = Describe("test FindWholeAddonPackagesFromRegistry", func() {
 
 		Context("when empty addonNames and registryNames is supplied", func() {
 			It("should return error, empty addonNames are not allowed", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{}, []string{})
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{}, []string{})
 				Expect(err).To(HaveOccurred())
 			})
 			It("should return error, empty addonNames are not allowed", func() {
-				_, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, nil, []string{"testreg"})
+				_, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, nil, []string{"testreg"})
 				Expect(err).To(HaveOccurred())
 			})
 		})
 
 		Context("one existing addon name provided", func() {
 			It("should return one valid result, matching all registries", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"example"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"example"}, nil)
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(1))
 				Expect(res[0].Name).To(Equal("example"))
 				Expect(res[0].InstallPackage).ToNot(BeNil())
 			})
 			It("should return one valid result, matching one registry", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"example"}, []string{"testreg"})
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"example"}, []string{"testreg"})
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(1))
 				Expect(res[0].Name).To(Equal("example"))
@@ -179,7 +209,7 @@ var _ = Describe("test FindWholeAddonPackagesFromRegistry", func() {
 
 		Context("one non-existent addon name provided", func() {
 			It("should return error as ErrNotExist", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"non-existent-addon"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"non-existent-addon"}, nil)
 				Expect(errors.Is(err, ErrNotExist)).To(BeTrue())
 				Expect(res).To(BeNil())
 			})
@@ -187,7 +217,7 @@ var _ = Describe("test FindWholeAddonPackagesFromRegistry", func() {
 
 		Context("one existing addon name and one non-existent addon name provided", func() {
 			It("should return only one valid result", func() {
-				res, err := FindWholeAddonPackagesFromRegistry(context.Background(), k8sClient, []string{"example", "non-existent-addon"}, nil)
+				res, err := FindAddonPackagesDetailFromRegistry(context.Background(), k8sClient, []string{"example", "non-existent-addon"}, nil)
 				Expect(err).To(Succeed())
 				Expect(res).To(HaveLen(1))
 				Expect(res[0].Name).To(Equal("example"))

pkg/addon/type.go

@@ -105,7 +105,8 @@ type DeployTo struct {
 
 // Dependency defines the other addons it depends on
 type Dependency struct {
-	Name string `json:"name,omitempty"`
+	Name    string `json:"name,omitempty"`
+	Version string `json:"version,omitempty"`
 }
 
 // ElementFile can be addon's definition or addon's component

pkg/addon/utils.go

@@ -187,7 +187,7 @@ func findLegacyAddonDefs(ctx context.Context, k8sClient client.Client, addonName
 		if registry.Name == registryName {
 			var uiData *UIData
 			if !IsVersionRegistry(registry) {
-				installer := NewAddonInstaller(ctx, k8sClient, nil, nil, config, &registries[i], nil, nil)
+				installer := NewAddonInstaller(ctx, k8sClient, nil, nil, config, &registries[i], nil, nil, nil)
 				metas, err := installer.getAddonMeta()
 				if err != nil {
 					return err
@@ -244,18 +244,18 @@ func findLegacyAddonDefs(ctx context.Context, k8sClient client.Client, addonName
 	return nil
 }
 
-func usingAppsInfo(apps []v1beta1.Application) string {
-	res := "addon is being used :"
-	appsNamespaceNameList := map[string][]string{}
+func appsDependsOnAddonErrInfo(apps []v1beta1.Application) string {
+	var appsNamespaceNameList []string
+	i := 0
 	for _, app := range apps {
-		appsNamespaceNameList[app.GetNamespace()] = append(appsNamespaceNameList[app.GetNamespace()], app.GetName())
+		appsNamespaceNameList = append(appsNamespaceNameList, app.Namespace+"/"+app.Name)
+		i++
+		if i > 2 && len(apps) > i {
+			appsNamespaceNameList = append(appsNamespaceNameList, fmt.Sprintf("and other %d more", len(apps)-i))
+			break
+		}
 	}
-	for namespace, appNames := range appsNamespaceNameList {
-		nameStr := strings.Join(appNames, ",")
-		res += fmt.Sprintf("{%s} in namespace:%s,", nameStr, namespace)
-	}
-	res = strings.TrimSuffix(res, ",") + ".Please delete them before disabling the addon."
-	return res
+	return fmt.Sprintf("this addon is being used by: %s applications. Please delete all of them before removing.", strings.Join(appsNamespaceNameList, ", "))
 }
 
 // IsVersionRegistry  check the repo source if support multi-version addon
@@ -502,3 +502,17 @@ func checkBondComponentExist(u unstructured.Unstructured, app v1beta1.Applicatio
 	}
 	return false
 }
+
+// FilterDependencyRegistries will return all registries besides the target registry itself
+func FilterDependencyRegistries(i int, rs []Registry) []Registry {
+	if i >= len(rs) {
+		return rs
+	}
+	if i < 0 {
+		return rs
+	}
+	ret := make([]Registry, len(rs)-1)
+	copy(ret, rs[:i])
+	copy(ret[i:], rs[i+1:])
+	return ret
+}

pkg/addon/utils_test.go

@@ -155,9 +155,31 @@ func TestUsingAddonInfo(t *testing.T) {
 		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-1", Name: "app-1"}},
 		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-2", Name: "app-2"}},
 		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-1", Name: "app-3"}},
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-3", Name: "app-3"}},
 	}
-	res := usingAppsInfo(apps)
-	assert.Equal(t, true, strings.Contains(res, "Please delete them before disabling the addon"))
+	res := appsDependsOnAddonErrInfo(apps)
+	assert.Contains(t, res, "and other 1 more applications. Please delete all of them before removing.")
+
+	apps = []v1beta1.Application{
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-1", Name: "app-1"}},
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-2", Name: "app-2"}},
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-1", Name: "app-3"}},
+	}
+	res = appsDependsOnAddonErrInfo(apps)
+	assert.Contains(t, res, "Please delete all of them before removing.")
+
+	apps = []v1beta1.Application{
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-1", Name: "app-1"}},
+	}
+	res = appsDependsOnAddonErrInfo(apps)
+	assert.Contains(t, res, "this addon is being used by: namespace-1/app-1 applications. Please delete all of them before removing.")
+
+	apps = []v1beta1.Application{
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-1", Name: "app-1"}},
+		v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "namespace-2", Name: "app-2"}},
+	}
+	res = appsDependsOnAddonErrInfo(apps)
+	assert.Contains(t, res, ". Please delete all of them before removing.")
 }
 
 func TestIsAddonDir(t *testing.T) {
@@ -329,6 +351,57 @@ func TestCheckObjectBindingComponent(t *testing.T) {
 	}
 }
 
+func TestFilterDependencyRegistries(t *testing.T) {
+	testCases := []struct {
+		registries []Registry
+		index      int
+		res        []Registry
+		origin     []Registry
+	}{
+		{
+			registries: []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			index:      0,
+			res:        []Registry{{Name: "r2"}, {Name: "r3"}},
+			origin:     []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+		},
+		{
+			registries: []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			index:      1,
+			res:        []Registry{{Name: "r1"}, {Name: "r3"}},
+			origin:     []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+		},
+		{
+			registries: []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			index:      2,
+			res:        []Registry{{Name: "r1"}, {Name: "r2"}},
+			origin:     []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+		},
+		{
+			registries: []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			index:      3,
+			res:        []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			origin:     []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+		},
+		{
+			registries: []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			index:      -1,
+			res:        []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+			origin:     []Registry{{Name: "r1"}, {Name: "r2"}, {Name: "r3"}},
+		},
+		{
+			registries: []Registry{},
+			index:      0,
+			res:        []Registry{},
+			origin:     []Registry{},
+		},
+	}
+	for _, testCase := range testCases {
+		res := FilterDependencyRegistries(testCase.index, testCase.registries)
+		assert.Equal(t, res, testCase.res)
+		assert.Equal(t, testCase.registries, testCase.origin)
+	}
+}
+
 const (
 	compDefYaml = `
 apiVersion: core.oam.dev/v1beta1

pkg/addon/versioned_registry.go

@@ -23,10 +23,11 @@ import (
 	"sort"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/pkg/errors"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/repo"
+	"k8s.io/klog/v2"
 
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/pkg/utils/common"
 	"github.com/oam-dev/kubevela/pkg/utils/helm"
@@ -146,8 +147,9 @@ func (i versionedRegistry) loadAddon(ctx context.Context, name, version string)
 	sort.Sort(sort.Reverse(versions))
 	addonVersion, availableVersions := chooseVersion(version, versions)
 	if addonVersion == nil {
-		return nil, fmt.Errorf("specified version %s not exist", version)
+		return nil, errors.Errorf("specified version %s not exist", utils.Sanitize(version))
 	}
+	klog.Infof("Addon '%s' with version '%s' found from registry '%s'", addonVersion.Name, addonVersion.Version, i.name)
 	for _, chartURL := range addonVersion.URLs {
 		if !utils.IsValidURL(chartURL) {
 			chartURL, err = utils.JoinURL(i.url, chartURL)
@@ -172,7 +174,7 @@ func (i versionedRegistry) loadAddon(ctx context.Context, name, version string)
 		addonPkg.Meta.SystemRequirements = LoadSystemRequirements(addonVersion.Annotations)
 		return addonPkg, nil
 	}
-	return nil, fmt.Errorf("cannot fetch addon package")
+	return nil, ErrFetch
 }
 
 // loadAddonVersions Load all available versions of the addon
@@ -233,7 +235,6 @@ func chooseVersion(specifiedVersion string, versions []*repo.ChartVersion) (*rep
 				continue
 			}
 			addonVersion = v
-			log.Logger.Infof("Use the latest version %s by default, you can use --version to specify", v.Version)
 		}
 	}
 	return addonVersion, availableVersions

pkg/apiserver/domain/model/application.go

@@ -247,6 +247,9 @@ var RevisionStatusTerminated = "terminated"
 // RevisionStatusRollback event status rollback
 var RevisionStatusRollback = "rollback"
 
+// WorkflowStepPhaseStopped is the stopped phase
+var WorkflowStepPhaseStopped workflowv1alpha1.WorkflowStepPhase = "stopped"
+
 // ApplicationRevision be created when an application initiates deployment and describes the phased version of the application.
 type ApplicationRevision struct {
 	BaseModel
@@ -383,6 +386,7 @@ type ApplicationTrigger struct {
 	Type          string `json:"type"`
 	PayloadType   string `json:"payloadType"`
 	ComponentName string `json:"componentName"`
+	Registry      string `json:"registry,omitempty"`
 }
 
 const (

pkg/apiserver/domain/model/model.go

@@ -23,9 +23,8 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/yaml"
-
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 )
 
 var tableNamePrefix = "vela_"
@@ -102,7 +101,7 @@ func NewJSONStructByStruct(object interface{}) (*JSONStruct, error) {
 func (j *JSONStruct) JSON() string {
 	b, err := json.Marshal(j)
 	if err != nil {
-		log.Logger.Errorf("json marshal failure %s", err.Error())
+		klog.Errorf("json marshal failure %s", err.Error())
 	}
 	return string(b)
 }
@@ -111,12 +110,12 @@ func (j *JSONStruct) JSON() string {
 func (j *JSONStruct) RawExtension() *runtime.RawExtension {
 	yamlByte, err := yaml.Marshal(j)
 	if err != nil {
-		log.Logger.Errorf("yaml marshal failure %s", err.Error())
+		klog.Errorf("yaml marshal failure %s", err.Error())
 		return nil
 	}
 	b, err := yaml.YAMLToJSON(yamlByte)
 	if err != nil {
-		log.Logger.Errorf("yaml to json failure %s", err.Error())
+		klog.Errorf("yaml to json failure %s", err.Error())
 		return nil
 	}
 	return &runtime.RawExtension{Raw: b}

pkg/apiserver/domain/model/pipeline.go

@@ -27,10 +27,18 @@ func init() {
 	RegisterModel(&Pipeline{})
 }
 
+// Structs copied from workflow/api/v1alpha1/types.go
+
+// WorkflowSpec defines workflow steps and other attributes
+type WorkflowSpec struct {
+	Mode  *v1alpha1.WorkflowExecuteMode `json:"mode,omitempty"`
+	Steps []WorkflowStep                `json:"steps,omitempty"`
+}
+
 // Pipeline is the model of pipeline
 type Pipeline struct {
 	BaseModel
-	Spec        v1alpha1.WorkflowSpec
+	Spec        WorkflowSpec
 	Name        string `json:"name"`
 	Project     string `json:"project"`
 	Alias       string `json:"alias"`

pkg/apiserver/domain/model/workflow.go

@@ -50,7 +50,7 @@ type Workflow struct {
 
 // WorkflowStep defines how to execute a workflow step.
 type WorkflowStep struct {
-	WorkflowStepBase `json:",inline"`
+	WorkflowStepBase `json:",inline" bson:",inline"`
 	SubSteps         []WorkflowStepBase `json:"subSteps,omitempty"`
 }
 
@@ -123,7 +123,7 @@ type WorkflowRecord struct {
 
 // WorkflowStepStatus is the workflow step status database model
 type WorkflowStepStatus struct {
-	StepStatus     `json:",inline"`
+	StepStatus     `json:",inline" bson:",inline"`
 	SubStepsStatus []StepStatus `json:"subSteps,omitempty"`
 }
 

pkg/apiserver/domain/repository/application.go

@@ -20,10 +20,12 @@ import (
 	"context"
 	"errors"
 
+	"k8s.io/klog/v2"
+
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
+	"github.com/oam-dev/kubevela/pkg/utils"
 )
 
 // ListApplicationPolicies query the application policies
@@ -83,14 +85,14 @@ func ListApplicationCommonPolicies(ctx context.Context, store datastore.DataStor
 
 // DeleteApplicationEnvPolicies delete the policies via app name and env name
 func DeleteApplicationEnvPolicies(ctx context.Context, store datastore.DataStore, app *model.Application, envName string) error {
-	log.Logger.Debugf("clear the policies via app name %s and env name %s", app.PrimaryKey(), envName)
+	klog.Infof("clear the policies via app name %s and env name %s", app.PrimaryKey(), utils.Sanitize(envName))
 	policies, err := ListApplicationEnvPolicies(ctx, store, app, envName)
 	if err != nil {
 		return err
 	}
 	for _, policy := range policies {
 		if err := store.Delete(ctx, policy); err != nil && !errors.Is(err, datastore.ErrRecordNotExist) {
-			log.Logger.Errorf("fail to clear the policies belong to the env %w", err)
+			klog.Errorf("fail to clear the policies belong to the env %w", err)
 			continue
 		}
 	}

pkg/apiserver/domain/repository/env.go

@@ -20,12 +20,12 @@ import (
 	"context"
 	"errors"
 
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	util "github.com/oam-dev/kubevela/pkg/utils"
 	velaerr "github.com/oam-dev/kubevela/pkg/utils/errors"
@@ -38,7 +38,7 @@ func CreateEnv(ctx context.Context, kubeClient client.Client, ds datastore.DataS
 
 	exist, err := ds.IsExist(ctx, tenv)
 	if err != nil {
-		log.Logger.Errorf("check if env name exists failure %s", err.Error())
+		klog.Errorf("check if env name exists failure %s", err.Error())
 		return err
 	}
 	if exist {
@@ -59,7 +59,7 @@ func CreateEnv(ctx context.Context, kubeClient client.Client, ds datastore.DataS
 		if velaerr.IsLabelConflict(err) {
 			return bcode.ErrEnvNamespaceAlreadyBound
 		}
-		log.Logger.Errorf("update namespace label failure %s", err.Error())
+		klog.Errorf("update namespace label failure %s", err.Error())
 		return bcode.ErrEnvNamespaceFail
 	}
 	if err = ds.Add(ctx, env); err != nil {

pkg/apiserver/domain/repository/envbinding.go

@@ -19,12 +19,13 @@ package repository
 import (
 	"context"
 
+	"k8s.io/klog/v2"
+
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	assembler "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/assembler/v1"
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 )
 
 const (
@@ -70,7 +71,7 @@ func ListFullEnvBinding(ctx context.Context, ds datastore.DataStore, option EnvL
 	for _, eb := range envBindings {
 		env, err := pickEnv(envs, eb.Name)
 		if err != nil {
-			log.Logger.Errorf("envbinding invalid %s", err.Error())
+			klog.Errorf("envbinding invalid %s", err.Error())
 			continue
 		}
 		list = append(list, assembler.ConvertEnvBindingModelToBase(eb, env, targets))

pkg/apiserver/domain/repository/target.go

@@ -20,12 +20,12 @@ import (
 	"context"
 
 	apierror "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/utils"
@@ -43,7 +43,7 @@ func CreateTargetNamespace(ctx context.Context, k8sClient client.Client, cluster
 		oam.LabelNamespaceOfTargetName: targetName,
 	}))
 	if velaerr.IsLabelConflict(err) {
-		log.Logger.Errorf("update namespace for target err %v", err)
+		klog.Errorf("update namespace for target err %v", err)
 		return bcode.ErrTargetNamespaceAlreadyBound
 	}
 	if err != nil {
@@ -74,7 +74,7 @@ func CreateTarget(ctx context.Context, ds datastore.DataStore, tg *model.Target)
 	// check Target name.
 	exit, err := ds.IsExist(ctx, tg)
 	if err != nil {
-		log.Logger.Errorf("check target existence failure %s", err.Error())
+		klog.Errorf("check target existence failure %s", err.Error())
 		return err
 	}
 	if exit {
@@ -82,7 +82,7 @@ func CreateTarget(ctx context.Context, ds datastore.DataStore, tg *model.Target)
 	}
 
 	if err = ds.Add(ctx, tg); err != nil {
-		log.Logger.Errorf("add target failure %s", err.Error())
+		klog.Errorf("add target failure %s", err.Error())
 		return err
 	}
 	return nil
@@ -99,7 +99,7 @@ func ListTarget(ctx context.Context, ds datastore.DataStore, project string, dsO
 	}
 	Targets, err := ds.List(ctx, &target, dsOption)
 	if err != nil {
-		log.Logger.Errorf("list target err %v", err)
+		klog.Errorf("list target err %v", err)
 		return nil, err
 	}
 	var respTargets []*model.Target

pkg/apiserver/domain/repository/workflow.go

@@ -25,6 +25,7 @@ import (
 
 	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -36,7 +37,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/oam/util"
 	pkgUtils "github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/pkg/workflow/step"
@@ -370,20 +370,20 @@ func UpdateEnvWorkflow(ctx context.Context, kubeClient client.Client, ds datasto
 	created, updated, deleted := workflowSteps.getPolicies(existPolicies, policies)
 	for _, d := range deleted {
 		if err := ds.Delete(ctx, d); err != nil {
-			log.Logger.Errorf("fail to delete the policy %s", err.Error())
+			klog.Errorf("fail to delete the policy %s", err.Error())
 		}
-		log.Logger.Infof("deleted a policy %s where update the workflow", d.PrimaryKey())
+		klog.Infof("deleted a policy %s where update the workflow", d.PrimaryKey())
 	}
 
 	if err := ds.BatchAdd(ctx, created); err != nil {
-		log.Logger.Errorf("fail to create the policy %s", err.Error())
+		klog.Errorf("fail to create the policy %s", err.Error())
 	}
 
 	for _, d := range updated {
 		if err := ds.Put(ctx, d); err != nil {
-			log.Logger.Errorf("fail to update the policy %s", err.Error())
+			klog.Errorf("fail to update the policy %s", err.Error())
 		}
-		log.Logger.Infof("updated a policy %s where update the workflow", d.PrimaryKey())
+		klog.Infof("updated a policy %s where update the workflow", d.PrimaryKey())
 	}
 
 	return nil
@@ -417,10 +417,10 @@ func UpdateAppEnvWorkflow(ctx context.Context, kubeClient client.Client, ds data
 	}
 	for i := range envs {
 		if err := UpdateEnvWorkflow(ctx, kubeClient, ds, app, envs[i]); err != nil {
-			log.Logger.Errorf("fail to update the env workflow %s", envs[i].PrimaryKey())
+			klog.Errorf("fail to update the env workflow %s", envs[i].PrimaryKey())
 		}
 	}
-	log.Logger.Infof("The env workflows of app %s updated successfully", pkgUtils.Sanitize(app.PrimaryKey()))
+	klog.Infof("The env workflows of app %s updated successfully", pkgUtils.Sanitize(app.PrimaryKey()))
 	return nil
 }
 
@@ -438,7 +438,7 @@ func HaveTerraformWorkload(ctx context.Context, kubeClient client.Client, compon
 	getComponentDeployType := func(component *model.ApplicationComponent) string {
 		definition, err := GetComponentDefinition(ctx, kubeClient, component.Type)
 		if err != nil {
-			log.Logger.Errorf("get component definition %s failure %s", component.Type, err.Error())
+			klog.Errorf("get component definition %s failure %s", component.Type, err.Error())
 			// using Deploy2Env by default
 		}
 		if definition != nil {
@@ -508,7 +508,7 @@ func GenEnvWorkflowStepsAndPolicies(ctx context.Context, kubeClient client.Clien
 	var policies []datastore.Entity
 	components, err := ds.List(ctx, &model.ApplicationComponent{AppPrimaryKey: app.PrimaryKey()}, nil)
 	if err != nil {
-		log.Logger.Errorf("list application component list failure %s", err.Error())
+		klog.Errorf("list application component list failure %s", err.Error())
 	}
 	userName, _ := ctx.Value(&apisv1.CtxKeyUser).(string)
 	terraformComponents := HaveTerraformWorkload(ctx, kubeClient, components)
@@ -521,7 +521,7 @@ func GenEnvWorkflowStepsAndPolicies(ctx context.Context, kubeClient client.Clien
 		}},
 	}})
 	if err != nil {
-		log.Logger.Errorf("fail to get the targets detail info, %s", err.Error())
+		klog.Errorf("fail to get the targets detail info, %s", err.Error())
 	}
 	if len(terraformComponents) > 0 {
 		appPolicy := &model.ApplicationPolicy{
@@ -553,7 +553,7 @@ func GenEnvWorkflowStepsAndPolicies(ctx context.Context, kubeClient client.Clien
 			Envs: envs,
 		})
 		if err != nil {
-			log.Logger.Errorf("fail to create the properties of the topology policy, %s", err.Error())
+			klog.Errorf("fail to create the properties of the topology policy, %s", err.Error())
 		} else {
 			appPolicy.Properties = properties
 			policies = append(policies, appPolicy)
@@ -591,7 +591,7 @@ func GenEnvWorkflowStepsAndPolicies(ctx context.Context, kubeClient client.Clien
 				Namespace: target.Cluster.Namespace,
 			})
 			if err != nil {
-				log.Logger.Errorf("fail to create the properties of the topology policy, %s", err.Error())
+				klog.Errorf("fail to create the properties of the topology policy, %s", err.Error())
 				continue
 			}
 			appPolicy.Properties = properties
@@ -602,7 +602,7 @@ func GenEnvWorkflowStepsAndPolicies(ctx context.Context, kubeClient client.Clien
 	for _, step := range workflowSteps {
 		base, err := convert.FromCRWorkflowStepBase(step.WorkflowStepBase)
 		if err != nil {
-			log.Logger.Errorf("workflow %s step %s properties is invalid %s", pkgUtils.Sanitize(app.Name), pkgUtils.Sanitize(step.Name), err.Error())
+			klog.Errorf("workflow %s step %s properties is invalid %s", pkgUtils.Sanitize(app.Name), pkgUtils.Sanitize(step.Name), err.Error())
 			continue
 		}
 		targetName := strings.Replace(step.Name, "-cloud-resource", "", 1)

pkg/apiserver/domain/repository/workflow_test.go

@@ -25,6 +25,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -33,7 +34,6 @@ import (
 	"github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	pkgUtils "github.com/oam-dev/kubevela/pkg/utils"
 )
 
@@ -563,7 +563,7 @@ func CreateEnvWorkflow(ctx context.Context, store datastore.DataStore, kubeClien
 		EnvName:       env.Name,
 		AppPrimaryKey: app.PrimaryKey(),
 	}
-	log.Logger.Infof("create workflow %s for app %s", pkgUtils.Sanitize(workflow.Name), pkgUtils.Sanitize(app.PrimaryKey()))
+	klog.Infof("create workflow %s for app %s", pkgUtils.Sanitize(workflow.Name), pkgUtils.Sanitize(app.PrimaryKey()))
 	if err := store.Add(ctx, workflow); err != nil {
 		return err
 	}

pkg/apiserver/domain/service/addon.go

@@ -34,6 +34,7 @@ import (
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	common2 "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -44,7 +45,6 @@ import (
 	apis "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/definition"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/oam"
@@ -206,7 +206,7 @@ func (u *addonServiceImpl) StatusAddon(ctx context.Context, name string) (*apis.
 	var allClusters []apis.NameAlias
 	clusters, err := multicluster.ListVirtualClusters(ctx, u.kubeClient)
 	if err != nil {
-		log.Logger.Errorf("err while list all clusters: %v", err)
+		klog.Errorf("err while list all clusters: %v", err)
 	}
 
 	for _, c := range clusters {
@@ -302,7 +302,7 @@ func (u *addonServiceImpl) ListAddons(ctx context.Context, registry, query strin
 	for _, a := range addons {
 		addonRes, err := AddonImpl2AddonRes(a, u.config)
 		if err != nil {
-			log.Logger.Errorf("err while converting AddonImpl to DetailAddonResponse: %v", err)
+			klog.Errorf("err while converting AddonImpl to DetailAddonResponse: %v", err)
 			continue
 		}
 		addonResources = append(addonResources, addonRes)
@@ -400,8 +400,22 @@ func (u *addonServiceImpl) EnableAddon(ctx context.Context, name string, args ap
 	if err != nil {
 		return err
 	}
-	for _, r := range registries {
-		err = pkgaddon.EnableAddon(ctx, name, args.Version, u.kubeClient, u.discoveryClient, u.apply, u.config, r, args.Args, u.addonRegistryCache)
+	if len(args.RegistryName) != 0 {
+		foundRegistry := false
+		for _, registry := range registries {
+			if registry.Name == args.RegistryName {
+				foundRegistry = true
+			}
+		}
+		if !foundRegistry {
+			return bcode.ErrAddonRegistryNotExist.SetMessage(fmt.Sprintf("specified registry %s not exist", args.RegistryName))
+		}
+	}
+	for i, r := range registries {
+		if len(args.RegistryName) != 0 && args.RegistryName != r.Name {
+			continue
+		}
+		err = pkgaddon.EnableAddon(ctx, name, args.Version, u.kubeClient, u.discoveryClient, u.apply, u.config, r, args.Args, u.addonRegistryCache, pkgaddon.FilterDependencyRegistries(i, registries))
 		if err == nil {
 			return nil
 		}
@@ -428,7 +442,7 @@ func (u *addonServiceImpl) EnableAddon(ctx context.Context, name string, args ap
 func (u *addonServiceImpl) DisableAddon(ctx context.Context, name string, force bool) error {
 	err := pkgaddon.DisableAddon(ctx, u.kubeClient, name, u.config, force)
 	if err != nil {
-		log.Logger.Errorf("delete application fail: %s", err.Error())
+		klog.Errorf("delete application fail: %s", err.Error())
 		return err
 	}
 	return nil
@@ -471,8 +485,8 @@ func (u *addonServiceImpl) UpdateAddon(ctx context.Context, name string, args ap
 		return err
 	}
 
-	for _, r := range registries {
-		err = pkgaddon.EnableAddon(ctx, name, args.Version, u.kubeClient, u.discoveryClient, u.apply, u.config, r, args.Args, u.addonRegistryCache)
+	for i, r := range registries {
+		err = pkgaddon.EnableAddon(ctx, name, args.Version, u.kubeClient, u.discoveryClient, u.apply, u.config, r, args.Args, u.addonRegistryCache, pkgaddon.FilterDependencyRegistries(i, registries))
 		if err == nil {
 			return nil
 		}
@@ -541,7 +555,7 @@ func renderAddonCustomUISchema(ctx context.Context, cli client.Client, addonName
 		Name:      fmt.Sprintf("addon-uischema-%s", addonName),
 	}, &cm); err != nil {
 		if !errors2.IsNotFound(err) {
-			log.Logger.Errorf("find uischema configmap from cluster failure %s", err.Error())
+			klog.Errorf("find uischema configmap from cluster failure %s", err.Error())
 		}
 		return defaultSchema
 	}
@@ -551,7 +565,7 @@ func renderAddonCustomUISchema(ctx context.Context, cli client.Client, addonName
 	}
 	schema := []*utils.UIParameter{}
 	if err := json.Unmarshal([]byte(data), &schema); err != nil {
-		log.Logger.Errorf("unmarshal ui schema failure %s", err.Error())
+		klog.Errorf("unmarshal ui schema failure %s", err.Error())
 		return defaultSchema
 	}
 	return patchSchema(defaultSchema, schema)

pkg/apiserver/domain/service/application.go

@@ -33,6 +33,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
@@ -47,7 +48,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/appfile/dryrun"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
@@ -126,7 +126,7 @@ func listApp(ctx context.Context, ds datastore.DataStore, listOptions apisv1.Lis
 	if listOptions.Env != "" || listOptions.TargetName != "" {
 		envBinding, err = repository.ListFullEnvBinding(ctx, ds, repository.EnvListOption{})
 		if err != nil {
-			log.Logger.Errorf("list envbinding for list application in env %s err %v", pkgUtils.Sanitize(listOptions.Env), err)
+			klog.Errorf("list envbinding for list application in env %s err %v", pkgUtils.Sanitize(listOptions.Env), err)
 			return nil, err
 		}
 	}
@@ -359,7 +359,7 @@ func (c *applicationServiceImpl) CreateApplication(ctx context.Context, req apis
 	// check app name.
 	exist, err := c.Store.IsExist(ctx, &application)
 	if err != nil {
-		log.Logger.Errorf("check application name is exist failure %s", err.Error())
+		klog.Errorf("check application name is exist failure %s", err.Error())
 		return nil, bcode.ErrApplicationExist
 	}
 	if exist {
@@ -418,10 +418,11 @@ func (c *applicationServiceImpl) CreateApplicationTrigger(ctx context.Context, a
 		Type:          req.Type,
 		PayloadType:   req.PayloadType,
 		ComponentName: req.ComponentName,
+		Registry:      req.Registry,
 		Token:         genWebhookToken(),
 	}
 	if err := c.Store.Add(ctx, trigger); err != nil {
-		log.Logger.Errorf("failed to create application trigger, %s", err.Error())
+		klog.Errorf("failed to create application trigger, %s", err.Error())
 		return nil, err
 	}
 
@@ -449,7 +450,7 @@ func (c *applicationServiceImpl) DeleteApplicationTrigger(ctx context.Context, a
 		if errors.Is(err, datastore.ErrRecordNotExist) {
 			return bcode.ErrApplicationTriggerNotExist
 		}
-		log.Logger.Warnf("delete app trigger failure %s", err.Error())
+		klog.Warningf("delete app trigger failure %s", err.Error())
 		return err
 	}
 	return nil
@@ -464,7 +465,7 @@ func (c *applicationServiceImpl) ListApplicationTriggers(ctx context.Context, ap
 		SortBy: []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}}},
 	)
 	if err != nil {
-		log.Logger.Errorf("failed to list application triggers, %s", err.Error())
+		klog.Errorf("failed to list application triggers, %s", err.Error())
 		return nil, err
 	}
 
@@ -604,7 +605,7 @@ func (c *applicationServiceImpl) DetailComponent(ctx context.Context, app *model
 	}
 	var cd v1beta1.ComponentDefinition
 	if err := c.KubeClient.Get(ctx, types.NamespacedName{Name: component.Type, Namespace: velatypes.DefaultKubeVelaNS}, &cd); err != nil {
-		log.Logger.Warnf("component definition %s get failure. %s", pkgUtils.Sanitize(component.Type), err.Error())
+		klog.Warningf("component definition %s get failure. %s", pkgUtils.Sanitize(component.Type), err.Error())
 	}
 
 	return &apisv1.DetailComponentResponse{
@@ -680,7 +681,7 @@ func (c *applicationServiceImpl) Deploy(ctx context.Context, app *model.Applicat
 		list, err := c.Store.List(ctx, &lastVersion, &datastore.ListOptions{
 			PageSize: 1, Page: 1, SortBy: []datastore.SortOption{{Key: "createTime", Order: datastore.SortOrderDescending}}})
 		if err != nil && !errors.Is(err, datastore.ErrRecordNotExist) {
-			log.Logger.Errorf("query app latest revision failure %s", err.Error())
+			klog.Errorf("query app latest revision failure %s", err.Error())
 			return nil, bcode.ErrDeployConflict
 		}
 		if len(list) > 0 {
@@ -698,7 +699,7 @@ func (c *applicationServiceImpl) Deploy(ctx context.Context, app *model.Applicat
 				status = revision.Status
 			}
 			if status != model.RevisionStatusComplete && status != model.RevisionStatusTerminated {
-				log.Logger.Warnf("last app revision can not complete %s/%s", list[0].(*model.ApplicationRevision).AppPrimaryKey, list[0].(*model.ApplicationRevision).Version)
+				klog.Warningf("last app revision can not complete %s/%s", list[0].(*model.ApplicationRevision).AppPrimaryKey, list[0].(*model.ApplicationRevision).Version)
 				return nil, bcode.ErrDeployConflict
 			}
 		}
@@ -726,7 +727,7 @@ func (c *applicationServiceImpl) Deploy(ctx context.Context, app *model.Applicat
 	if err := c.KubeClient.Get(ctx, types.NamespacedName{Name: oamApp.Namespace}, &namespace); apierrors.IsNotFound(err) {
 		namespace.Name = oamApp.Namespace
 		if err := c.KubeClient.Create(ctx, &namespace); err != nil {
-			log.Logger.Errorf("auto create namespace failure %s", err.Error())
+			klog.Errorf("auto create namespace failure %s", err.Error())
 			return nil, bcode.ErrCreateNamespace
 		}
 	}
@@ -736,22 +737,22 @@ func (c *applicationServiceImpl) Deploy(ctx context.Context, app *model.Applicat
 		appRevision.Status = model.RevisionStatusFail
 		appRevision.Reason = err.Error()
 		if err := c.Store.Put(ctx, appRevision); err != nil {
-			log.Logger.Warnf("update deploy event failure %s", err.Error())
+			klog.Warningf("update deploy event failure %s", err.Error())
 		}
 
-		log.Logger.Errorf("deploy app %s failure %s", app.PrimaryKey(), err.Error())
+		klog.Errorf("deploy app %s failure %s", app.PrimaryKey(), err.Error())
 		return nil, bcode.ErrDeployApplyFail
 	}
 
 	// step5: create workflow record
 	if err := c.WorkflowService.CreateWorkflowRecord(ctx, app, oamApp, workflow); err != nil {
-		log.Logger.Warnf("create workflow record failure %s", err.Error())
+		klog.Warningf("create workflow record failure %s", err.Error())
 	}
 
 	// step6: update app revision status
 	appRevision.Status = model.RevisionStatusRunning
 	if err := c.Store.Put(ctx, appRevision); err != nil {
-		log.Logger.Warnf("update app revision failure %s", err.Error())
+		klog.Warningf("update app revision failure %s", err.Error())
 	}
 
 	// step7: change the source of trust
@@ -760,7 +761,7 @@ func (c *applicationServiceImpl) Deploy(ctx context.Context, app *model.Applicat
 	}
 	app.Labels[model.LabelSourceOfTruth] = model.FromUX
 	if err := c.Store.Put(ctx, app); err != nil {
-		log.Logger.Warnf("failed to update app %s", err.Error())
+		klog.Warningf("failed to update app %s", err.Error())
 	}
 
 	return &apisv1.ApplicationDeployResponse{
@@ -963,38 +964,38 @@ func (c *applicationServiceImpl) DeleteApplication(ctx context.Context, app *mod
 
 	// delete workflow
 	if err := c.WorkflowService.DeleteWorkflowByApp(ctx, app); err != nil && !errors.Is(err, bcode.ErrWorkflowNotExist) {
-		log.Logger.Errorf("delete workflow %s failure %s", app.Name, err.Error())
+		klog.Errorf("delete workflow %s failure %s", app.Name, err.Error())
 	}
 
 	for _, component := range components {
 		err := c.Store.Delete(ctx, &model.ApplicationComponent{AppPrimaryKey: app.PrimaryKey(), Name: component.Name})
 		if err != nil && !errors.Is(err, datastore.ErrRecordNotExist) {
-			log.Logger.Errorf("delete component %s in app %s failure %s", component.Name, app.Name, err.Error())
+			klog.Errorf("delete component %s in app %s failure %s", component.Name, app.Name, err.Error())
 		}
 	}
 
 	for _, policy := range policies {
 		err := c.Store.Delete(ctx, &model.ApplicationPolicy{AppPrimaryKey: app.PrimaryKey(), Name: policy.Name})
 		if err != nil && errors.Is(err, datastore.ErrRecordNotExist) {
-			log.Logger.Errorf("delete policy %s in app %s failure %s", policy.Name, app.Name, err.Error())
+			klog.Errorf("delete policy %s in app %s failure %s", policy.Name, app.Name, err.Error())
 		}
 	}
 
 	for _, entity := range revisions {
 		revision := entity.(*model.ApplicationRevision)
 		if err := c.Store.Delete(ctx, &model.ApplicationRevision{AppPrimaryKey: app.PrimaryKey(), Version: revision.Version}); err != nil {
-			log.Logger.Errorf("delete revision %s in app %s failure %s", revision.Version, app.Name, err.Error())
+			klog.Errorf("delete revision %s in app %s failure %s", revision.Version, app.Name, err.Error())
 		}
 	}
 
 	for _, trigger := range triggers {
 		if err := c.Store.Delete(ctx, &model.ApplicationTrigger{AppPrimaryKey: app.PrimaryKey(), Name: trigger.Name, Token: trigger.Token}); err != nil {
-			log.Logger.Errorf("delete trigger %s in app %s failure %s", trigger.Name, app.Name, err.Error())
+			klog.Errorf("delete trigger %s in app %s failure %s", trigger.Name, app.Name, err.Error())
 		}
 	}
 
 	if err := c.EnvBindingService.BatchDeleteEnvBinding(ctx, app); err != nil {
-		log.Logger.Errorf("delete envbindings in app %s failure %s", app.Name, err.Error())
+		klog.Errorf("delete envbindings in app %s failure %s", app.Name, err.Error())
 	}
 
 	return c.Store.Delete(ctx, app)
@@ -1047,7 +1048,7 @@ func (c *applicationServiceImpl) UpdateComponent(ctx context.Context, app *model
 func (c *applicationServiceImpl) createComponent(ctx context.Context, app *model.Application, com apisv1.CreateComponentRequest, main bool) (*apisv1.ComponentBase, error) {
 	var cd v1beta1.ComponentDefinition
 	if err := c.KubeClient.Get(ctx, types.NamespacedName{Name: com.ComponentType, Namespace: velatypes.DefaultKubeVelaNS}, &cd); err != nil {
-		log.Logger.Warnf("component definition %s get failure. %s", pkgUtils.Sanitize(com.ComponentType), err.Error())
+		klog.Warningf("component definition %s get failure. %s", pkgUtils.Sanitize(com.ComponentType), err.Error())
 		return nil, bcode.ErrComponentTypeNotSupport
 	}
 	userName, _ := ctx.Value(&apisv1.CtxKeyUser).(string)
@@ -1075,7 +1076,7 @@ func (c *applicationServiceImpl) createComponent(ctx context.Context, app *model
 		traitTypes[trait.Type] = true
 		properties, err := model.NewJSONStructByString(trait.Properties)
 		if err != nil {
-			log.Logger.Errorf("new trait failure,%s", err.Error())
+			klog.Errorf("new trait failure,%s", err.Error())
 			return nil, bcode.ErrInvalidProperties
 		}
 		traits = append(traits, model.ApplicationTrait{
@@ -1102,7 +1103,7 @@ func (c *applicationServiceImpl) createComponent(ctx context.Context, app *model
 		if errors.Is(err, datastore.ErrRecordExist) {
 			return nil, bcode.ErrApplicationComponentExist
 		}
-		log.Logger.Warnf("add component for app %s failure %s", pkgUtils.Sanitize(app.PrimaryKey()), err.Error())
+		klog.Warningf("add component for app %s failure %s", pkgUtils.Sanitize(app.PrimaryKey()), err.Error())
 		return nil, err
 	}
 	// update the env workflow, the automatically generated workflow is determined by the component type.
@@ -1143,7 +1144,7 @@ func (c *applicationServiceImpl) DeleteComponent(ctx context.Context, app *model
 		if errors.Is(err, datastore.ErrRecordNotExist) {
 			return bcode.ErrApplicationComponentNotExist
 		}
-		log.Logger.Warnf("delete app component %s failure %s", app.PrimaryKey(), err.Error())
+		klog.Warningf("delete app component %s failure %s", app.PrimaryKey(), err.Error())
 		return err
 	}
 	if err := repository.UpdateAppEnvWorkflow(ctx, c.KubeClient, c.Store, app); err != nil {
@@ -1172,7 +1173,7 @@ func (c *applicationServiceImpl) CreatePolicy(ctx context.Context, app *model.Ap
 		if errors.Is(err, datastore.ErrRecordExist) {
 			return nil, bcode.ErrApplicationPolicyExist
 		}
-		log.Logger.Warnf("add policy for app %s failure %s", app.PrimaryKey(), err.Error())
+		klog.Warningf("add policy for app %s failure %s", app.PrimaryKey(), err.Error())
 		return nil, err
 	}
 	if err = c.handlePolicyBindingWorkflowStep(ctx, app, createPolicy.Name, createPolicy.WorkflowPolicyBindings); err != nil {
@@ -1199,7 +1200,7 @@ func (c *applicationServiceImpl) DeletePolicy(ctx context.Context, app *model.Ap
 		if errors.Is(err, datastore.ErrRecordNotExist) {
 			return bcode.ErrApplicationPolicyNotExist
 		}
-		log.Logger.Warnf("delete app policy %s failure %s", app.PrimaryKey(), err.Error())
+		klog.Warningf("delete app policy %s failure %s", app.PrimaryKey(), err.Error())
 		return err
 	}
 	return c.handlePolicyBindingWorkflowStep(ctx, app, policyName, nil)
@@ -1215,7 +1216,7 @@ func (c *applicationServiceImpl) UpdatePolicy(ctx context.Context, app *model.Ap
 		if errors.Is(err, datastore.ErrRecordNotExist) {
 			return nil, bcode.ErrApplicationPolicyNotExist
 		}
-		log.Logger.Warnf("update app policy %s failure %s", app.PrimaryKey(), err.Error())
+		klog.Warningf("update app policy %s failure %s", app.PrimaryKey(), err.Error())
 		return nil, err
 	}
 	policy.Type = policyUpdate.Type
@@ -1254,7 +1255,7 @@ func (c *applicationServiceImpl) CreateApplicationTrait(ctx context.Context, app
 	}
 	properties, err := model.NewJSONStructByString(req.Properties)
 	if err != nil {
-		log.Logger.Errorf("new trait failure,%s", err.Error())
+		klog.Errorf("new trait failure,%s", err.Error())
 		return nil, bcode.ErrInvalidProperties
 	}
 	trait := model.ApplicationTrait{CreateTime: time.Now(), Type: req.Type, Properties: properties, Alias: req.Alias, Description: req.Description}
@@ -1297,7 +1298,7 @@ func (c *applicationServiceImpl) UpdateApplicationTrait(ctx context.Context, app
 		if trait.Type == traitType {
 			properties, err := model.NewJSONStructByString(req.Properties)
 			if err != nil {
-				log.Logger.Errorf("update trait failure,%s", err.Error())
+				klog.Errorf("update trait failure,%s", err.Error())
 				return nil, bcode.ErrInvalidProperties
 			}
 			updatedTrait := model.ApplicationTrait{CreateTime: trait.CreateTime, UpdateTime: time.Now(), Properties: properties, Type: traitType, Alias: req.Alias, Description: req.Description}
@@ -1380,7 +1381,7 @@ func (c *applicationServiceImpl) Statistics(ctx context.Context, app *model.Appl
 	var targetMap = make(map[string]int)
 	envbinding, err := c.EnvBindingService.GetEnvBindings(ctx, app)
 	if err != nil {
-		log.Logger.Errorf("query app envbinding failure %s", err.Error())
+		klog.Errorf("query app envbinding failure %s", err.Error())
 	}
 	for _, env := range envbinding {
 		for _, target := range env.TargetNames {
@@ -1408,7 +1409,7 @@ func (c *applicationServiceImpl) CompareApp(ctx context.Context, appModel *model
 	case compareReq.CompareLatestWithRunning != nil:
 		base, err = c.renderOAMApplication(ctx, appModel, "", compareReq.CompareLatestWithRunning.Env, "")
 		if err != nil {
-			log.Logger.Errorf("failed to build the latest application %s", err.Error())
+			klog.Errorf("failed to build the latest application %s", err.Error())
 			break
 		}
 	case compareReq.CompareRevisionWithRunning != nil || compareReq.CompareRevisionWithLatest != nil:
@@ -1421,7 +1422,7 @@ func (c *applicationServiceImpl) CompareApp(ctx context.Context, appModel *model
 		}
 		base, envNameByRevision, err = c.getAppModelFromRevision(ctx, appModel.Name, revision)
 		if err != nil {
-			log.Logger.Errorf("failed to get the app model from the revision %s", err.Error())
+			klog.Errorf("failed to get the app model from the revision %s", err.Error())
 			break
 		}
 	}
@@ -1440,13 +1441,13 @@ func (c *applicationServiceImpl) CompareApp(ctx context.Context, appModel *model
 		}
 		compareTarget, err = c.GetApplicationCRInEnv(ctx, appModel, envName)
 		if err != nil {
-			log.Logger.Errorf("failed to query the application CR %s", err.Error())
+			klog.Errorf("failed to query the application CR %s", err.Error())
 			break
 		}
 	case compareReq.CompareRevisionWithLatest != nil:
 		compareTarget, err = c.renderOAMApplication(ctx, appModel, "", envNameByRevision, "")
 		if err != nil {
-			log.Logger.Errorf("failed to build the latest application %s", err.Error())
+			klog.Errorf("failed to build the latest application %s", err.Error())
 			break
 		}
 	}
@@ -1482,7 +1483,7 @@ func (c *applicationServiceImpl) CompareApp(ctx context.Context, appModel *model
 	args.SetClient(c.KubeClient)
 	diffResult, buff, err := compare(ctx, args, compareTarget, base)
 	if err != nil {
-		log.Logger.Errorf("fail to compare the app %s", err.Error())
+		klog.Errorf("fail to compare the app %s", err.Error())
 		compareResponse.IsDiff = false
 		return compareResponse, nil
 	}
@@ -1512,6 +1513,13 @@ func (c *applicationServiceImpl) DryRunAppOrRevision(ctx context.Context, appMod
 		}
 	case "REVISION":
 		app, _, err = c.getAppModelFromRevision(ctx, appModel.Name, dryRunReq.Version)
+		originalApp := &v1beta1.Application{}
+		if err := c.KubeClient.Get(ctx, types.NamespacedName{
+			Name:      app.Name,
+			Namespace: app.Namespace,
+		}, originalApp); err == nil {
+			app.ResourceVersion = originalApp.ResourceVersion
+		}
 		if err != nil {
 			return nil, err
 		}
@@ -1590,7 +1598,7 @@ func (c *applicationServiceImpl) resetApp(ctx context.Context, targetApp *v1beta
 			if errors.Is(err, datastore.ErrRecordNotExist) {
 				continue
 			}
-			log.Logger.Warnf("delete app %s comp %s failure %s", appPrimaryKey, compName, err.Error())
+			klog.Warningf("delete app %s comp %s failure %s", appPrimaryKey, compName, err.Error())
 		}
 	}
 
@@ -1610,11 +1618,11 @@ func (c *applicationServiceImpl) resetApp(ctx context.Context, targetApp *v1beta
 				if errors.Is(err, datastore.ErrRecordExist) {
 					err := c.Store.Put(ctx, &compModel)
 					if err != nil {
-						log.Logger.Warnf("update comp %s  for app %s failure %s", comp.Name, pkgUtils.Sanitize(appPrimaryKey), err.Error())
+						klog.Warningf("update comp %s  for app %s failure %s", comp.Name, pkgUtils.Sanitize(appPrimaryKey), err.Error())
 					}
 					return &apisv1.AppResetResponse{IsReset: true}, err
 				}
-				log.Logger.Warnf("add comp %s  for app %s failure %s", comp.Name, pkgUtils.Sanitize(appPrimaryKey), err.Error())
+				klog.Warningf("add comp %s  for app %s failure %s", comp.Name, pkgUtils.Sanitize(appPrimaryKey), err.Error())
 				return &apisv1.AppResetResponse{}, err
 			}
 		}

pkg/apiserver/domain/service/authentication.go

@@ -33,6 +33,7 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
@@ -42,7 +43,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 )
 
 const (
@@ -424,7 +424,7 @@ func getDexConfig(ctx context.Context, kubeClient client.Client) (*model.DexConf
 
 	config := &model.DexConfig{}
 	if err := yaml.Unmarshal(dexConfigSecret.Data[secretDexConfigKey], config); err != nil {
-		log.Logger.Errorf("failed to unmarshal dex config: %s", err.Error())
+		klog.Errorf("failed to unmarshal dex config: %s", err.Error())
 		return nil, bcode.ErrInvalidDexConfig
 	}
 	if len(config.StaticClients) < 1 || len(config.StaticClients[0].RedirectURIs) < 1 {
@@ -487,7 +487,7 @@ func (d *dexHandlerImpl) login(ctx context.Context) (*apisv1.UserBase, error) {
 	} else {
 		systemInfo, err := d.systemInfoService.GetSystemInfo(ctx)
 		if err != nil {
-			log.Logger.Errorf("failed to get the system info %s", err.Error())
+			klog.Errorf("failed to get the system info %s", err.Error())
 		}
 		user := &model.User{
 			Email:         claims.Email,
@@ -500,7 +500,7 @@ func (d *dexHandlerImpl) login(ctx context.Context) (*apisv1.UserBase, error) {
 			user.UserRoles = systemInfo.DexUserDefaultPlatformRoles
 		}
 		if err := d.Store.Add(ctx, user); err != nil {
-			log.Logger.Errorf("failed to save the user from the dex: %s", err.Error())
+			klog.Errorf("failed to save the user from the dex: %s", err.Error())
 			return nil, err
 		}
 		if systemInfo != nil {
@@ -510,7 +510,7 @@ func (d *dexHandlerImpl) login(ctx context.Context) (*apisv1.UserBase, error) {
 					UserRoles: project.Roles,
 				})
 				if err != nil {
-					log.Logger.Errorf("failed to add a user to project %s", err.Error())
+					klog.Errorf("failed to add a user to project %s", err.Error())
 				}
 			}
 		}

pkg/apiserver/domain/service/cloudshell.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	v1alpha1 "github.com/cloudtty/cloudtty/pkg/apis/cloudshell/v1alpha1"
+	"github.com/cloudtty/cloudtty/pkg/apis/cloudshell/v1alpha1"
 	"github.com/ghodss/yaml"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -36,6 +36,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kubevelatypes "github.com/oam-dev/kubevela/apis/types"
@@ -43,7 +44,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/auth"
 )
 
@@ -144,7 +144,7 @@ func (c *cloudShellServiceImpl) Prepare(ctx context.Context) (*apisv1.CloudShell
 	} else {
 		if cloudShell.Status.Phase == v1alpha1.PhaseFailed {
 			if err := c.KubeClient.Delete(ctx, &cloudShell); err != nil {
-				log.Logger.Errorf("failed to clear the failed cloud shell:%s", err.Error())
+				klog.Errorf("failed to clear the failed cloud shell:%s", err.Error())
 			}
 			res.Status = StatusFailed
 		}
@@ -231,25 +231,33 @@ func (c *cloudShellServiceImpl) prepareKubeConfig(ctx context.Context) error {
 	var groups []string
 	for _, p := range projects {
 		permissions, err := c.RBACService.GetUserPermissions(ctx, user, p.Name, false)
+		// The kubernetes permission set is generated based on simple rules, but this is not completely strict.
 		var readOnly bool
 		if err != nil {
-			log.Logger.Errorf("failed to get the user permissions %s", err.Error())
+			klog.Errorf("failed to get the user permissions %s", err.Error())
 			readOnly = true
 		} else {
 			readOnly = checkReadOnly(p.Name, permissions)
 		}
 		if readOnly {
-			groupName, err := c.managePrivilegesForProjectRead(ctx, p.Name, true)
+			groupName, err := c.managePrivilegesForProject(ctx, p, true)
 			if err != nil {
-				log.Logger.Errorf("failed to privileges the user %s", err.Error())
+				klog.Errorf("failed to privileges the user %s", err.Error())
 			}
 			if groupName != "" {
 				groups = append(groups, groupName)
 			}
 		} else {
-			groups = append(groups, utils.KubeVelaProjectGroupPrefix+p.Name)
+			groupName, err := c.managePrivilegesForProject(ctx, p, false)
+			if err != nil {
+				klog.Errorf("failed to privileges the user %s", err.Error())
+			}
+			if groupName != "" {
+				groups = append(groups, groupName)
+			}
 		}
 	}
+	groups = append(groups, utils.TemplateReaderGroup)
 
 	if utils.StringsContain(user.UserRoles, "admin") {
 		groups = append(groups, utils.KubeVelaAdminGroupPrefix+"admin")
@@ -267,7 +275,7 @@ func (c *cloudShellServiceImpl) prepareKubeConfig(ctx context.Context) error {
 		if len(c.CACert) == 0 {
 			caFromServiceAccount, err := os.ReadFile(CAFilePathInCluster)
 			if err != nil {
-				log.Logger.Errorf("failed to read the ca file from the service account dir,%s", err.Error())
+				klog.Errorf("failed to read the ca file from the service account dir,%s", err.Error())
 				return err
 			}
 			c.CACert = caFromServiceAccount
@@ -288,7 +296,7 @@ func (c *cloudShellServiceImpl) prepareKubeConfig(ctx context.Context) error {
 		Groups: groups,
 	}))
 	if err != nil {
-		log.Logger.Errorf("failed to generate the kube config:%s Message: %s", err.Error(), strings.ReplaceAll(buffer.String(), "\n", "\t"))
+		klog.Errorf("failed to generate the kube config:%s Message: %s", err.Error(), strings.ReplaceAll(buffer.String(), "\n", "\t"))
 		return err
 	}
 	bs, err := clientcmd.Write(*cfg)
@@ -375,11 +383,12 @@ func checkReadOnly(projectName string, permissions []*model.Permission) bool {
 	return !ra.Match(permissions)
 }
 
-// managePrivilegesForProjectRead grant the read privileges for a project
-func (c *cloudShellServiceImpl) managePrivilegesForProjectRead(ctx context.Context, projectName string, readOnly bool) (string, error) {
+// managePrivilegesForProject grant the privileges for a project
+func (c *cloudShellServiceImpl) managePrivilegesForProject(ctx context.Context, project *apisv1.ProjectBase, readOnly bool) (string, error) {
+	projectName := project.Name
 	targets, err := c.TargetService.ListTargets(ctx, 0, 0, projectName)
 	if err != nil {
-		log.Logger.Infof("failed to list the targets by the project name %s :%s", projectName, err.Error())
+		klog.Infof("failed to list the targets by the project name %s :%s", projectName, err.Error())
 	}
 	var authPDs []auth.PrivilegeDescription
 	for _, t := range targets.Targets {
@@ -387,17 +396,24 @@ func (c *cloudShellServiceImpl) managePrivilegesForProjectRead(ctx context.Conte
 	}
 	envs, err := c.EnvService.ListEnvs(ctx, 0, 0, apisv1.ListEnvOptions{Project: projectName})
 	if err != nil {
-		log.Logger.Infof("failed to list the envs by the project name %s :%s", projectName, err.Error())
+		klog.Infof("failed to list the envs by the project name %s :%s", projectName, err.Error())
 	}
 	for _, e := range envs.Envs {
 		authPDs = append(authPDs, &auth.ApplicationPrivilege{Cluster: kubevelatypes.ClusterLocalName, Namespace: e.Namespace, ReadOnly: readOnly})
 	}
+
+	// The namespace of the environment: Application and WorkflowRun
+	authPDs = append(authPDs, &auth.ApplicationPrivilege{Cluster: kubevelatypes.ClusterLocalName, Namespace: project.Namespace, ReadOnly: readOnly})
+
 	groupName := utils.KubeVelaProjectReadGroupPrefix + projectName
+	if !readOnly {
+		groupName = utils.KubeVelaProjectGroupPrefix + projectName
+	}
 	identity := &auth.Identity{Groups: []string{groupName}}
 	writer := &bytes.Buffer{}
 	if err := auth.GrantPrivileges(ctx, c.KubeClient, authPDs, identity, writer, auth.WithReplace); err != nil {
 		return "", err
 	}
-	log.Logger.Debugf("GrantPrivileges: %s", writer.String())
+	klog.Infof("GrantPrivileges: %s", writer.String())
 	return groupName, nil
 }

pkg/apiserver/domain/service/cloudshell_test.go

@@ -48,6 +48,7 @@ var _ = Describe("Test cloudshell service function", func() {
 		cloudShellService *cloudShellServiceImpl
 		userService       *userServiceImpl
 		projectService    *projectServiceImpl
+		envService        *envServiceImpl
 		err               error
 		database          string
 	)
@@ -56,7 +57,7 @@ var _ = Describe("Test cloudshell service function", func() {
 		database = "cloudshell-test-kubevela"
 		ds, err = NewDatastore(datastore.Config{Type: "kubeapi", Database: database})
 		Expect(err).Should(Succeed())
-		envService := &envServiceImpl{
+		envService = &envServiceImpl{
 			Store:      ds,
 			KubeClient: k8sClient,
 		}
@@ -100,14 +101,13 @@ var _ = Describe("Test cloudshell service function", func() {
 		}
 	})
 
-	It("test prepareKubeConfig", func() {
+	It("Test prepareKubeConfig", func() {
 		err = userService.Init(context.TODO())
 		Expect(err).Should(BeNil())
 		err = projectService.Init(context.TODO())
 		Expect(err).Should(BeNil())
 
 		By("test the developer users")
-
 		_, err = userService.CreateUser(context.TODO(), apisv1.CreateUserRequest{Name: "test-dev", Password: "test"})
 		Expect(err).Should(BeNil())
 
@@ -171,17 +171,37 @@ var _ = Describe("Test cloudshell service function", func() {
 
 		err = cloudShellService.prepareKubeConfig(ctx)
 		Expect(err).Should(BeNil())
-		var cm corev1.ConfigMap
-		err = k8sClient.Get(context.TODO(), types.NamespacedName{Namespace: kubevelatypes.DefaultKubeVelaNS, Name: makeUserConfigName("admin-test")}, &cm)
+		checkConfig := func() {
+			var cm corev1.ConfigMap
+			err = k8sClient.Get(context.TODO(), types.NamespacedName{Namespace: kubevelatypes.DefaultKubeVelaNS, Name: makeUserConfigName("admin-test")}, &cm)
+			Expect(err).Should(BeNil())
+			Expect(len(cm.Data["identity"]) > 0).Should(BeTrue())
+			var identity auth.Identity
+			err = yaml.Unmarshal([]byte(cm.Data["identity"]), &identity)
+			Expect(err).Should(BeNil())
+			Expect(utils.StringsContain(identity.Groups, utils.KubeVelaAdminGroupPrefix+"admin")).Should(BeTrue())
+			Expect(utils.StringsContain(identity.Groups, utils.TemplateReaderGroup)).Should(BeTrue())
+		}
+
+		checkConfig()
+
+		By("Test other projects")
+
+		_, err = projectService.CreateProject(ctx, apisv1.CreateProjectRequest{Name: "cloudshell"})
 		Expect(err).Should(BeNil())
-		Expect(len(cm.Data["identity"]) > 0).Should(BeTrue())
-		var identity auth.Identity
-		err = yaml.Unmarshal([]byte(cm.Data["identity"]), &identity)
+		_, err = envService.CreateEnv(ctx, apisv1.CreateEnvRequest{Name: "cloudshell-env", Project: "cloudshell"})
 		Expect(err).Should(BeNil())
-		Expect(utils.StringsContain(identity.Groups, utils.KubeVelaAdminGroupPrefix+"admin")).Should(BeTrue())
+		err = cloudShellService.prepareKubeConfig(ctx)
+		Expect(err).Should(BeNil())
+
+		err = k8sClient.Get(context.Background(), types.NamespacedName{Name: "kubevela:writer:application:binding", Namespace: "cloudshell-env"}, &rb)
+		Expect(err).Should(BeNil())
+		Expect(rb.Subjects[0].Name).Should(Equal(utils.KubeVelaProjectGroupPrefix + "cloudshell"))
+
+		checkConfig()
 	})
 
-	It("test prepare", func() {
+	It("Test prepare", func() {
 		By("Test with not CRD")
 		_, err = userService.CreateUser(context.TODO(), apisv1.CreateUserRequest{Name: "test", Password: "test"})
 		Expect(err).Should(BeNil())

pkg/apiserver/domain/service/cluster.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/kubevela/pkg/util/rand"
@@ -43,7 +44,6 @@ import (
 	apis "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	utils2 "github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/cloudprovider"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/utils"
@@ -100,25 +100,25 @@ func (c *clusterServiceImpl) getClusterFromDataStore(ctx context.Context, cluste
 
 func (c *clusterServiceImpl) rollbackAddedClusterInDataStore(ctx context.Context, cluster *model.Cluster) {
 	if e := c.Store.Delete(ctx, cluster); e != nil {
-		log.Logger.Errorf("failed to rollback added cluster %s in data store: %s", utils.Sanitize(cluster.Name), e.Error())
+		klog.Errorf("failed to rollback added cluster %s in data store: %s", utils.Sanitize(cluster.Name), e.Error())
 	}
 }
 
 func (c *clusterServiceImpl) rollbackDeletedClusterInDataStore(ctx context.Context, cluster *model.Cluster) {
 	if e := c.Store.Add(ctx, cluster); e != nil {
-		log.Logger.Errorf("failed to rollback deleted cluster %s in data store: %s", utils.Sanitize(cluster.Name), e.Error())
+		klog.Errorf("failed to rollback deleted cluster %s in data store: %s", utils.Sanitize(cluster.Name), e.Error())
 	}
 }
 
 func (c *clusterServiceImpl) rollbackJoinedKubeCluster(ctx context.Context, cluster *model.Cluster) {
 	if e := multicluster.DetachCluster(ctx, c.K8sClient, cluster.Name); e != nil {
-		log.Logger.Errorf("failed to rollback joined cluster %s in kubevela: %s", utils.Sanitize(cluster.Name), e.Error())
+		klog.Errorf("failed to rollback joined cluster %s in kubevela: %s", utils.Sanitize(cluster.Name), e.Error())
 	}
 }
 
 func (c *clusterServiceImpl) rollbackDetachedKubeCluster(ctx context.Context, cluster *model.Cluster) {
 	if _, e := joinClusterByKubeConfigString(context.WithValue(ctx, multicluster.KubeConfigContext, c.KubeConfig), c.K8sClient, cluster.Name, cluster.KubeConfig); e != nil {
-		log.Logger.Errorf("failed to rollback detached cluster %s in kubevela: %s", utils.Sanitize(cluster.Name), e.Error())
+		klog.Errorf("failed to rollback detached cluster %s in kubevela: %s", utils.Sanitize(cluster.Name), e.Error())
 	}
 }
 
@@ -492,7 +492,7 @@ func (c *clusterServiceImpl) getClusterResourceInfoFromK8s(ctx context.Context,
 func (c *clusterServiceImpl) ListCloudClusters(ctx context.Context, provider string, req apis.AccessKeyRequest, pageNumber int, pageSize int) (*apis.ListCloudClusterResponse, error) {
 	p, err := cloudprovider.GetClusterProvider(provider, req.AccessKeyID, req.AccessKeySecret, c.K8sClient)
 	if err != nil {
-		log.Logger.Errorf("failed to get cluster provider: %s", err.Error())
+		klog.Errorf("failed to get cluster provider: %s", err.Error())
 		return nil, bcode.ErrInvalidCloudClusterProvider
 	}
 	clusters, total, err := p.ListCloudClusters(pageNumber, pageSize)
@@ -500,7 +500,7 @@ func (c *clusterServiceImpl) ListCloudClusters(ctx context.Context, provider str
 		if p.IsInvalidKey(err) {
 			return nil, bcode.ErrInvalidAccessKeyOrSecretKey
 		}
-		log.Logger.Errorf("failed to list cloud clusters: %s", err.Error())
+		klog.Errorf("failed to list cloud clusters: %s", err.Error())
 		return nil, bcode.ErrGetCloudClusterFailure
 	}
 	resp := &apis.ListCloudClusterResponse{
@@ -516,12 +516,12 @@ func (c *clusterServiceImpl) ListCloudClusters(ctx context.Context, provider str
 func (c *clusterServiceImpl) ConnectCloudCluster(ctx context.Context, provider string, req apis.ConnectCloudClusterRequest) (*apis.ClusterBase, error) {
 	p, err := cloudprovider.GetClusterProvider(provider, req.AccessKeyID, req.AccessKeySecret, c.K8sClient)
 	if err != nil {
-		log.Logger.Errorf("failed to get cluster provider: %s", err.Error())
+		klog.Errorf("failed to get cluster provider: %s", err.Error())
 		return nil, bcode.ErrInvalidCloudClusterProvider
 	}
 	kubeConfig, err := p.GetClusterKubeConfig(req.ClusterID)
 	if err != nil {
-		log.Logger.Errorf("failed to get cluster kubeConfig: %s", err.Error())
+		klog.Errorf("failed to get cluster kubeConfig: %s", err.Error())
 		return nil, bcode.ErrGetCloudClusterFailure
 	}
 	cluster, err := p.GetClusterInfo(req.ClusterID)
@@ -529,7 +529,7 @@ func (c *clusterServiceImpl) ConnectCloudCluster(ctx context.Context, provider s
 		if p.IsInvalidKey(err) {
 			return nil, bcode.ErrInvalidAccessKeyOrSecretKey
 		}
-		log.Logger.Errorf("failed to get cluster info: %s", err.Error())
+		klog.Errorf("failed to get cluster info: %s", err.Error())
 		return nil, bcode.ErrGetCloudClusterFailure
 	}
 	createReq := apis.CreateClusterRequest{
@@ -546,7 +546,7 @@ func (c *clusterServiceImpl) ConnectCloudCluster(ctx context.Context, provider s
 func (c *clusterServiceImpl) CreateCloudCluster(ctx context.Context, provider string, req apis.CreateCloudClusterRequest) (*apis.CreateCloudClusterResponse, error) {
 	p, err := cloudprovider.GetClusterProvider(provider, req.AccessKeyID, req.AccessKeySecret, c.K8sClient)
 	if err != nil {
-		log.Logger.Errorf("failed to get cluster provider: %s", err.Error())
+		klog.Errorf("failed to get cluster provider: %s", err.Error())
 		return nil, bcode.ErrInvalidCloudClusterProvider
 	}
 	_, err = p.CreateCloudCluster(ctx, req.Name, req.Zone, req.WorkerNumber, req.CPUCoresPerWorker, req.MemoryPerWorker)
@@ -554,7 +554,7 @@ func (c *clusterServiceImpl) CreateCloudCluster(ctx context.Context, provider st
 		if kerrors.IsAlreadyExists(err) {
 			return nil, bcode.ErrCloudClusterAlreadyExists
 		}
-		log.Logger.Errorf("failed to bootstrap terraform configuration: %s", err.Error())
+		klog.Errorf("failed to bootstrap terraform configuration: %s", err.Error())
 		return nil, bcode.ErrBootstrapTerraformConfiguration
 	}
 	return c.GetCloudClusterCreationStatus(ctx, provider, req.Name)

pkg/apiserver/domain/service/config.go

@@ -23,12 +23,12 @@ import (
 
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/types"
 	apis "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/config"
 	"github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/pkg/utils/apply"
@@ -137,6 +137,14 @@ func (u *configServiceImpl) CreateConfig(ctx context.Context, project string, re
 			return nil, err
 		}
 	}
+	exist, err := u.Factory.IsExist(ctx, ns, req.Name)
+	if err != nil {
+		klog.Errorf("check config name is exist failure %s", err.Error())
+		return nil, bcode.ErrConfigExist
+	}
+	if exist {
+		return nil, bcode.ErrConfigExist
+	}
 	var properties = make(map[string]interface{})
 	if err := json.Unmarshal([]byte(req.Properties), &properties); err != nil {
 		return nil, err
@@ -156,9 +164,6 @@ func (u *configServiceImpl) CreateConfig(ctx context.Context, project string, re
 		return nil, err
 	}
 	if err := u.Factory.CreateOrUpdateConfig(ctx, configItem, ns); err != nil {
-		if errors.Is(err, config.ErrConfigExist) {
-			return nil, bcode.ErrConfigExist
-		}
 		return nil, err
 	}
 	return convertConfig(project, *configItem), nil
@@ -196,9 +201,12 @@ func (u *configServiceImpl) UpdateConfig(ctx context.Context, project string, na
 		return nil, err
 	}
 	if err := u.Factory.CreateOrUpdateConfig(ctx, configItem, ns); err != nil {
-		if errors.Is(err, config.ErrConfigExist) {
+		if errors.Is(err, config.ErrChangeTemplate) {
 			return nil, bcode.ErrChangeTemplate
 		}
+		if errors.Is(err, config.ErrChangeSecretType) {
+			return nil, bcode.ErrChangeSecretType
+		}
 		return nil, err
 	}
 	return convertConfig(project, *configItem), nil
@@ -234,7 +242,7 @@ func (u *configServiceImpl) ListConfigs(ctx context.Context, project string, tem
 	for i := range configs {
 		if projectNamespace != "" {
 			if err := u.Factory.MergeDistributionStatus(ctx, configs[i], projectNamespace); err != nil && !errors.Is(err, config.ErrNotFoundDistribution) {
-				log.Logger.Warnf("fail to merge the status %s:%s", configs[i].Name, err.Error())
+				klog.Warningf("fail to merge the status %s:%s", configs[i].Name, err.Error())
 			}
 		}
 		item := convertConfig(project, *configs[i])

pkg/apiserver/domain/service/definition.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	k8stypes "k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
@@ -41,7 +42,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 )
 
 // DefinitionService definition service, Implement the management of ComponentDefinition、TraitDefinition and WorkflowStepDefinition.
@@ -69,6 +69,7 @@ type DefinitionQueryOption struct {
 	AppliedWorkloads string `json:"appliedWorkloads"`
 	OwnerAddon       string `json:"sourceAddon"`
 	QueryAll         bool   `json:"queryAll"`
+	Scope            string `json:"scope"`
 }
 
 // String return cache key string
@@ -109,6 +110,19 @@ func (d *definitionServiceImpl) listDefinitions(ctx context.Context, list *unstr
 			},
 		},
 	}
+	if ops.Scope != "" {
+		var filterScope string
+		if ops.Scope == "Application" {
+			filterScope = "WorkflowRun"
+		} else {
+			filterScope = "Application"
+		}
+		matchLabels.MatchExpressions = append(matchLabels.MatchExpressions, metav1.LabelSelectorRequirement{
+			Key:      types.LabelDefinitionScope,
+			Operator: metav1.LabelSelectorOpNotIn,
+			Values:   []string{filterScope},
+		})
+	}
 	if !ops.QueryAll {
 		matchLabels.MatchExpressions = append(matchLabels.MatchExpressions, metav1.LabelSelectorRequirement{
 			Key:      types.LabelDefinitionHidden,
@@ -137,7 +151,7 @@ func (d *definitionServiceImpl) listDefinitions(ctx context.Context, list *unstr
 	for _, def := range filteredList.Items {
 		definition, err := convertDefinitionBase(def, kind)
 		if err != nil {
-			log.Logger.Errorf("convert definition to base failure %s", err.Error())
+			klog.Errorf("convert definition to base failure %s", err.Error())
 			continue
 		}
 		defs = append(defs, definition)
@@ -271,7 +285,7 @@ func renderCustomUISchema(ctx context.Context, cli client.Client, name, defType
 		Name:      fmt.Sprintf("%s-uischema-%s", defType, name),
 	}, &cm); err != nil {
 		if !apierrors.IsNotFound(err) {
-			log.Logger.Errorf("find uischema configmap from cluster failure %s", err.Error())
+			klog.Errorf("find uischema configmap from cluster failure %s", err.Error())
 		}
 		return defaultSchema
 	}
@@ -281,7 +295,7 @@ func renderCustomUISchema(ctx context.Context, cli client.Client, name, defType
 	}
 	schema := []*utils.UIParameter{}
 	if err := json.Unmarshal([]byte(data), &schema); err != nil {
-		log.Logger.Errorf("unmarshal ui schema failure %s", err.Error())
+		klog.Errorf("unmarshal ui schema failure %s", err.Error())
 		return defaultSchema
 	}
 	return patchSchema(defaultSchema, schema)
@@ -291,7 +305,7 @@ func renderCustomUISchema(ctx context.Context, cli client.Client, name, defType
 func (d *definitionServiceImpl) AddDefinitionUISchema(ctx context.Context, name, defType string, schema []*utils.UIParameter) ([]*utils.UIParameter, error) {
 	dataBate, err := json.Marshal(schema)
 	if err != nil {
-		log.Logger.Errorf("json marshal failure %s", err.Error())
+		klog.Errorf("json marshal failure %s", err.Error())
 		return nil, bcode.ErrInvalidDefinitionUISchema
 	}
 	var cm v1.ConfigMap

pkg/apiserver/domain/service/definition_test.go

@@ -112,6 +112,11 @@ var _ = Describe("Test namespace service functions", func() {
 		Expect(wfstep[0].WorkflowStep.Schematic).ShouldNot(BeNil())
 		Expect(wfstep[0].Alias).Should(Equal("test-alias"))
 
+		wfstep, err = definitionService.ListDefinitions(context.TODO(), DefinitionQueryOption{Type: "workflowstep", Scope: "WorkflowRun"})
+		Expect(err).Should(BeNil())
+		// the definition should be filtered
+		Expect(cmp.Diff(len(wfstep), 1)).Should(BeEmpty())
+
 		step, err = ioutil.ReadFile("./testdata/apply-application-hide.yaml")
 		Expect(err).Should(Succeed())
 		var sd2 v1beta1.WorkflowStepDefinition

pkg/apiserver/domain/service/env.go

@@ -24,6 +24,7 @@ import (
 	"sort"
 
 	apierror "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
@@ -34,7 +35,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/auth"
 	"github.com/oam-dev/kubevela/pkg/oam"
 	util "github.com/oam-dev/kubevela/pkg/utils"
@@ -191,7 +191,7 @@ func (p *envServiceImpl) UpdateEnv(ctx context.Context, name string, req apisv1.
 	env.Name = name
 	err := p.Store.Get(ctx, env)
 	if err != nil {
-		log.Logger.Errorf("check if env name exists failure %s", err.Error())
+		klog.Errorf("check if env name exists failure %s", err.Error())
 		return nil, bcode.ErrEnvNotExisted
 	}
 	if req.Alias != "" {
@@ -370,7 +370,7 @@ func managePrivilegesForEnvironment(ctx context.Context, cli client.Client, env
 	if err := f(ctx, cli, []auth.PrivilegeDescription{p}, identity, writer); err != nil {
 		return err
 	}
-	log.Logger.Debugf("%s: %s", msg, writer.String())
+	klog.Infof("%s: %s", msg, writer.String())
 	return nil
 }
 

pkg/apiserver/domain/service/envbinding.go

@@ -23,6 +23,7 @@ import (
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
@@ -33,7 +34,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	pkgUtils "github.com/oam-dev/kubevela/pkg/utils"
 )
 
@@ -66,7 +66,7 @@ func NewEnvBindingService() EnvBindingService {
 func (e *envBindingServiceImpl) GetEnvBindings(ctx context.Context, app *model.Application) ([]*apisv1.EnvBindingBase, error) {
 	full, err := repository.ListFullEnvBinding(ctx, e.Store, repository.EnvListOption{AppPrimaryKey: app.PrimaryKey(), ProjectName: app.Project})
 	if err != nil {
-		log.Logger.Errorf("list envbinding for app %s err: %v\n", app.Name, err)
+		klog.Errorf("list envbinding for app %s err: %v\n", app.Name, err)
 		return nil, err
 	}
 	return full, nil
@@ -125,16 +125,16 @@ func (e *envBindingServiceImpl) BatchCreateEnvBinding(ctx context.Context, app *
 		envBindingModel := assembler.ConvertToEnvBindingModel(app, *envbindings[i])
 		env, err := repository.GetEnv(ctx, e.Store, envBindingModel.Name)
 		if err != nil {
-			log.Logger.Errorf("get env failure %s", err.Error())
+			klog.Errorf("get env failure %s", err.Error())
 			continue
 		}
 		if err := e.Store.Add(ctx, envBindingModel); err != nil {
-			log.Logger.Errorf("add envbinding %s failure %s", pkgUtils.Sanitize(envBindingModel.Name), err.Error())
+			klog.Errorf("add envbinding %s failure %s", pkgUtils.Sanitize(envBindingModel.Name), err.Error())
 			continue
 		}
 		err = e.createEnvWorkflow(ctx, app, env, i == 0)
 		if err != nil {
-			log.Logger.Errorf("create env workflow failure %s", err.Error())
+			klog.Errorf("create env workflow failure %s", err.Error())
 			continue
 		}
 	}
@@ -237,14 +237,14 @@ func (e *envBindingServiceImpl) createEnvWorkflow(ctx context.Context, app *mode
 		EnvName:       env.Name,
 		AppPrimaryKey: app.PrimaryKey(),
 	}
-	log.Logger.Infof("create workflow %s for app %s", pkgUtils.Sanitize(workflow.Name), pkgUtils.Sanitize(app.PrimaryKey()))
+	klog.Infof("create workflow %s for app %s", pkgUtils.Sanitize(workflow.Name), pkgUtils.Sanitize(app.PrimaryKey()))
 	if err := e.Store.Add(ctx, workflow); err != nil {
 		return err
 	}
 	err := e.Store.BatchAdd(ctx, policies)
 	if err != nil {
 		if err := e.WorkflowService.DeleteWorkflow(ctx, app, repository.ConvertWorkflowName(env.Name)); err != nil {
-			log.Logger.Errorf("fail to rollback the workflow after fail to create policies, %s", err.Error())
+			klog.Errorf("fail to rollback the workflow after fail to create policies, %s", err.Error())
 		}
 		return fmt.Errorf("fail to create policies %w", err)
 	}
@@ -299,6 +299,6 @@ func (e *envBindingServiceImpl) ApplicationEnvRecycle(ctx context.Context, appMo
 	if err := resetRevisionsAndRecords(ctx, e.Store, appModel.Name, "", "", ""); err != nil {
 		return err
 	}
-	log.Logger.Infof("Application %s(%s) recycle successfully from env %s", appModel.Name, name, env.Name)
+	klog.Infof("Application %s(%s) recycle successfully from env %s", appModel.Name, name, env.Name)
 	return nil
 }

pkg/apiserver/domain/service/helm.go

@@ -23,12 +23,12 @@ import (
 	"github.com/oam-dev/kubevela/apis/types"
 	v1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/pkg/utils/common"
 	"github.com/oam-dev/kubevela/pkg/utils/helm"
 
 	types2 "k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"helm.sh/helm/v3/pkg/repo"
@@ -69,7 +69,7 @@ func (d defaultHelmImpl) ListChartNames(ctx context.Context, repoURL string, sec
 	}
 	charts, err := d.helper.ListChartsFromRepo(repoURL, skipCache, opts)
 	if err != nil {
-		log.Logger.Errorf("cannot fetch charts repo: %s, error: %s", utils.Sanitize(repoURL), err.Error())
+		klog.Errorf("cannot fetch charts repo: %s, error: %s", utils.Sanitize(repoURL), err.Error())
 		return nil, bcode.ErrListHelmChart
 	}
 	return charts, nil
@@ -89,11 +89,11 @@ func (d defaultHelmImpl) ListChartVersions(ctx context.Context, repoURL string,
 	}
 	chartVersions, err := d.helper.ListVersions(repoURL, chartName, skipCache, opts)
 	if err != nil {
-		log.Logger.Errorf("cannot fetch chart versions repo: %s, chart: %s error: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName), err.Error())
+		klog.Errorf("cannot fetch chart versions repo: %s, chart: %s error: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName), err.Error())
 		return nil, bcode.ErrListHelmVersions
 	}
 	if len(chartVersions) == 0 {
-		log.Logger.Errorf("cannot fetch chart versions repo: %s, chart: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName))
+		klog.Errorf("cannot fetch chart versions repo: %s, chart: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName))
 		return nil, bcode.ErrChartNotExist
 	}
 	return chartVersions, nil
@@ -113,7 +113,7 @@ func (d defaultHelmImpl) GetChartValues(ctx context.Context, repoURL string, cha
 	}
 	v, err := d.helper.GetValuesFromChart(repoURL, chartName, version, skipCache, opts)
 	if err != nil {
-		log.Logger.Errorf("cannot fetch chart values repo: %s, chart: %s, version: %s, error: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName), utils.Sanitize(version), err.Error())
+		klog.Errorf("cannot fetch chart values repo: %s, chart: %s, version: %s, error: %s", utils.Sanitize(repoURL), utils.Sanitize(chartName), utils.Sanitize(version), err.Error())
 		return nil, bcode.ErrGetChartValues
 	}
 	res := make(map[string]interface{}, len(v))

pkg/apiserver/domain/service/image.go

@@ -33,11 +33,11 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/types"
 	v1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 )
 
 // True -
@@ -97,7 +97,7 @@ func (i *imageImpl) GetImageInfo(ctx context.Context, project, secretName, image
 
 	registries, err := i.ListImageRepos(ctx, project)
 	if err != nil {
-		log.Logger.Warnf("fail to list the image registries:%s", err.Error())
+		klog.Warningf("fail to list the image registries:%s", err.Error())
 		imageInfo.Message = "There is no registry."
 		return imageInfo
 	}
@@ -151,7 +151,7 @@ func getAccountFromSecret(secret corev1.Secret, registryDomain string) (insecure
 		if len(conf) > 0 {
 			var authConfig map[string]map[string]map[string]string
 			if err := json.Unmarshal(conf, &authConfig); err != nil {
-				log.Logger.Warnf("fail to unmarshal the secret %s , %s", secret.Name, err.Error())
+				klog.Warningf("fail to unmarshal the secret %s , %s", secret.Name, err.Error())
 				return
 			}
 			if authConfig != nil && authConfig["auths"] != nil && authConfig["auths"][registryDomain] != nil {

pkg/apiserver/domain/service/pipeline.go

@@ -29,7 +29,6 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-
 	"github.com/kubevela/workflow/api/v1alpha1"
 	"github.com/kubevela/workflow/pkg/cue/model/value"
 	wfTypes "github.com/kubevela/workflow/pkg/types"
@@ -42,6 +41,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	types2 "github.com/oam-dev/kubevela/apis/types"
@@ -50,7 +50,6 @@ import (
 	apis "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/oam/util"
 	pkgutils "github.com/oam-dev/kubevela/pkg/utils"
 )
@@ -210,7 +209,7 @@ func (p pipelineServiceImpl) ListPipelines(ctx context.Context, req apis.ListPip
 				info, err = p.getPipelineInfo(ctx, pipeline, projectMap[pipeline.Project].Namespace)
 				if err != nil {
 					// Since we are listing pipelines. We should not return directly if we cannot get pipeline info
-					log.Logger.Errorf("get pipeline %s/%s info error: %v", pipeline.Project, pipeline.Name, err)
+					klog.Errorf("get pipeline %s/%s info error: %v", pipeline.Project, pkgutils.Sanitize(pipeline.Name), err)
 					continue
 				}
 			}
@@ -248,7 +247,7 @@ func (p pipelineServiceImpl) GetPipeline(ctx context.Context, name string, getIn
 	if getInfo {
 		in, err := p.getPipelineInfo(ctx, pipeline, project.Namespace)
 		if err != nil {
-			log.Logger.Errorf("get pipeline %s/%s info error: %v", pipeline.Project, pipeline.Name, err)
+			klog.Errorf("get pipeline %s/%s info error: %v", pipeline.Project, pkgutils.Sanitize(pipeline.Name), err)
 			return nil, bcode.ErrGetPipelineInfo
 		}
 		if in != nil {
@@ -304,11 +303,11 @@ func (p pipelineServiceImpl) DeletePipeline(ctx context.Context, pl apis.Pipelin
 	}
 	// Clean up pipeline: 1. delete pipeline runs 2. delete contexts 3. delete pipeline
 	if err := p.PipelineRunService.CleanPipelineRuns(ctx, pl); err != nil {
-		log.Logger.Errorf("delete pipeline all pipeline-runs failure: %s", err.Error())
+		klog.Errorf("delete pipeline all pipeline-runs failure: %s", err.Error())
 		return err
 	}
 	if err := p.ContextService.DeleteAllContexts(ctx, pl.Project.Name, pl.Name); err != nil {
-		log.Logger.Errorf("delete pipeline all context failure: %s", err.Error())
+		klog.Errorf("delete pipeline all context failure: %s", err.Error())
 		return err
 	}
 	if err := p.Store.Delete(ctx, pipeline); err != nil {
@@ -351,7 +350,7 @@ func (p pipelineRunServiceImpl) GetPipelineRunOutput(ctx context.Context, pipeli
 	}
 	v, err := wfUtils.GetDataFromContext(ctx, p.KubeClient, ctxBackend.Name, pipelineRun.PipelineRunName, ctxBackend.Namespace)
 	if err != nil {
-		log.Logger.Errorf("get data from context backend failed: %v", err)
+		klog.Errorf("get data from context backend failed: %v", err)
 		return apis.GetPipelineRunOutputResponse{}, bcode.ErrGetContextBackendData
 	}
 	for _, s := range pipelineRun.Status.Steps {
@@ -413,7 +412,7 @@ func (p pipelineRunServiceImpl) GetPipelineRunInput(ctx context.Context, pipelin
 	}
 	v, err := wfUtils.GetDataFromContext(ctx, p.KubeClient, ctxBackend.Name, pipelineRun.PipelineRunName, ctxBackend.Namespace)
 	if err != nil {
-		log.Logger.Errorf("get data from context backend failed: %v", err)
+		klog.Errorf("get data from context backend failed: %v", err)
 		return apis.GetPipelineRunInputResponse{}, bcode.ErrGetContextBackendData
 	}
 	for _, s := range pipelineRun.Status.Steps {
@@ -507,13 +506,13 @@ func (p pipelineRunServiceImpl) GetPipelineRunLog(ctx context.Context, pipelineR
 			var logsBuilder strings.Builder
 			readCloser, err := wfUtils.GetLogsFromURL(ctx, logConfig.Source.URL)
 			if err != nil {
-				log.Logger.Errorf("get logs from url %s failed: %v", logConfig.Source.URL, err)
+				klog.Errorf("get logs from url %s failed: %v", logConfig.Source.URL, err)
 				return apis.GetPipelineRunLogResponse{}, bcode.ErrReadSourceLog
 			}
 			//nolint:errcheck
 			defer readCloser.Close()
 			if _, err := io.Copy(&logsBuilder, readCloser); err != nil {
-				log.Logger.Errorf("copy logs from url %s failed: %v", logConfig.Source.URL, err)
+				klog.Errorf("copy logs from url %s failed: %v", logConfig.Source.URL, err)
 				return apis.GetPipelineRunLogResponse{}, bcode.ErrReadSourceLog
 			}
 			logs = logsBuilder.String()
@@ -613,12 +612,12 @@ func getResourceLogs(ctx context.Context, config *rest.Config, cli client.Client
 	}
 	pods, err := wfUtils.GetPodListFromResources(ctx, cli, resources)
 	if err != nil {
-		log.Logger.Errorf("fail to get pod list from resources: %v", err)
+		klog.Errorf("fail to get pod list from resources: %v", err)
 		return "", err
 	}
 	clientSet, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		log.Logger.Errorf("fail to get clientset from kubeconfig: %v", err)
+		klog.Errorf("fail to get clientset from kubeconfig: %v", err)
 		return "", err
 	}
 	podContainers := make([]PodContainer, 0)
@@ -652,7 +651,7 @@ func getResourceLogs(ctx context.Context, config *rest.Config, cli client.Client
 			req := clientSet.CoreV1().Pods(pc.Namespace).GetLogs(pc.Name, &podLogOpts)
 			podLogs, err := req.Stream(ctxQuery)
 			if err != nil {
-				log.Logger.Errorf("fail to get pod logs: %v", err)
+				klog.Errorf("fail to get pod logs: %v", err)
 				return
 			}
 			defer func() {
@@ -673,17 +672,21 @@ func getResourceLogs(ctx context.Context, config *rest.Config, cli client.Client
 					}
 					break
 				}
+				shouldPrint := true
 				if len(filters) != 0 {
 					for _, f := range filters {
-						if strings.Contains(s, f) {
-							buf.WriteString(s)
+						if !strings.Contains(s, f) {
+							shouldPrint = false
 						}
 					}
 				}
+				if shouldPrint {
+					buf.WriteString(s)
+				}
 			}
 			if readErr != nil {
 				errPrint(buf, "error in copy information from APIServer to buffer: %s", err.Error())
-				log.Logger.Errorf("fail to copy pod logs: %v", err)
+				klog.Errorf("fail to copy pod logs: %v", err)
 			}
 			logMap.Store(fmt.Sprintf("%s/%s", pc.Name, pc.Container), buf.String())
 		}(pc)
@@ -705,6 +708,47 @@ func getResourceLogs(ctx context.Context, config *rest.Config, cli client.Client
 	return logBuilder.String(), nil
 }
 
+func pipelineStep2WorkflowStep(step model.WorkflowStep) v1alpha1.WorkflowStep {
+	res := v1alpha1.WorkflowStep{
+		WorkflowStepBase: v1alpha1.WorkflowStepBase{
+			Name:       step.Name,
+			Type:       step.Type,
+			Meta:       step.Meta,
+			If:         step.If,
+			Timeout:    step.Timeout,
+			DependsOn:  step.DependsOn,
+			Inputs:     step.Inputs,
+			Outputs:    step.Outputs,
+			Properties: step.Properties.RawExtension(),
+		},
+		SubSteps: make([]v1alpha1.WorkflowStepBase, 0),
+	}
+	for _, subStep := range step.SubSteps {
+		res.SubSteps = append(res.SubSteps, v1alpha1.WorkflowStepBase{
+			Name:       subStep.Name,
+			Type:       subStep.Type,
+			Meta:       subStep.Meta,
+			If:         subStep.If,
+			Timeout:    subStep.Timeout,
+			DependsOn:  subStep.DependsOn,
+			Inputs:     subStep.Inputs,
+			Outputs:    subStep.Outputs,
+			Properties: subStep.Properties.RawExtension(),
+		})
+	}
+	return res
+}
+
+func pipelineSpec2WorkflowSpec(spec model.WorkflowSpec) *v1alpha1.WorkflowSpec {
+	res := &v1alpha1.WorkflowSpec{
+		Steps: make([]v1alpha1.WorkflowStep, 0),
+	}
+	for _, step := range spec.Steps {
+		res.Steps = append(res.Steps, pipelineStep2WorkflowStep(step))
+	}
+	return res
+}
+
 // RunPipeline will run a pipeline
 func (p pipelineServiceImpl) RunPipeline(ctx context.Context, pipeline apis.PipelineBase, req apis.RunPipelineRequest) (*apis.PipelineRun, error) {
 	if err := checkRunMode(&req.Mode); err != nil {
@@ -714,9 +758,10 @@ func (p pipelineServiceImpl) RunPipeline(ctx context.Context, pipeline apis.Pipe
 	run := v1alpha1.WorkflowRun{}
 	version := utils.GenerateVersion("")
 	name := fmt.Sprintf("%s-%s", pipeline.Name, version)
+	s := pipeline.Spec
 	run.Name = name
 	run.Namespace = project.GetNamespace()
-	run.Spec.WorkflowSpec = &pipeline.Spec
+	run.Spec.WorkflowSpec = pipelineSpec2WorkflowSpec(s)
 	run.Spec.Mode = &req.Mode
 
 	run.SetLabels(map[string]string{
@@ -878,13 +923,13 @@ func (p pipelineRunServiceImpl) GetPipelineRun(ctx context.Context, meta apis.Pi
 			Project: project.Name,
 		}
 		if err := p.Store.Get(ctx, pipeline); err != nil {
-			log.Logger.Errorf("failed to load the workflow %s", err.Error())
+			klog.Errorf("failed to load the workflow %s", err.Error())
 			if errors.Is(err, datastore.ErrRecordNotExist) {
 				return nil, bcode.ErrPipelineNotExist
 			}
 			return nil, err
 		}
-		run.Spec.WorkflowSpec = &pipeline.Spec
+		run.Spec.WorkflowSpec = pipelineSpec2WorkflowSpec(pipeline.Spec)
 
 	}
 	return workflowRun2PipelineRun(run, project, p.ContextService)
@@ -984,7 +1029,7 @@ func (c contextServiceImpl) CreateContext(ctx context.Context, projectName, pipe
 		}
 	}
 	if _, ok := modelCtx.Contexts[context.Name]; ok {
-		log.Logger.Errorf("context %s already exists", context.Name)
+		klog.Errorf("context %s already exists", pkgutils.Sanitize(context.Name))
 		return nil, bcode.ErrContextAlreadyExist
 	}
 	modelCtx.Contexts[context.Name] = context.Values
@@ -1169,7 +1214,7 @@ func (p pipelineRunServiceImpl) workflowRun2runBriefing(ctx context.Context, run
 	if contextName, ok := run.Labels[labelContext]; ok {
 		apiContext, err = p.ContextService.GetContext(ctx, project.Name, pipelineName, contextName)
 		if err != nil {
-			log.Logger.Warnf("failed to get pipeline run context %s/%s/%s: %v", project, pipelineName, contextName, err)
+			klog.Warningf("failed to get pipeline run context %s/%s/%s: %v", project, pipelineName, contextName, err)
 			apiContext = nil
 		}
 	}
@@ -1239,7 +1284,7 @@ func (p pipelineRunServiceImpl) terminatePipelineRun(ctx context.Context, run *v
 
 }
 
-func checkPipelineSpec(spec v1alpha1.WorkflowSpec) error {
+func checkPipelineSpec(spec model.WorkflowSpec) error {
 	if len(spec.Steps) == 0 {
 		return bcode.ErrNoSteps
 	}

pkg/apiserver/domain/service/pipeline_test.go

@@ -22,7 +22,6 @@ import (
 	"github.com/kubevela/workflow/api/v1alpha1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
@@ -68,10 +67,12 @@ var _ = Describe("Test pipeline service functions", func() {
 	})
 
 	It("Test create pipeline", func() {
-		rawProps := []byte(`{"url":"https://api.github.com/repos/kubevela/kubevela"}`)
-		testPipelineSteps := []v1alpha1.WorkflowStep{
+		props := model.JSONStruct{
+			"url": "https://api.github.com/repos/kubevela/kubevela",
+		}
+		testPipelineSteps := []model.WorkflowStep{
 			{
-				SubSteps: []v1alpha1.WorkflowStepBase{
+				SubSteps: []model.WorkflowStepBase{
 					{
 						Name: "request",
 						Type: "request",
@@ -81,12 +82,10 @@ var _ = Describe("Test pipeline service functions", func() {
 								Name:      "stars",
 							},
 						},
-						Properties: &runtime.RawExtension{
-							Raw: rawProps,
-						},
+						Properties: &props,
 					},
 				},
-				WorkflowStepBase: v1alpha1.WorkflowStepBase{
+				WorkflowStepBase: model.WorkflowStepBase{
 					Name: "step-group",
 					Type: "step-group",
 				},
@@ -96,7 +95,7 @@ var _ = Describe("Test pipeline service functions", func() {
 		By("create pipeline with sub-steps")
 		pipeline, err := pipelineService.CreatePipeline(ctx, apisv1.CreatePipelineRequest{
 			Name: pipelineName,
-			Spec: v1alpha1.WorkflowSpec{
+			Spec: model.WorkflowSpec{
 				Steps: testPipelineSteps,
 			},
 		})

pkg/apiserver/domain/service/project.go

@@ -23,6 +23,7 @@ import (
 
 	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/types"
@@ -30,7 +31,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/apiserver/infrastructure/datastore"
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 	"github.com/oam-dev/kubevela/pkg/utils"
 )
@@ -75,29 +75,19 @@ func (p *projectServiceImpl) Init(ctx context.Context) error {
 // the default env and default target both using the `default` namespace in control plane cluster
 func (p *projectServiceImpl) InitDefaultProjectEnvTarget(ctx context.Context, defaultNamespace string) error {
 	var project = model.Project{}
-	entities, err := p.Store.List(ctx, &project, &datastore.ListOptions{FilterOptions: datastore.FilterOptions{
-		IsNotExist: []datastore.IsNotExistQueryOption{
-			{
-				Key: "owner",
-			},
-		},
-	}})
+	entities, err := p.Store.List(ctx, &project, &datastore.ListOptions{FilterOptions: datastore.FilterOptions{}})
 	if err != nil {
 		return fmt.Errorf("initialize project failed %w", err)
 	}
 	if len(entities) > 0 {
 		for _, project := range entities {
 			pro := project.(*model.Project)
-			var init = pro.Owner == ""
 			pro.Owner = model.DefaultAdminUserName
 			if err := p.Store.Put(ctx, pro); err != nil {
 				return err
 			}
-			// owner is empty, it is old data
-			if init {
-				if err := p.RbacService.InitDefaultRoleAndUsersForProject(ctx, pro); err != nil {
-					return fmt.Errorf("init default role and users for project %s failure %w", pro.Name, err)
-				}
+			if err := p.RbacService.SyncDefaultRoleAndUsersForProject(ctx, pro); err != nil {
+				return fmt.Errorf("fail to sync the default role and users for the project %s %w", pro.Name, err)
 			}
 		}
 		return nil
@@ -107,7 +97,7 @@ func (p *projectServiceImpl) InitDefaultProjectEnvTarget(ctx context.Context, de
 	if count > 0 {
 		return nil
 	}
-	log.Logger.Info("no default project found, adding a default project with default env and target")
+	klog.Info("no default project found, adding a default project with default env and target")
 
 	_, err = p.CreateProject(ctx, apisv1.CreateProjectRequest{
 		Name:        model.DefaultInitName,
@@ -179,7 +169,7 @@ func (p *projectServiceImpl) DetailProject(ctx context.Context, projectName stri
 	var user = &model.User{Name: project.Owner}
 	if project.Owner != "" {
 		if err := p.Store.Get(ctx, user); err != nil {
-			log.Logger.Warnf("get project owner %s info failure %s", project.Owner, err.Error())
+			klog.Warningf("get project owner %s info failure %s", project.Owner, err.Error())
 		}
 	}
 	return ConvertProjectModel2Base(project, user), nil
@@ -197,7 +187,7 @@ func listProjects(ctx context.Context, ds datastore.DataStore, page, pageSize in
 		var user = &model.User{Name: project.Owner}
 		if project.Owner != "" {
 			if err := ds.Get(ctx, user); err != nil {
-				log.Logger.Warnf("get project owner %s info failure %s", project.Owner, err.Error())
+				klog.Warningf("get project owner %s info failure %s", project.Owner, err.Error())
 			}
 		}
 		projects = append(projects, ConvertProjectModel2Base(project, user))
@@ -305,10 +295,9 @@ func (p *projectServiceImpl) DeleteProject(ctx context.Context, name string) err
 
 // CreateProject create project
 func (p *projectServiceImpl) CreateProject(ctx context.Context, req apisv1.CreateProjectRequest) (*apisv1.ProjectBase, error) {
-
 	exist, err := p.Store.IsExist(ctx, &model.Project{Name: req.Name})
 	if err != nil {
-		log.Logger.Errorf("check project name is exist failure %s", err.Error())
+		klog.Errorf("check project name is exist failure %s", err.Error())
 		return nil, bcode.ErrProjectIsExist
 	}
 	if exist {
@@ -344,8 +333,8 @@ func (p *projectServiceImpl) CreateProject(ctx context.Context, req apisv1.Creat
 		return nil, err
 	}
 
-	if err := p.RbacService.InitDefaultRoleAndUsersForProject(ctx, newProject); err != nil {
-		log.Logger.Errorf("init default role and users for project failure %s", err.Error())
+	if err := p.RbacService.SyncDefaultRoleAndUsersForProject(ctx, newProject); err != nil {
+		klog.Errorf("fail to sync the default role and users for the project: %s", err.Error())
 	}
 
 	return ConvertProjectModel2Base(newProject, user), nil

pkg/apiserver/domain/service/rbac.go

@@ -26,6 +26,7 @@ import (
 	"sync"
 
 	"github.com/emicklei/go-restful/v3"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/apis/types"
@@ -36,7 +37,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	apiserverutils "github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/auth"
 	"github.com/oam-dev/kubevela/pkg/utils"
 )
@@ -90,10 +90,10 @@ var defaultProjectPermissionTemplate = []*model.PermissionTemplate{
 		Scope:     "project",
 	},
 	{
-		Name:      "configuration-read",
-		Alias:     "Environment Management",
+		Name:      "config-management",
+		Alias:     "Config Management",
 		Resources: []string{"project:{projectName}/config:*", "project:{projectName}/provider:*"},
-		Actions:   []string{"list", "detail"},
+		Actions:   []string{"*"},
 		Effect:    "Allow",
 		Scope:     "project",
 	},
@@ -405,7 +405,7 @@ type RBACService interface {
 	ListPermissions(ctx context.Context, projectName string) ([]apisv1.PermissionBase, error)
 	CreatePermission(ctx context.Context, projectName string, req apisv1.CreatePermissionRequest) (*apisv1.PermissionBase, error)
 	DeletePermission(ctx context.Context, projectName, permName string) error
-	InitDefaultRoleAndUsersForProject(ctx context.Context, project *model.Project) error
+	SyncDefaultRoleAndUsersForProject(ctx context.Context, project *model.Project) error
 	Init(ctx context.Context) error
 }
 
@@ -590,7 +590,7 @@ func (p *rbacServiceImpl) CheckPerm(resource string, actions ...string) func(req
 		}
 		path, err := checkResourcePath(resource)
 		if err != nil {
-			log.Logger.Errorf("check resource path failure %s", err.Error())
+			klog.Errorf("check resource path failure %s", err.Error())
 			bcode.ReturnError(req, res, bcode.ErrForbidden)
 			return
 		}
@@ -634,7 +634,7 @@ func (p *rbacServiceImpl) CheckPerm(resource string, actions ...string) func(req
 		projectName := getProjectName()
 		permissions, err := p.GetUserPermissions(req.Request.Context(), user, projectName, true)
 		if err != nil {
-			log.Logger.Errorf("get user's perm policies failure %s, user is %s", err.Error(), user.Name)
+			klog.Errorf("get user's perm policies failure %s, user is %s", err.Error(), user.Name)
 			bcode.ReturnError(req, res, bcode.ErrForbidden)
 			return
 		}
@@ -696,7 +696,7 @@ func (p *rbacServiceImpl) DeleteRole(ctx context.Context, projectName, roleName
 func (p *rbacServiceImpl) DeletePermission(ctx context.Context, projectName, permName string) error {
 	roles, _, err := repository.ListRoles(ctx, p.Store, projectName, 0, 0)
 	if err != nil {
-		log.Logger.Errorf("fail to list the roles: %s", err.Error())
+		klog.Errorf("fail to list the roles: %s", err.Error())
 		return bcode.ErrPermissionIsUsed
 	}
 	for _, role := range roles {
@@ -768,7 +768,7 @@ func (p *rbacServiceImpl) ListRole(ctx context.Context, projectName string, page
 
 	policies, err := p.listPermPolices(ctx, projectName, utils.MapKey2Array(policySet))
 	if err != nil {
-		log.Logger.Errorf("list perm policies failure %s", err.Error())
+		klog.Errorf("list perm policies failure %s", err.Error())
 	}
 	var policyMap = make(map[string]*model.Permission)
 	for i, policy := range policies {
@@ -857,7 +857,17 @@ func (p *rbacServiceImpl) CreatePermission(ctx context.Context, projectName stri
 	return assembler.ConvertPermission2DTO(&permission), nil
 }
 
-func (p *rbacServiceImpl) InitDefaultRoleAndUsersForProject(ctx context.Context, project *model.Project) error {
+func (p *rbacServiceImpl) SyncDefaultRoleAndUsersForProject(ctx context.Context, project *model.Project) error {
+
+	permissions, err := p.ListPermissions(ctx, project.Name)
+	if err != nil {
+		return err
+	}
+	var permissionMap = map[string]apisv1.PermissionBase{}
+	for i, per := range permissions {
+		permissionMap[per.Name] = permissions[i]
+	}
+
 	var batchData []datastore.Entity
 	for _, permissionTemp := range defaultProjectPermissionTemplate {
 		var rra = RequestResourceAction{}
@@ -871,39 +881,52 @@ func (p *rbacServiceImpl) InitDefaultRoleAndUsersForProject(ctx context.Context,
 			})
 			formattedResource = append(formattedResource, rra.GetResource().String())
 		}
-		batchData = append(batchData, &model.Permission{
+		permission := &model.Permission{
 			Name:      permissionTemp.Name,
 			Alias:     permissionTemp.Alias,
 			Project:   project.Name,
 			Resources: formattedResource,
 			Actions:   permissionTemp.Actions,
 			Effect:    permissionTemp.Effect,
-		})
-	}
-	batchData = append(batchData, &model.Role{
-		Name:        "app-developer",
-		Alias:       "App Developer",
-		Permissions: []string{"project-view", "app-management", "env-management", "configuration-read"},
-		Project:     project.Name,
-	}, &model.Role{
-		Name:        "project-admin",
-		Alias:       "Project Admin",
-		Permissions: []string{"project-view", "app-management", "env-management", "role-management", "pipeline-management", "configuration-read"},
-		Project:     project.Name,
-	}, &model.Role{
-		Name:        "project-viewer",
-		Alias:       "Project Viewer",
-		Permissions: []string{"project-view"},
-		Project:     project.Name,
-	})
-	if project.Owner != "" {
-		var projectUser = &model.ProjectUser{
-			ProjectName: project.Name,
-			UserRoles:   []string{"project-admin"},
-			Username:    project.Owner,
 		}
-		batchData = append(batchData, projectUser)
+		if perm, exist := permissionMap[permissionTemp.Name]; exist {
+			if !utils.EqualSlice(perm.Resources, permissionTemp.Resources) || utils.EqualSlice(perm.Actions, permissionTemp.Actions) {
+				if err := p.Store.Put(ctx, permission); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+		batchData = append(batchData, permission)
 	}
+
+	if len(permissions) == 0 {
+		batchData = append(batchData, &model.Role{
+			Name:        "app-developer",
+			Alias:       "App Developer",
+			Permissions: []string{"project-view", "app-management", "env-management", "config-management", "pipeline-management"},
+			Project:     project.Name,
+		}, &model.Role{
+			Name:        "project-admin",
+			Alias:       "Project Admin",
+			Permissions: []string{"project-view", "app-management", "env-management", "pipeline-management", "config-management", "role-management"},
+			Project:     project.Name,
+		}, &model.Role{
+			Name:        "project-viewer",
+			Alias:       "Project Viewer",
+			Permissions: []string{"project-view"},
+			Project:     project.Name,
+		})
+		if project.Owner != "" {
+			var projectUser = &model.ProjectUser{
+				ProjectName: project.Name,
+				UserRoles:   []string{"project-admin"},
+				Username:    project.Owner,
+			}
+			batchData = append(batchData, projectUser)
+		}
+	}
+
 	return p.Store.BatchAdd(ctx, batchData)
 }
 
@@ -1050,6 +1073,6 @@ func managePrivilegesForAdminUser(ctx context.Context, cli client.Client, roleNa
 	if err := f(ctx, cli, []auth.PrivilegeDescription{p}, identity, writer); err != nil {
 		return err
 	}
-	log.Logger.Debugf("%s: %s", msg, writer.String())
+	klog.Infof("%s: %s", msg, writer.String())
 	return nil
 }

pkg/apiserver/domain/service/rbac_test.go

@@ -189,7 +189,7 @@ var _ = Describe("Test rbac service", func() {
 
 		err = ds.Add(context.TODO(), &model.Project{Name: "init-test", Owner: "test-user"})
 		Expect(err).Should(BeNil())
-		err = rbacService.InitDefaultRoleAndUsersForProject(context.TODO(), &model.Project{Name: "init-test"})
+		err = rbacService.SyncDefaultRoleAndUsersForProject(context.TODO(), &model.Project{Name: "init-test"})
 		Expect(err).Should(BeNil())
 
 		roles, err := rbacService.ListRole(context.TODO(), "init-test", 0, 0)

pkg/apiserver/domain/service/target.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/oam-dev/kubevela/pkg/apiserver/domain/model"
@@ -30,7 +31,6 @@ import (
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/interfaces/api/dto/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils"
 	"github.com/oam-dev/kubevela/pkg/apiserver/utils/bcode"
-	"github.com/oam-dev/kubevela/pkg/apiserver/utils/log"
 	"github.com/oam-dev/kubevela/pkg/auth"
 	"github.com/oam-dev/kubevela/pkg/multicluster"
 )
@@ -228,14 +228,14 @@ func (dt *targetServiceImpl) convertFromTargetModel(ctx context.Context, target
 			Name: target.Project,
 		}
 		if err := dt.Store.Get(ctx, &project); err != nil {
-			log.Logger.Errorf("get project failure %s", err.Error())
+			klog.Errorf("get project failure %s", err.Error())
 		}
 		targetBase.Project = apisv1.NameAlias{Name: project.Name, Alias: project.Alias}
 	}
 	if targetBase.Cluster != nil && targetBase.Cluster.ClusterName != "" {
 		cluster, err := _getClusterFromDataStore(ctx, dt.Store, target.Cluster.ClusterName)
 		if err != nil {
-			log.Logger.Errorf("query cluster info failure %s", err.Error())
+			klog.Errorf("query cluster info failure %s", err.Error())
 		}
 		if cluster != nil {
 			targetBase.ClusterAlias = cluster.Alias
@@ -259,7 +259,7 @@ func managePrivilegesForTarget(ctx context.Context, cli client.Client, target *m
 	if err := f(ctx, cli, []auth.PrivilegeDescription{p}, identity, writer); err != nil {
 		return err
 	}
-	log.Logger.Debugf("%s: %s", msg, writer.String())
+	klog.Infof("%s: %s", msg, writer.String())
 	return nil
 }
 

pkg/apiserver/domain/service/testdata/applyapplication-sd.yaml

@@ -8,6 +8,8 @@ metadata:
     definition.oam.dev/alias: test-alias
   name: apply-application
   namespace: vela-system
+  labels:
+    custom.definition.oam.dev/scope: Application
 spec:
   schematic:
     cue: