Fix: remove last-applied-config annotation for configmap and secret (#3942)

Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>
(cherry picked from commit 4789fa8833)

Co-authored-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>

.github/workflows/apiserver-test.yaml

@@ -6,9 +6,7 @@ on:
       - master
       - release-*
       - apiserver
-    tags:
-      - v*
-  workflow_dispatch: { }
+  workflow_dispatch: {}
   pull_request:
     branches:
       - master
@@ -20,8 +18,6 @@ env:
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -39,36 +35,10 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: mukunku/tag-exists-action@v1.0.0
-        id: checkTag
-        with:
-          tag: 'v1'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - id: set-k8s-matrix
-        run: |
-          echo ${{ steps.checkTag.outputs.exists }}
-          if [ "${{ steps.checkTag.outputs.exists }}" = "true" ]; then
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
-          fi
-
-
   apiserver-unit-tests:
     runs-on: aliyun
-    needs: [ detect-noop,set-k8s-matrix ]
+    needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
 
     steps:
       - name: Set up Go
@@ -95,7 +65,7 @@ jobs:
       - name: Setup Kind Cluster (Worker)
         run: |
           kind delete cluster --name worker
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }} --name worker
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca --name worker
           kubectl version
           kubectl cluster-info
           kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
@@ -104,7 +74,7 @@ jobs:
       - name: Setup Kind Cluster (Hub)
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 

.github/workflows/e2e-multicluster-test.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
       - release-*
-    tags:
-      - v*
   workflow_dispatch: {}
   pull_request:
     branches:
@@ -18,8 +16,6 @@ env:
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -37,37 +33,10 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: mukunku/tag-exists-action@v1.0.0
-        id: checkTag
-        with:
-          tag: 'v1'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - id: set-k8s-matrix
-        run: |
-          echo ${{ steps.checkTag.outputs.exists }}
-          if [ "${{ steps.checkTag.outputs.exists }}" = "true" ]; then
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
-          fi
-
-
   e2e-multi-cluster-tests:
     runs-on: aliyun
-    needs: [ detect-noop,set-k8s-matrix ]
+    needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
-
 
     steps:
       - name: Check out code into the Go module directory
@@ -91,7 +60,7 @@ jobs:
       - name: Setup Kind Cluster (Worker)
         run: |
           kind delete cluster --name worker
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }} --name worker
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca --name worker
           kubectl version
           kubectl cluster-info
           kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
@@ -100,7 +69,7 @@ jobs:
       - name: Setup Kind Cluster (Hub)
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 

.github/workflows/e2e-rollout-test.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
       - release-*
-    tags:
-      - v*
   workflow_dispatch: {}
   pull_request:
     branches:
@@ -18,8 +16,6 @@ env:
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -37,35 +33,10 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: mukunku/tag-exists-action@v1.0.0
-        id: checkTag
-        with:
-          tag: 'v1'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - id: set-k8s-matrix
-        run: |
-          echo ${{ steps.checkTag.outputs.exists }}
-          if [ "${{ steps.checkTag.outputs.exists }}" = "true" ]; then
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
-          fi
-
   e2e-rollout-tests:
     runs-on: aliyun
-    needs: [ detect-noop,set-k8s-matrix ]
+    needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
 
     steps:
       - name: Check out code into the Go module directory
@@ -89,7 +60,7 @@ jobs:
       - name: Setup Kind Cluster
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 

.github/workflows/e2e-test.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
       - release-*
-    tags:
-      - v*
   workflow_dispatch: {}
   pull_request:
     branches:
@@ -18,8 +16,6 @@ env:
   GO_VERSION: '1.17'
   GOLANGCI_VERSION: 'v1.38'
   KIND_VERSION: 'v0.7.0'
-  KIND_IMAGE_VERSION: '[\"v1.20.7\"]'
-  KIND_IMAGE_VERSIONS: '[\"v1.18.20\",\"v1.20.7\",\"v1.22.7\"]'
 
 jobs:
 
@@ -37,35 +33,10 @@ jobs:
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
           concurrent_skipping: false
 
-  set-k8s-matrix:
-    runs-on: ubuntu-20.04
-    outputs:
-      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: mukunku/tag-exists-action@v1.0.0
-        id: checkTag
-        with:
-          tag: 'v1'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - id: set-k8s-matrix
-        run: |
-          echo ${{ steps.checkTag.outputs.exists }}
-          if [ "${{ steps.checkTag.outputs.exists }}" = "true" ]; then
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSIONS }}"
-          else
-            echo "::set-output name=matrix::${{ env.KIND_IMAGE_VERSION }}"
-          fi
-
   e2e-tests:
     runs-on: aliyun
-    needs: [ detect-noop,set-k8s-matrix ]
+    needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
-    strategy:
-      matrix:
-        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
 
     steps:
       - name: Check out code into the Go module directory
@@ -89,7 +60,7 @@ jobs:
       - name: Setup Kind Cluster
         run: |
           kind delete cluster
-          kind create cluster --image kindest/node:${{ matrix.k8s-version }}
+          kind create cluster --image kindest/node:v1.20.7@sha256:688fba5ce6b825be62a7c7fe1415b35da2bdfbb5a69227c499ea4cc0008661ca
           kubectl version
           kubectl cluster-info
 

.github/workflows/release.yml

@@ -8,6 +8,10 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  BUCKET: ${{ secrets.CLI_OSS_BUCKET }}
+  ENDPOINT: ${{ secrets.CLI_OSS_ENDPOINT }}
+  ACCESS_KEY: ${{ secrets.CLI_OSS_ACCESS_KEY }}
+  ACCESS_KEY_SECRET: ${{ secrets.CLI_OSS_ACCESS_KEY_SECRET }}
 
 jobs:
   build:
@@ -104,6 +108,23 @@ jobs:
           name: sha256sums
           path: ./_bin/sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt
           retention-days: 1
+      - name: clear the asset
+        run: |
+          rm -rf ./_bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}
+          mv ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz ./_bin/vela/vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          mv ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip ./_bin/vela/vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+      - name: Install ossutil
+        run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
+      - name: Configure Alibaba Cloud OSSUTIL
+        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
+      - name: sync local to cloud
+        run: ./ossutil --config-file .ossutilconfig sync ./_bin/vela oss://$BUCKET/binary/vela/${{ env.VELA_VERSION }}
+      
+      - name: sync the latest version file
+        run: |
+          echo ${{ env.VELA_VERSION }} > ./latest_version
+          ./ossutil --config-file .ossutilconfig cp -u ./latest_version oss://$BUCKET/binary/vela/latest_version
+
 
   upload-plugin-homebrew:
     needs: build

.github/workflows/unit-test.yml

@@ -58,7 +58,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Install ginkgo
-        run: |
+        run:  |
           sudo apt-get install -y golang-ginkgo-dev
 
       - name: Setup Kind Cluster
@@ -72,7 +72,7 @@ jobs:
           version: 3.1.0
           kubebuilderOnly: false
           kubernetesVersion: v1.21.2
-
+      
       - name: Run Make test
         run: make test
 

OWNERS_ALIASES

@@ -10,7 +10,6 @@ Reviewers:
 - devholic
 - fourierr
 - JooKS-me
-- s4rd1nh4
 
 Approvers:
 - Somefive (Multi-Cluster)

README.md

@@ -45,7 +45,7 @@ Full documentation is available on the [KubeVela website](https://kubevela.io/).
 
 ## Community
 
-- Slack:  [CNCF Slack kubevela channel](https://cloud-native.slack.com/archives/C01BLQ3HTJA) (*English*)
+- Slack:  [CNCF Slack](https://slack.cncf.io/) #kubevela channel (*English*)
 - Gitter: [oam-dev](https://gitter.im/oam-dev/community) (*English*)
 - [DingTalk Group](https://page.dingtalk.com/wow/dingtalk/act/en-home): `23310022` (*Chinese*)
 - Wechat Group (*Chinese*): Broker wechat to add you into the user group.

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

@@ -1,22 +0,0 @@
-/*
-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 common
-
-const (
-	// Group api group name
-	Group = "core.oam.dev"
-)

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

@@ -345,8 +345,6 @@ type WorkflowStatus struct {
 	Mode        WorkflowMode `json:"mode"`
 	Message     string       `json:"message,omitempty"`
 
-	SuspendState string `json:"suspendState,omitempty"`
-
 	Suspend    bool `json:"suspend"`
 	Terminated bool `json:"terminated"`
 	Finished   bool `json:"finished"`
@@ -498,8 +496,6 @@ const (
 	PolicyResourceCreator ResourceCreatorRole = "policy"
 	// WorkflowResourceCreator create the resource in workflow.
 	WorkflowResourceCreator ResourceCreatorRole = "workflow"
-	// DebugResourceCreator create the debug resource.
-	DebugResourceCreator ResourceCreatorRole = "debug"
 )
 
 // OAMObjectReference defines the object reference for an oam resource

apis/core.oam.dev/v1alpha1/garbagecollect_types.go

@@ -33,22 +33,11 @@ type GarbageCollectPolicySpec struct {
 	// outdated resources will be kept until resourcetracker be deleted manually
 	KeepLegacyResource bool `json:"keepLegacyResource,omitempty"`
 
-	// Order defines the order of garbage collect
-	Order GarbageCollectOrder `json:"order,omitempty"`
-
 	// Rules defines list of rules to control gc strategy at resource level
 	// if one resource is controlled by multiple rules, first rule will be used
 	Rules []GarbageCollectPolicyRule `json:"rules,omitempty"`
 }
 
-// GarbageCollectOrder is the order of garbage collect
-type GarbageCollectOrder string
-
-const (
-	// OrderDependency is the order of dependency
-	OrderDependency GarbageCollectOrder = "dependency"
-)
-
 // GarbageCollectPolicyRule defines a single garbage-collect policy rule
 type GarbageCollectPolicyRule struct {
 	Selector GarbageCollectPolicyRuleSelector `json:"selector"`
@@ -56,13 +45,12 @@ type GarbageCollectPolicyRule struct {
 }
 
 // GarbageCollectPolicyRuleSelector select the targets of the rule
-// if both traitTypes, oamTypes and componentTypes are specified, combination logic is OR
+// if both traitTypes and componentTypes are specified, combination logic is OR
 // if one resource is specified with conflict strategies, strategy as component go first.
 type GarbageCollectPolicyRuleSelector struct {
-	CompNames        []string `json:"componentNames"`
-	CompTypes        []string `json:"componentTypes"`
-	OAMResourceTypes []string `json:"oamTypes"`
-	TraitTypes       []string `json:"traitTypes"`
+	CompNames  []string `json:"componentNames"`
+	CompTypes  []string `json:"componentTypes"`
+	TraitTypes []string `json:"traitTypes"`
 }
 
 // GarbageCollectStrategy the strategy for target resource to recycle
@@ -81,11 +69,10 @@ const (
 // FindStrategy find gc strategy for target resource
 func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
 	for _, rule := range in.Rules {
-		var compName, compType, oamType, traitType string
+		var compName, compType, traitType string
 		if labels := manifest.GetLabels(); labels != nil {
 			compName = labels[oam.LabelAppComponent]
 			compType = labels[oam.WorkloadTypeLabel]
-			oamType = labels[oam.LabelOAMResourceType]
 			traitType = labels[oam.TraitTypeLabel]
 		}
 		match := func(src []string, val string) (found bool) {
@@ -96,7 +83,6 @@ func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructu
 		}
 		if match(rule.Selector.CompNames, compName) ||
 			match(rule.Selector.CompTypes, compType) ||
-			match(rule.Selector.OAMResourceTypes, oamType) ||
 			match(rule.Selector.TraitTypes, traitType) {
 			return &rule.Strategy
 		}

apis/core.oam.dev/v1alpha1/garbagecollect_types_test.go

@@ -109,18 +109,6 @@ func TestGarbageCollectPolicySpec_FindStrategy(t *testing.T) {
 			}},
 			expectStrategy: GarbageCollectStrategyNever,
 		},
-		"resource type rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: GarbageCollectPolicyRuleSelector{OAMResourceTypes: []string{"TRAIT"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.LabelOAMResourceType: "TRAIT"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
 	}
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {

apis/core.oam.dev/v1alpha1/policy_types.go

@@ -21,8 +21,6 @@ const (
 	TopologyPolicyType = "topology"
 	// OverridePolicyType refers to the type of override policy
 	OverridePolicyType = "override"
-	// DebugPolicyType refers to the type of debug policy
-	DebugPolicyType = "debug"
 )
 
 // TopologyPolicySpec defines the spec of topology policy

apis/core.oam.dev/v1alpha1/register.go

@@ -19,13 +19,11 @@ package v1alpha1
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Package type metadata.
 const (
-	Group   = common.Group
+	Group   = "core.oam.dev"
 	Version = "v1alpha1"
 )
 

apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go

@@ -291,11 +291,6 @@ func (in *GarbageCollectPolicyRuleSelector) DeepCopyInto(out *GarbageCollectPoli
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
-	if in.OAMResourceTypes != nil {
-		in, out := &in.OAMResourceTypes, &out.OAMResourceTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 	if in.TraitTypes != nil {
 		in, out := &in.TraitTypes, &out.TraitTypes
 		*out = make([]string, len(*in))

apis/core.oam.dev/v1alpha2/register.go

@@ -21,13 +21,11 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Package type metadata.
 const (
-	Group   = common.Group
+	Group   = "core.oam.dev"
 	Version = "v1alpha2"
 )
 

apis/core.oam.dev/v1beta1/policy_definition.go

@@ -43,9 +43,6 @@ type PolicyDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource
 	condition.ConditionedStatus `json:",inline"`
 
-	// ConfigMapRef refer to a ConfigMap which contains OpenAPI V3 JSON schema of Component parameters.
-	ConfigMapRef string `json:"configMapRef,omitempty"`
-
 	// LatestRevision of the component definition
 	// +optional
 	LatestRevision *common.Revision `json:"latestRevision,omitempty"`

apis/core.oam.dev/v1beta1/register.go

@@ -21,13 +21,11 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 )
 
 // Package type metadata.
 const (
-	Group   = common.Group
+	Group   = "core.oam.dev"
 	Version = "v1beta1"
 )
 

apis/core.oam.dev/v1beta1/resourcetracker_types.go

@@ -192,7 +192,7 @@ func (in *ResourceTracker) findMangedResourceIndex(mr ManagedResource) int {
 }
 
 // AddManagedResource add object to managed resources, if exists, update
-func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool, creator common.ResourceCreatorRole) (updated bool) {
+func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool) (updated bool) {
 	gvk := rsc.GetObjectKind().GroupVersionKind()
 	mr := ManagedResource{
 		ClusterObjectReference: common.ClusterObjectReference{
@@ -210,9 +210,6 @@ func (in *ResourceTracker) AddManagedResource(rsc client.Object, metaOnly bool,
 	if !metaOnly {
 		mr.Data = &runtime.RawExtension{Object: rsc}
 	}
-	if creator != "" {
-		mr.ClusterObjectReference.Creator = creator
-	}
 	if idx := in.findMangedResourceIndex(mr); idx >= 0 {
 		if reflect.DeepEqual(in.Spec.ManagedResources[idx], mr) {
 			return false

apis/core.oam.dev/v1beta1/resourcetracker_types_test.go

@@ -156,16 +156,16 @@ func TestResourceTracker_ManagedResource(t *testing.T) {
 	r := require.New(t)
 	input := &ResourceTracker{}
 	deploy1 := v12.Deployment{ObjectMeta: v13.ObjectMeta{Name: "deploy1"}}
-	input.AddManagedResource(&deploy1, true, "")
+	input.AddManagedResource(&deploy1, true)
 	r.Equal(1, len(input.Spec.ManagedResources))
 	cm2 := v1.ConfigMap{ObjectMeta: v13.ObjectMeta{Name: "cm2"}}
-	input.AddManagedResource(&cm2, false, "")
+	input.AddManagedResource(&cm2, false)
 	r.Equal(2, len(input.Spec.ManagedResources))
 	pod3 := v1.Pod{ObjectMeta: v13.ObjectMeta{Name: "pod3"}}
-	input.AddManagedResource(&pod3, false, "")
+	input.AddManagedResource(&pod3, false)
 	r.Equal(3, len(input.Spec.ManagedResources))
 	deploy1.Spec.Replicas = pointer.Int32(5)
-	input.AddManagedResource(&deploy1, false, "")
+	input.AddManagedResource(&deploy1, false)
 	r.Equal(3, len(input.Spec.ManagedResources))
 	input.DeleteManagedResource(&cm2, false)
 	r.Equal(3, len(input.Spec.ManagedResources))

apis/types/types.go

@@ -18,13 +18,6 @@ package types
 
 import "github.com/oam-dev/kubevela/pkg/oam"
 
-const (
-	// KubeVelaName name of kubevela
-	KubeVelaName = "kubevela"
-	// VelaCoreName name of vela-core
-	VelaCoreName = "vela-core"
-)
-
 const (
 	// DefaultKubeVelaReleaseName defines the default name of KubeVela Release
 	DefaultKubeVelaReleaseName = "kubevela"
@@ -157,11 +150,13 @@ const (
 )
 
 const (
-	// TerrfaormComponentPrefix is the prefix of component type of terraform-xxx
-	TerrfaormComponentPrefix = "terraform-"
-)
+	// TerraformComponentPrefix is the prefix of component type of terraform-xxx
+	TerraformComponentPrefix = "terraform-"
 
-const (
-	// ClusterGatewayAccessorGroup the group to impersonate which allows the access to the cluster-gateway
-	ClusterGatewayAccessorGroup = "cluster-gateway-accessor"
+	// ProviderAppPrefix is the prefix of the application to create a Terraform Provider
+	ProviderAppPrefix = "config-terraform-provider"
+	// ProviderNamespace is the namespace of Terraform Cloud Provider
+	ProviderNamespace = "default"
+	// VelaCoreConfig is to mark application, config and its secret or Terraform provider lelong to a KubeVela config
+	VelaCoreConfig = "velacore-config"
 )

charts/vela-core/README.md

@@ -78,22 +78,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `healthCheck.port`          | KubeVela health check port           | `9440`             |
 
 
-### KubeVela controller optimization parameters
-
-| Name                                              | Description                                                                                                                                       | Value   |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `optimize.optimizeCachedGvks`                     | Optimize types of resources to be cached.                                                                                                         | `nil`   |
-| `optimize.resourceTrackerListOp`                  | Optimize ResourceTracker List Op by adding index.                                                                                                 | `true`  |
-| `optimize.controllerReconcileLoopReduction`       | Optimize ApplicationController reconcile by reducing the number of loops to reconcile application.                                                | `false` |
-| `optimize.markWithProb`                           | Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately. | `0.1`   |
-| `optimize.disableComponentRevision`               | Optimize componentRevision by disabling the creation and gc                                                                                       | `false` |
-| `optimize.disableApplicationRevision`             | Optimize ApplicationRevision by disabling the creation and gc.                                                                                    | `false` |
-| `optimize.disableWorkflowRecorder`                | Optimize workflow recorder by disabling the creation and gc.                                                                                      | `false` |
-| `optimize.enableInMemoryWorkflowContext`          | Optimize workflow by use in-memory context.                                                                                                       | `false` |
-| `optimize.disableResourceApplyDoubleCheck`        | Optimize workflow by ignoring resource double check after apply.                                                                                  | `false` |
-| `optimize.enableResourceTrackerDeleteOnlyTrigger` | Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.                                                               | `true`  |
-
-
 ### MultiCluster parameters
 
 | Name                                                  | Description                      | Value                            |
@@ -122,27 +106,23 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 
 ### Common parameters
 
-| Name                          | Description                                                                                                                | Value                |
-| ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -------------------- |
-| `imagePullSecrets`            | Image pull secrets                                                                                                         | `[]`                 |
-| `nameOverride`                | Override name                                                                                                              | `""`                 |
-| `fullnameOverride`            | Fullname override                                                                                                          | `""`                 |
-| `serviceAccount.create`       | Specifies whether a service account should be created                                                                      | `true`               |
-| `serviceAccount.annotations`  | Annotations to add to the service account                                                                                  | `{}`                 |
-| `serviceAccount.name`         | The name of the service account to use. If not set and create is true, a name is generated using the fullname template     | `nil`                |
-| `nodeSelector`                | Node selector                                                                                                              | `{}`                 |
-| `tolerations`                 | Tolerations                                                                                                                | `[]`                 |
-| `affinity`                    | Affinity                                                                                                                   | `{}`                 |
-| `rbac.create`                 | Specifies whether a RBAC role should be created                                                                            | `true`               |
-| `logDebug`                    | Enable debug logs for development purpose                                                                                  | `false`              |
-| `logFilePath`                 | If non-empty, write log files in this path                                                                                 | `""`                 |
-| `logFileMaxSize`              | Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. | `1024`               |
-| `kubeClient.qps`              | The qps for reconcile clients, default is 50                                                                               | `50`                 |
-| `kubeClient.burst`            | The burst for reconcile clients, default is 100                                                                            | `100`                |
-| `authentication.enabled`      | Enable authentication for application                                                                                      | `false`              |
-| `authentication.withUser`     | Application authentication will impersonate as the request User                                                            | `false`              |
-| `authentication.defaultUser`  | Application authentication will impersonate as the User if no user provided in Application                                 | `kubevela:vela-core` |
-| `authentication.groupPattern` | Application authentication will impersonate as the request Group that matches the pattern                                  | `kubevela:*`         |
+| Name                         | Description                                                                                                                | Value   |
+| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `imagePullSecrets`           | Image pull secrets                                                                                                         | `[]`    |
+| `nameOverride`               | Override name                                                                                                              | `""`    |
+| `fullnameOverride`           | Fullname override                                                                                                          | `""`    |
+| `serviceAccount.create`      | Specifies whether a service account should be created                                                                      | `true`  |
+| `serviceAccount.annotations` | Annotations to add to the service account                                                                                  | `{}`    |
+| `serviceAccount.name`        | The name of the service account to use. If not set and create is true, a name is generated using the fullname template     | `nil`   |
+| `nodeSelector`               | Node selector                                                                                                              | `{}`    |
+| `tolerations`                | Tolerations                                                                                                                | `[]`    |
+| `affinity`                   | Affinity                                                                                                                   | `{}`    |
+| `rbac.create`                | Specifies whether a RBAC role should be created                                                                            | `true`  |
+| `logDebug`                   | Enable debug logs for development purpose                                                                                  | `false` |
+| `logFilePath`                | If non-empty, write log files in this path                                                                                 | `""`    |
+| `logFileMaxSize`             | Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. | `1024`  |
+| `kubeClient.qps`             | The qps for reconcile clients, default is 50                                                                               | `50`    |
+| `kubeClient.burst`           | The burst for reconcile clients, default is 100                                                                            | `100`   |
 
 
 ## Uninstallation
@@ -184,4 +164,10 @@ To uninstall the KubeVela helm release:
 $ helm uninstall -n vela-system kubevela
 ```
 
-Finally, this command will remove all the Kubernetes resources associated with KubeVela and remove this chart release.
+Finally, this command will remove all the Kubernetes resources associated with KubeVela and remove this chart release.
+
+
+
+
+
+

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

@@ -934,8 +934,6 @@ spec:
                             type: array
                           suspend:
                             type: boolean
-                          suspendState:
-                            type: string
                           terminated:
                             type: boolean
                         required:
@@ -2745,8 +2743,6 @@ spec:
                             type: array
                           suspend:
                             type: boolean
-                          suspendState:
-                            type: string
                           terminated:
                             type: boolean
                         required:
@@ -3390,10 +3386,6 @@ spec:
                             - type
                             type: object
                           type: array
-                        configMapRef:
-                          description: ConfigMapRef refer to a ConfigMap which contains
-                            OpenAPI V3 JSON schema of Component parameters.
-                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4690,8 +4682,6 @@ spec:
                     type: array
                   suspend:
                     type: boolean
-                  suspendState:
-                    type: string
                   terminated:
                     type: boolean
                 required:

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

@@ -636,10 +636,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      configMapRef:
-                        description: ConfigMapRef refer to a ConfigMap which contains
-                          OpenAPI V3 JSON schema of Component parameters.
-                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -244,10 +244,6 @@ spec:
                   - type
                   type: object
                 type: array
-              configMapRef:
-                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
-                  V3 JSON schema of Component parameters.
-                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

charts/vela-core/templates/admission-webhooks/mutatingWebhookConfiguration.yaml

@@ -120,32 +120,6 @@ webhooks:
           - UPDATE
         resources:
           - podspecworkloads
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1beta1-applications
-    {{- if .Values.admissionWebhooks.patch.enabled }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: mutating.core.oam.dev.v1beta1.applications
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - applications
   - clientConfig:
       caBundle: Cg==
       service:

charts/vela-core/templates/cluster-gateway.yaml

@@ -274,30 +274,4 @@ spec:
         runAsGroup: 2000
         runAsNonRoot: true
         runAsUser: 2000
-{{ end }}
----
-{{ if and .Values.multicluster.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "kubevela.fullname" . }}:cluster-gateway-access-role
-rules:
-  - apiGroups: [ "cluster.core.oam.dev" ]
-    resources: [ "clustergateways/proxy" ]
-    verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
-{{ end }}
----
-{{ if and .Values.multicluster.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "kubevela.fullname" . }}:cluster-gateway-access-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "kubevela.fullname" . }}:cluster-gateway-access-role
-subjects:
-  - kind: Group
-    name: cluster-gateway-accessor
-    apiGroup: rbac.authorization.k8s.io
 {{ end }}

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

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

charts/vela-core/templates/defwithtemplate/config-image-registry.yaml

@@ -36,20 +36,23 @@ spec:
         			"config.oam.dev/sub-type":      "auth"
         		}
         	}
-        	type: "kubernetes.io/dockerconfigjson"
-        	stringData: {
-        		if parameter.auth != _|_ {
-        			".dockerconfigjson": json.Marshal({
-        				auths: "\(parameter.registry)": {
-        					username: parameter.auth.username
-        					password: parameter.auth.password
-        					if parameter.auth.email != _|_ {
-        						email: parameter.auth.email
-        					}
-        					auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        	if parameter.auth != _|_ {
+        		type: "kubernetes.io/dockerconfigjson"
+        	}
+        	if parameter.auth == _|_ {
+        		type: "Opaque"
+        	}
+        	if parameter.auth != _|_ {
+        		stringData: ".dockerconfigjson": json.Marshal({
+        			auths: "\(parameter.registry)": {
+        				username: parameter.auth.username
+        				password: parameter.auth.password
+        				if parameter.auth.email != _|_ {
+        					email: parameter.auth.email
         				}
-        			})
-        		}
+        				auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        			}
+        		})
         	}
         }
         parameter: {

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

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

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

@@ -46,7 +46,7 @@ spec:
         			}]
         		}
         		if _baseEnv != _|_ {
-        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar.value}}
+        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar}}
         			// +patchStrategy=replace
         			env: [ for envVar in _baseEnv if _delKeys[envVar.name] == _|_ && !_params.replace {
         				name: envVar.name
@@ -54,11 +54,15 @@ spec:
         					value: _params.env[envVar.name]
         				}
         				if _params.env[envVar.name] == _|_ {
-        					value: envVar.value
+        					if envVar.value != _|_ {
+        						value: envVar.value
+        					}
+        					if envVar.valueFrom != _|_ {
+        						valueFrom: envVar.valueFrom
+        					}
         				}
         			}] + [ for k, v in _params.env if _delKeys[k] == _|_ && (_params.replace || _baseEnvMap[k] == _|_) {
-        				name:  k
-        				value: v
+        				v
         			}]
         		}
         	}
@@ -92,7 +96,7 @@ spec:
         		}]
         	}
         }
-        parameter: #PatchParams | close({
+        parameter: *#PatchParams | close({
         	// +usage=Specify the environment variables for multiple containers
         	containers: [...#PatchParams]
         })

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

@@ -35,9 +35,6 @@ spec:
         		if parameter.args != _|_ {
         			args: parameter.args
         		}
-        		if parameter["env"] != _|_ {
-        			env: parameter.env
-        		}
 
         		// +patchKey=name
         		volumeMounts: [{
@@ -64,31 +61,6 @@ spec:
         	// +usage=Specify the args run in the init container
         	args?: [...string]
 
-        	// +usage=Specify the env run in the init container
-        	env?: [...{
-        		// +usage=Environment variable name
-        		name: string
-        		// +usage=The value of the environment variable
-        		value?: string
-        		// +usage=Specifies a source the value of this var should come from
-        		valueFrom?: {
-        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
-        				// +usage=The name of the secret in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the secret to select from. Must be a valid secret key
-        				key: string
-        			}
-        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
-        				// +usage=The name of the config map in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the config map to select from. Must be a valid secret key
-        				key: string
-        			}
-        		}
-        	}]
-
         	// +usage=Specify the mount name of shared volume
         	mountName: *"workdir" | string
 

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

@@ -27,9 +27,6 @@ spec:
         		if parameter.args != _|_ {
         			args: parameter.args
         		}
-        		if parameter["env"] != _|_ {
-        			env: parameter.env
-        		}
         		if parameter["volumes"] != _|_ {
         			volumeMounts: [ for v in parameter.volumes {
         				{
@@ -38,13 +35,6 @@ spec:
         				}
         			}]
         		}
-        		if parameter["livenessProbe"] != _|_ {
-        			livenessProbe: parameter.livenessProbe
-        		}
-
-        		if parameter["readinessProbe"] != _|_ {
-        			readinessProbe: parameter.readinessProbe
-        		}
         	}]
         }
         parameter: {
@@ -60,82 +50,10 @@ spec:
         	// +usage=Specify the args in the sidecar
         	args?: [...string]
 
-        	// +usage=Specify the env in the sidecar
-        	env?: [...{
-        		// +usage=Environment variable name
-        		name: string
-        		// +usage=The value of the environment variable
-        		value?: string
-        		// +usage=Specifies a source the value of this var should come from
-        		valueFrom?: {
-        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
-        				// +usage=The name of the secret in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the secret to select from. Must be a valid secret key
-        				key: string
-        			}
-        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
-        				// +usage=The name of the config map in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the config map to select from. Must be a valid secret key
-        				key: string
-        			}
-        		}
-        	}]
-
         	// +usage=Specify the shared volume path
         	volumes?: [...{
         		name: string
         		path: string
         	}]
-
-        	// +usage=Instructions for assessing whether the container is alive.
-        	livenessProbe?: #HealthProbe
-
-        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
-        	readinessProbe?: #HealthProbe
-        }
-        #HealthProbe: {
-
-        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
-        	exec?: {
-        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
-        		command: [...string]
-        	}
-
-        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
-        	httpGet?: {
-        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
-        		path: string
-        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
-        		port: int
-        		httpHeaders?: [...{
-        			name:  string
-        			value: string
-        		}]
-        	}
-
-        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
-        	tcpSocket?: {
-        		// +usage=The TCP socket within the container that should be probed to assess container health.
-        		port: int
-        	}
-
-        	// +usage=Number of seconds after the container is started before the first probe is initiated.
-        	initialDelaySeconds: *0 | int
-
-        	// +usage=How often, in seconds, to execute the probe.
-        	periodSeconds: *10 | int
-
-        	// +usage=Number of seconds after which the probe times out.
-        	timeoutSeconds: *1 | int
-
-        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
-        	successThreshold: *1 | int
-
-        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
-        	failureThreshold: *3 | int
         }
 

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

@@ -87,17 +87,6 @@ spec:
         		}
         	},
         ] | []
-        configMountToEnvsList: *[
-        			for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: configMapKeyRef: {
-        				name: v.name
-        				key:  k.configMapKey
-        			}
-        		}
-        	},
-        ] | []
         secretVolumeMountsList: *[
         			for v in parameter.secret if v.mountPath != _|_ {
         		{
@@ -117,17 +106,6 @@ spec:
         		}
         	},
         ] | []
-        secretMountToEnvsList: *[
-        			for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: secretKeyRef: {
-        				name: v.name
-        				key:  k.secretKey
-        			}
-        		}
-        	},
-        ] | []
         emptyDirVolumeMountsList: *[
         				for v in parameter.emptyDir {
         		{
@@ -150,7 +128,7 @@ spec:
 
         	containers: [{
         		// +patchKey=name
-        		env: configMapEnvMountsList + secretEnvMountsList + configMountToEnvsList + secretMountToEnvsList
+        		env: configMapEnvMountsList + secretEnvMountsList
         		// +patchKey=name
         		volumeDevices: volumeDevicesList
         		// +patchKey=name
@@ -270,10 +248,6 @@ spec:
         			envName:      string
         			configMapKey: string
         		}
-        		mountToEnvs?: [...{
-        			envName:      string
-        			configMapKey: string
-        		}]
         		mountPath?:  string
         		defaultMode: *420 | int
         		readOnly:    *false | bool
@@ -293,10 +267,6 @@ spec:
         			envName:   string
         			secretKey: string
         		}
-        		mountToEnvs?: [...{
-        			envName:   string
-        			secretKey: string
-        		}]
         		mountPath?:  string
         		defaultMode: *420 | int
         		readOnly:    *false | bool

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

@@ -11,8 +11,6 @@ spec:
   schematic:
     cue:
       template: |
-        parameter: {
-        	// +usage=Specify the wait duration time to resume workflow such as "30s", "1min" or "2m15s"
-        	duration?: string
-        }
+        // no parameters
+        parameter: {}
 

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

@@ -132,10 +132,9 @@ spec:
         						parameter.labels
         					}
         					if parameter.addRevisionLabel {
-        						"app.oam.dev/appRevision": context.appRevision
+        						"app.oam.dev/revision": context.revision
         					}
         					"app.oam.dev/component": context.name
-        					"app.oam.dev/revision":  context.revision
         				}
         				if parameter.annotations != _|_ {
         					annotations: parameter.annotations
@@ -333,7 +332,7 @@ spec:
         	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"
 
         	// +ignore
-        	// +usage=If addRevisionLabel is true, the appRevision label will be added to the underlying pods
+        	// +usage=If addRevisionLabel is true, the revision label will be added to the underlying pods
         	addRevisionLabel: *false | bool
 
         	// +usage=Commands to run in the container

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

@@ -25,9 +25,6 @@ subjects:
   - kind: ServiceAccount
     name: {{ include "kubevela.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
-  - kind: Group
-    name: core.oam.dev
-    apiGroup: rbac.authorization.k8s.io
 
 ---
 # permissions to do leader election.
@@ -124,36 +121,6 @@ spec:
             - "--webhook-port={{ .Values.webhookService.port }}"
             - "--webhook-cert-dir={{ .Values.admissionWebhooks.certificate.mountPath }}"
             {{ end }}
-            {{ if ne .Values.optimize.cachedGvks "" }}
-            - "--optimize-cached-gvks={{ .Values.optimize.cachedGvks }}"
-            {{ end }}
-            {{ if not .Values.optimize.resourceTrackerListOp }}
-            - "--optimize-resource-tracker-list-op=false"
-            {{ end }}
-            {{ if .Values.optimize.controllerReconcileLoopReduction }}
-            - "--optimize-controller-reconcile-loop-reduction"
-            {{ end }}
-            {{ if .Values.optimize.markWithProb }}
-            - "--optimize-mark-with-prob={{ .Values.optimize.markWithProb }}"
-            {{ end }}
-            {{ if .Values.optimize.disableComponentRevision }}
-            - "--optimize-disable-component-revision"
-            {{ end }}
-            {{ if .Values.optimize.disableApplicationRevision }}
-            - "--optimize-disable-application-revision"
-            {{ end }}
-            {{ if .Values.optimize.disableWorkflowRecorder }}
-            - "--optimize-disable-workflow-recorder"
-            {{ end }}
-            {{ if .Values.optimize.enableInMemoryWorkflowContext }}
-            - "--optimize-enable-in-memory-workflow-context"
-            {{ end }}
-            {{ if .Values.optimize.disableResourceApplyDoubleCheck }}
-            - "--optimize-disable-resource-apply-double-check"
-            {{ end }}
-            {{ if not .Values.optimize.enableResourceTrackerDeleteOnlyTrigger }}
-            - "--optimize-enable-resource-tracker-delete-only-trigger=false"
-            {{ end }}
             - "--health-addr=:{{ .Values.healthCheck.port }}"
             {{ if ne .Values.disableCaps "" }}
             - "--disable-caps={{ .Values.disableCaps }}"
@@ -172,14 +139,6 @@ spec:
             - "--max-workflow-wait-backoff-time={{ .Values.workflow.backoff.maxTime.waitState }}"
             - "--max-workflow-failed-backoff-time={{ .Values.workflow.backoff.maxTime.failedState }}"
             - "--max-workflow-step-error-retry-times={{ .Values.workflow.step.errorRetryTimes }}"
-            - "--feature-gates=AuthenticateApplication={{- .Values.authentication.enabled | toString -}}"
-            {{ if .Values.authentication.enabled }}
-            {{ if .Values.authentication.withUser }}
-            - "--authentication-with-user"
-            {{ end }}
-            - "--authentication-default-user={{ .Values.authentication.defaultUser }}"
-            - "--authentication-group-pattern={{ .Values.authentication.groupPattern }}"
-            {{ end }}
           image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:
@@ -227,4 +186,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
     {{- toYaml . | nindent 8 }}
-  {{- end }}
+  {{- end }}

charts/vela-core/values.yaml

@@ -84,28 +84,6 @@ webhookService:
 healthCheck:
   port: 9440
 
-## @section KubeVela controller optimization parameters
-##@param optimize.optimizeCachedGvks Optimize types of resources to be cached.
-##@param optimize.resourceTrackerListOp Optimize ResourceTracker List Op by adding index.
-##@param optimize.controllerReconcileLoopReduction Optimize ApplicationController reconcile by reducing the number of loops to reconcile application.
-##@param optimize.markWithProb Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately.
-##@param optimize.disableComponentRevision Optimize componentRevision by disabling the creation and gc
-##@param optimize.disableApplicationRevision Optimize ApplicationRevision by disabling the creation and gc.
-##@param optimize.disableWorkflowRecorder Optimize workflow recorder by disabling the creation and gc.
-##@param optimize.enableInMemoryWorkflowContext Optimize workflow by use in-memory context.
-##@param optimize.disableResourceApplyDoubleCheck Optimize workflow by ignoring resource double check after apply.
-##@param optimize.enableResourceTrackerDeleteOnlyTrigger Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.
-optimize:
-  optimizeCachedGvks:
-  resourceTrackerListOp: true
-  controllerReconcileLoopReduction: false
-  markWithProb: 0.1
-  disableComponentRevision: false
-  disableApplicationRevision: false
-  disableWorkflowRecorder: false
-  enableInMemoryWorkflowContext: false
-  disableResourceApplyDoubleCheck: false
-  enableResourceTrackerDeleteOnlyTrigger: true
 
 ## @section MultiCluster parameters
 
@@ -232,13 +210,3 @@ admissionWebhooks:
 kubeClient:
   qps: 50
   burst: 100
-
-## @param authentication.enabled Enable authentication for application
-## @param authentication.withUser Application authentication will impersonate as the request User
-## @param authentication.defaultUser Application authentication will impersonate as the User if no user provided in Application
-## @param authentication.groupPattern Application authentication will impersonate as the request Group that matches the pattern
-authentication:
-  enabled: false
-  withUser: false
-  defaultUser: kubevela:vela-core
-  groupPattern: kubevela:*

charts/vela-minimal/README.md

@@ -125,26 +125,22 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 
 ### Common parameters
 
-| Name                          | Description                                                                                                                | Value                |
-| ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -------------------- |
-| `imagePullSecrets`            | Image pull secrets                                                                                                         | `[]`                 |
-| `nameOverride`                | Override name                                                                                                              | `""`                 |
-| `fullnameOverride`            | Fullname override                                                                                                          | `""`                 |
-| `serviceAccount.create`       | Specifies whether a service account should be created                                                                      | `true`               |
-| `serviceAccount.annotations`  | Annotations to add to the service account                                                                                  | `{}`                 |
-| `serviceAccount.name`         | The name of the service account to use. If not set and create is true, a name is generated using the fullname template     | `nil`                |
-| `nodeSelector`                | Node selector                                                                                                              | `{}`                 |
-| `tolerations`                 | Tolerations                                                                                                                | `[]`                 |
-| `affinity`                    | Affinity                                                                                                                   | `{}`                 |
-| `rbac.create`                 | Specifies whether a RBAC role should be created                                                                            | `true`               |
-| `logDebug`                    | Enable debug logs for development purpose                                                                                  | `false`              |
-| `logFilePath`                 | If non-empty, write log files in this path                                                                                 | `""`                 |
-| `logFileMaxSize`              | Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. | `1024`               |
-| `kubeClient.qps`              | The qps for reconcile clients, default is 50                                                                               | `50`                 |
-| `kubeClient.burst`            | The burst for reconcile clients, default is 100                                                                            | `100`                |
-| `authentication.enabled`      | Enable authentication for application                                                                                      | `false`              |
-| `authentication.withUser`     | Application authentication will impersonate as the request User                                                            | `false`              |
-| `authentication.defaultUser`  | Application authentication will impersonate as the User if no user provided in Application                                 | `kubevela:vela-core` |
-| `authentication.groupPattern` | Application authentication will impersonate as the request Group that matches the pattern                                  | `kubevela:*`         |
+| Name                         | Description                                                                                                                | Value   |
+| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `imagePullSecrets`           | Image pull secrets                                                                                                         | `[]`    |
+| `nameOverride`               | Override name                                                                                                              | `""`    |
+| `fullnameOverride`           | Fullname override                                                                                                          | `""`    |
+| `serviceAccount.create`      | Specifies whether a service account should be created                                                                      | `true`  |
+| `serviceAccount.annotations` | Annotations to add to the service account                                                                                  | `{}`    |
+| `serviceAccount.name`        | The name of the service account to use. If not set and create is true, a name is generated using the fullname template     | `nil`   |
+| `nodeSelector`               | Node selector                                                                                                              | `{}`    |
+| `tolerations`                | Tolerations                                                                                                                | `[]`    |
+| `affinity`                   | Affinity                                                                                                                   | `{}`    |
+| `rbac.create`                | Specifies whether a RBAC role should be created                                                                            | `true`  |
+| `logDebug`                   | Enable debug logs for development purpose                                                                                  | `false` |
+| `logFilePath`                | If non-empty, write log files in this path                                                                                 | `""`    |
+| `logFileMaxSize`             | Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. | `1024`  |
+| `kubeClient.qps`             | The qps for reconcile clients, default is 50                                                                               | `50`    |
+| `kubeClient.burst`           | The burst for reconcile clients, default is 100                                                                            | `100`   |
 
 

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

@@ -934,8 +934,6 @@ spec:
                             type: array
                           suspend:
                             type: boolean
-                          suspendState:
-                            type: string
                           terminated:
                             type: boolean
                         required:
@@ -2745,8 +2743,6 @@ spec:
                             type: array
                           suspend:
                             type: boolean
-                          suspendState:
-                            type: string
                           terminated:
                             type: boolean
                         required:
@@ -3390,10 +3386,6 @@ spec:
                             - type
                             type: object
                           type: array
-                        configMapRef:
-                          description: ConfigMapRef refer to a ConfigMap which contains
-                            OpenAPI V3 JSON schema of Component parameters.
-                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4690,8 +4682,6 @@ spec:
                     type: array
                   suspend:
                     type: boolean
-                  suspendState:
-                    type: string
                   terminated:
                     type: boolean
                 required:

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

@@ -636,10 +636,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      configMapRef:
-                        description: ConfigMapRef refer to a ConfigMap which contains
-                          OpenAPI V3 JSON schema of Component parameters.
-                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -244,10 +244,6 @@ spec:
                   - type
                   type: object
                 type: array
-              configMapRef:
-                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
-                  V3 JSON schema of Component parameters.
-                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

charts/vela-minimal/templates/admission-webhooks/mutatingWebhookConfiguration.yaml

@@ -92,32 +92,6 @@ webhooks:
           - UPDATE
         resources:
           - podspecworkloads
-  - clientConfig:
-      caBundle: Cg==
-      service:
-        name: {{ template "kubevela.name" . }}-webhook
-        namespace: {{ .Release.Namespace }}
-        path: /mutating-core-oam-dev-v1beta1-applications
-    {{- if .Values.admissionWebhooks.patch.enabled }}
-    failurePolicy: Ignore
-    {{- else }}
-    failurePolicy: Fail
-    {{- end }}
-    name: mutating.core.oam.dev.v1beta1.applications
-    admissionReviewVersions:
-      - v1beta1
-      - v1
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - core.oam.dev
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - applications
   - clientConfig:
       caBundle: Cg==
       service:

charts/vela-minimal/templates/cluster-gateway.yaml

@@ -188,30 +188,4 @@ spec:
         runAsGroup: 2000
         runAsNonRoot: true
         runAsUser: 2000
-  {{ end }}
----
-{{ if and .Values.multicluster.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "kubevela.fullname" . }}:cluster-gateway-access-role
-rules:
-  - apiGroups: [ "cluster.core.oam.dev" ]
-    resources: [ "clustergateways/proxy" ]
-    verbs: [ "get", "list", "watch", "create", "update", "patch", "delete" ]
-{{ end }}
----
-{{ if and .Values.multicluster.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "kubevela.fullname" . }}:cluster-gateway-access-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "kubevela.fullname" . }}:cluster-gateway-access-role
-subjects:
-  - kind: Group
-    name: cluster-gateway-accessor
-    apiGroup: rbac.authorization.k8s.io
-{{ end }}
+  {{ end }}

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

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

charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml

@@ -36,20 +36,23 @@ spec:
         			"config.oam.dev/sub-type":      "auth"
         		}
         	}
-        	type: "kubernetes.io/dockerconfigjson"
-        	stringData: {
-        		if parameter.auth != _|_ {
-        			".dockerconfigjson": json.Marshal({
-        				auths: "\(parameter.registry)": {
-        					username: parameter.auth.username
-        					password: parameter.auth.password
-        					if parameter.auth.email != _|_ {
-        						email: parameter.auth.email
-        					}
-        					auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        	if parameter.auth != _|_ {
+        		type: "kubernetes.io/dockerconfigjson"
+        	}
+        	if parameter.auth == _|_ {
+        		type: "Opaque"
+        	}
+        	if parameter.auth != _|_ {
+        		stringData: ".dockerconfigjson": json.Marshal({
+        			auths: "\(parameter.registry)": {
+        				username: parameter.auth.username
+        				password: parameter.auth.password
+        				if parameter.auth.email != _|_ {
+        					email: parameter.auth.email
         				}
-        			})
-        		}
+        				auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
+        			}
+        		})
         	}
         }
         parameter: {

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

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

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

@@ -46,7 +46,7 @@ spec:
         			}]
         		}
         		if _baseEnv != _|_ {
-        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar.value}}
+        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar}}
         			// +patchStrategy=replace
         			env: [ for envVar in _baseEnv if _delKeys[envVar.name] == _|_ && !_params.replace {
         				name: envVar.name
@@ -54,11 +54,15 @@ spec:
         					value: _params.env[envVar.name]
         				}
         				if _params.env[envVar.name] == _|_ {
-        					value: envVar.value
+        					if envVar.value != _|_ {
+        						value: envVar.value
+        					}
+        					if envVar.valueFrom != _|_ {
+        						valueFrom: envVar.valueFrom
+        					}
         				}
         			}] + [ for k, v in _params.env if _delKeys[k] == _|_ && (_params.replace || _baseEnvMap[k] == _|_) {
-        				name:  k
-        				value: v
+        				v
         			}]
         		}
         	}
@@ -92,7 +96,7 @@ spec:
         		}]
         	}
         }
-        parameter: #PatchParams | close({
+        parameter: *#PatchParams | close({
         	// +usage=Specify the environment variables for multiple containers
         	containers: [...#PatchParams]
         })

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

@@ -35,9 +35,6 @@ spec:
         		if parameter.args != _|_ {
         			args: parameter.args
         		}
-        		if parameter["env"] != _|_ {
-        			env: parameter.env
-        		}
 
         		// +patchKey=name
         		volumeMounts: [{
@@ -64,31 +61,6 @@ spec:
         	// +usage=Specify the args run in the init container
         	args?: [...string]
 
-        	// +usage=Specify the env run in the init container
-        	env?: [...{
-        		// +usage=Environment variable name
-        		name: string
-        		// +usage=The value of the environment variable
-        		value?: string
-        		// +usage=Specifies a source the value of this var should come from
-        		valueFrom?: {
-        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
-        				// +usage=The name of the secret in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the secret to select from. Must be a valid secret key
-        				key: string
-        			}
-        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
-        				// +usage=The name of the config map in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the config map to select from. Must be a valid secret key
-        				key: string
-        			}
-        		}
-        	}]
-
         	// +usage=Specify the mount name of shared volume
         	mountName: *"workdir" | string
 

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

@@ -27,9 +27,6 @@ spec:
         		if parameter.args != _|_ {
         			args: parameter.args
         		}
-        		if parameter["env"] != _|_ {
-        			env: parameter.env
-        		}
         		if parameter["volumes"] != _|_ {
         			volumeMounts: [ for v in parameter.volumes {
         				{
@@ -38,13 +35,6 @@ spec:
         				}
         			}]
         		}
-        		if parameter["livenessProbe"] != _|_ {
-        			livenessProbe: parameter.livenessProbe
-        		}
-
-        		if parameter["readinessProbe"] != _|_ {
-        			readinessProbe: parameter.readinessProbe
-        		}
         	}]
         }
         parameter: {
@@ -60,82 +50,10 @@ spec:
         	// +usage=Specify the args in the sidecar
         	args?: [...string]
 
-        	// +usage=Specify the env in the sidecar
-        	env?: [...{
-        		// +usage=Environment variable name
-        		name: string
-        		// +usage=The value of the environment variable
-        		value?: string
-        		// +usage=Specifies a source the value of this var should come from
-        		valueFrom?: {
-        			// +usage=Selects a key of a secret in the pod's namespace
-        			secretKeyRef?: {
-        				// +usage=The name of the secret in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the secret to select from. Must be a valid secret key
-        				key: string
-        			}
-        			// +usage=Selects a key of a config map in the pod's namespace
-        			configMapKeyRef?: {
-        				// +usage=The name of the config map in the pod's namespace to select from
-        				name: string
-        				// +usage=The key of the config map to select from. Must be a valid secret key
-        				key: string
-        			}
-        		}
-        	}]
-
         	// +usage=Specify the shared volume path
         	volumes?: [...{
         		name: string
         		path: string
         	}]
-
-        	// +usage=Instructions for assessing whether the container is alive.
-        	livenessProbe?: #HealthProbe
-
-        	// +usage=Instructions for assessing whether the container is in a suitable state to serve traffic.
-        	readinessProbe?: #HealthProbe
-        }
-        #HealthProbe: {
-
-        	// +usage=Instructions for assessing container health by executing a command. Either this attribute or the httpGet attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the httpGet attribute and the tcpSocket attribute.
-        	exec?: {
-        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
-        		command: [...string]
-        	}
-
-        	// +usage=Instructions for assessing container health by executing an HTTP GET request. Either this attribute or the exec attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the tcpSocket attribute.
-        	httpGet?: {
-        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
-        		path: string
-        		// +usage=The TCP socket within the container to which the HTTP GET request should be directed.
-        		port: int
-        		httpHeaders?: [...{
-        			name:  string
-        			value: string
-        		}]
-        	}
-
-        	// +usage=Instructions for assessing container health by probing a TCP socket. Either this attribute or the exec attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with both the exec attribute and the httpGet attribute.
-        	tcpSocket?: {
-        		// +usage=The TCP socket within the container that should be probed to assess container health.
-        		port: int
-        	}
-
-        	// +usage=Number of seconds after the container is started before the first probe is initiated.
-        	initialDelaySeconds: *0 | int
-
-        	// +usage=How often, in seconds, to execute the probe.
-        	periodSeconds: *10 | int
-
-        	// +usage=Number of seconds after which the probe times out.
-        	timeoutSeconds: *1 | int
-
-        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.
-        	successThreshold: *1 | int
-
-        	// +usage=Number of consecutive failures required to determine the container is not alive (liveness probe) or not ready (readiness probe).
-        	failureThreshold: *3 | int
         }
 

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

@@ -87,17 +87,6 @@ spec:
         		}
         	},
         ] | []
-        configMountToEnvsList: *[
-        			for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: configMapKeyRef: {
-        				name: v.name
-        				key:  k.configMapKey
-        			}
-        		}
-        	},
-        ] | []
         secretVolumeMountsList: *[
         			for v in parameter.secret if v.mountPath != _|_ {
         		{
@@ -117,17 +106,6 @@ spec:
         		}
         	},
         ] | []
-        secretMountToEnvsList: *[
-        			for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: secretKeyRef: {
-        				name: v.name
-        				key:  k.secretKey
-        			}
-        		}
-        	},
-        ] | []
         emptyDirVolumeMountsList: *[
         				for v in parameter.emptyDir {
         		{
@@ -150,7 +128,7 @@ spec:
 
         	containers: [{
         		// +patchKey=name
-        		env: configMapEnvMountsList + secretEnvMountsList + configMountToEnvsList + secretMountToEnvsList
+        		env: configMapEnvMountsList + secretEnvMountsList
         		// +patchKey=name
         		volumeDevices: volumeDevicesList
         		// +patchKey=name
@@ -270,10 +248,6 @@ spec:
         			envName:      string
         			configMapKey: string
         		}
-        		mountToEnvs?: [...{
-        			envName:      string
-        			configMapKey: string
-        		}]
         		mountPath?:  string
         		defaultMode: *420 | int
         		readOnly:    *false | bool
@@ -293,10 +267,6 @@ spec:
         			envName:   string
         			secretKey: string
         		}
-        		mountToEnvs?: [...{
-        			envName:   string
-        			secretKey: string
-        		}]
         		mountPath?:  string
         		defaultMode: *420 | int
         		readOnly:    *false | bool

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

@@ -11,8 +11,6 @@ spec:
   schematic:
     cue:
       template: |
-        parameter: {
-        	// +usage=Specify the wait duration time to resume workflow such as "30s", "1min" or "2m15s"
-        	duration?: string
-        }
+        // no parameters
+        parameter: {}
 

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

@@ -132,10 +132,9 @@ spec:
         						parameter.labels
         					}
         					if parameter.addRevisionLabel {
-        						"app.oam.dev/appRevision": context.appRevision
+        						"app.oam.dev/revision": context.revision
         					}
         					"app.oam.dev/component": context.name
-        					"app.oam.dev/revision":  context.revision
         				}
         				if parameter.annotations != _|_ {
         					annotations: parameter.annotations
@@ -333,7 +332,7 @@ spec:
         	exposeType: *"ClusterIP" | "NodePort" | "LoadBalancer" | "ExternalName"
 
         	// +ignore
-        	// +usage=If addRevisionLabel is true, the appRevision label will be added to the underlying pods
+        	// +usage=If addRevisionLabel is true, the revision label will be added to the underlying pods
         	addRevisionLabel: *false | bool
 
         	// +usage=Commands to run in the container

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

@@ -27,9 +27,6 @@ subjects:
   - kind: ServiceAccount
     name: {{ include "kubevela.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
-  - kind: Group
-    name: core.oam.dev
-    apiGroup: rbac.authorization.k8s.io
 
 ---
 # permissions to do leader election.
@@ -145,14 +142,6 @@ spec:
             - "--max-workflow-wait-backoff-time={{ .Values.workflow.backoff.maxTime.waitState }}"
             - "--max-workflow-failed-backoff-time={{ .Values.workflow.backoff.maxTime.failedState }}"
             - "--max-workflow-step-error-retry-times={{ .Values.workflow.step.errorRetryTimes }}"
-            - "--feature-gates=AuthenticateApplication={{- .Values.authentication.enabled | toString -}}"
-            {{ if .Values.authentication.enabled }}
-            {{ if .Values.authentication.withUser }}
-            - "--authentication-with-user"
-            {{ end }}
-            - "--authentication-default-user={{ .Values.authentication.defaultUser }}"
-            - "--authentication-group-pattern={{ .Values.authentication.groupPattern }}"
-            {{ end }}
           image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ quote .Values.image.pullPolicy }}
           resources:

charts/vela-minimal/values.yaml

@@ -215,13 +215,3 @@ admissionWebhooks:
 kubeClient:
   qps: 50
   burst: 100
-
-## @param authentication.enabled Enable authentication for application
-## @param authentication.withUser Application authentication will impersonate as the request User
-## @param authentication.defaultUser Application authentication will impersonate as the User if no user provided in Application
-## @param authentication.groupPattern Application authentication will impersonate as the request Group that matches the pattern
-authentication:
-  enabled: false
-  withUser: false
-  defaultUser: kubevela:vela-core
-  groupPattern: kubevela:*

cmd/apiserver/main.go

@@ -46,7 +46,6 @@ func main() {
 	flag.StringVar(&s.restCfg.LeaderConfig.LockName, "lock-name", "apiserver-lock", "the lease lock resource name")
 	flag.DurationVar(&s.restCfg.LeaderConfig.Duration, "duration", time.Second*5, "the lease lock resource name")
 	flag.DurationVar(&s.restCfg.AddonCacheTime, "addon-cache-duration", time.Minute*10, "how long between two addon cache operation")
-	flag.BoolVar(&s.restCfg.DisableStatisticCronJob, "disable-statistic-cronJob", false, "close the system statistic info calculating cronJob")
 	flag.Parse()
 
 	if len(os.Args) > 2 && os.Args[1] == "build-swagger" {

cmd/core/main.go

@@ -36,8 +36,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 
-	apicommon "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/auth"
 	ctrlClient "github.com/oam-dev/kubevela/pkg/client"
 	standardcontroller "github.com/oam-dev/kubevela/pkg/controller"
@@ -52,7 +50,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/oam"
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
 	"github.com/oam-dev/kubevela/pkg/resourcekeeper"
-	pkgutils "github.com/oam-dev/kubevela/pkg/utils"
 	"github.com/oam-dev/kubevela/pkg/utils/common"
 	"github.com/oam-dev/kubevela/pkg/utils/system"
 	"github.com/oam-dev/kubevela/pkg/utils/util"
@@ -62,6 +59,10 @@ import (
 	"github.com/oam-dev/kubevela/version"
 )
 
+const (
+	kubevelaName = "kubevela"
+)
+
 var (
 	scheme             = common.Scheme
 	waitSecretTimeout  = 90 * time.Second
@@ -201,22 +202,10 @@ func main() {
 	klog.InfoS("Vela-Core init", "definition namespace", oam.SystemDefinitonNamespace)
 
 	restConfig := ctrl.GetConfigOrDie()
-	restConfig.UserAgent = types.KubeVelaName + "/" + version.GitRevision
+	restConfig.UserAgent = kubevelaName + "/" + version.GitRevision
 	restConfig.QPS = float32(qps)
 	restConfig.Burst = burst
 	restConfig.Wrap(auth.NewImpersonatingRoundTripper)
-	restConfig.Impersonate.UserName = types.VelaCoreName
-	if sub := pkgutils.GetServiceAccountSubjectFromConfig(restConfig); sub != "" {
-		restConfig.Impersonate.UserName = sub
-	}
-	restConfig.Impersonate.Groups = []string{apicommon.Group}
-	klog.InfoS("Kubernetes Config Loaded",
-		"UserAgent", restConfig.UserAgent,
-		"QPS", restConfig.QPS,
-		"Burst", restConfig.Burst,
-		"Impersonate-User", restConfig.Impersonate.UserName,
-		"Impersonate-Group", strings.Join(restConfig.Impersonate.Groups, ","),
-	)
 
 	// wrapper the round tripper by multi cluster rewriter
 	if enableClusterGateway {
@@ -236,7 +225,7 @@ func main() {
 	}
 	ctrl.SetLogger(klogr.New())
 
-	leaderElectionID := util.GenerateLeaderElectionID(types.KubeVelaName, controllerArgs.IgnoreAppWithoutControllerRequirement)
+	leaderElectionID := util.GenerateLeaderElectionID(kubevelaName, controllerArgs.IgnoreAppWithoutControllerRequirement)
 	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsAddr,

docs/examples/app-with-policy/gc-policy/persist-resources.md

@@ -2,8 +2,6 @@
 
 By leveraging the garbage-collect policy, users can persist some resources, which skip the normal garbage-collect process when application is updated.
 
-### traitTypes
-
 Take the following app as an example, in the garbage-collect policy, a rule is added which marks all the resources created by the `expose` trait to use the `onAppDelete` strategy. This will keep those services until application is deleted.
 ```shell
 $ cat <<EOF | kubectl apply -f -
@@ -80,8 +78,6 @@ hello-world       ClusterIP   10.96.160.208   <none>        8000/TCP   5m56s
 hello-world-new   ClusterIP   10.96.20.4      <none>        8000/TCP   13s
 ```
 
-### componentTypes
-
 Users can also keep component if they are deploying job-like components. Resources dispatched by `job-like-component` type component will be kept after application is deleted.
 
 ```yaml
@@ -104,8 +100,6 @@ spec:
             strategy: never
 ```
 
-### componentNames
-
 A more straightforward way is to specify `compNames` to match specified components.
 ```yaml
 apiVersion: core.oam.dev/v1beta1
@@ -130,74 +124,3 @@ spec:
                 - example-addon-namespace
             strategy: never
 ```
-
-### oamTypes
-
-Users can also persist resources using `oamTypes`, where the values of `oamTypes` can be `TRAIT` and `WORKLOAD`.
-
-```shell
-$ cat <<EOF | kubectl apply -f -
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: garbage-collect-app
-spec:
-  components:
-    - name: hello-world
-      type: webservice
-      properties:
-        image: crccheck/hello-world
-      traits:
-        - type: expose
-          properties:
-            port: [8000]
-  policies:
-    - name: garbage-collect
-      type: garbage-collect
-      properties:
-        rules:
-          - selector:
-              oamTypes:
-                - TRAIT
-            strategy: onAppDelete
-EOF
-```
-
-And then, let's modify the component name.
-
-```shell
-$ cat <<EOF | kubectl apply -f -
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: garbage-collect-app
-spec:
-  components:
-    - name: hello-world-new
-      type: webservice
-      properties:
-        image: crccheck/hello-world
-      traits:
-        - type: expose
-          properties:
-            port: [8000]
-  policies:
-    - name: garbage-collect
-      type: garbage-collect
-      properties:
-        rules:
-          - selector:
-              oamTypes:
-                - TRAIT
-            strategy: onAppDelete
-EOF
-```
-
-List the service in cluster, you will find:
-
-```shell
-$ kubectl get service
-NAME              TYPE        CLUSTER-IP     EXTERNAL-IP   PORT(S)    AGE
-hello-world       ClusterIP   10.96.31.209   <none>        8000/TCP   31s
-hello-world-new   ClusterIP   10.96.17.103   <none>        8000/TCP   5s
-```

docs/examples/app-with-policy/gc-policy/reverse-dependency.md

@@ -1,50 +0,0 @@
-# How to garbage collect resources in the order of dependency
-
-If you want to garbage collect resources in the order of dependency, you can add `order: dependency` in the `garbage-collect` policy.
-
-> Notice that this order policy is only valid for the resources that are created in the components.
-
-In the following example, component `test1` depends on `test2`, and `test2` need the output from `test3`.
-
-So the order of deployment is: `test3 -> test2 -> test1`.
-
-When we add `order: dependency` in `garbage-collect` policy and delete the application, the order of garbage collect is: `test3 -> test2 -> test1`.
-
-```yaml
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  name: gc-dependency
-  namespace: default
-spec:
-  components:
-  - name: test1
-    type: webservice
-    properties:
-      image: crccheck/hello-world
-      port: 8000
-    dependsOn:
-      - "test2"
-  - name: test2
-    type: webservice
-    properties:
-      image: crccheck/hello-world
-      port: 8000
-    inputs:
-      - from: test3-output
-        parameterKey: test
-  - name: test3
-    type: webservice
-    properties:
-      image: crccheck/hello-world
-      port: 8000
-    outputs:
-      - name: test3-output
-        valueFrom: output.metadata.name
-  
-  policies:
-    - name: gc-dependency
-      type: garbage-collect
-      properties:
-        order: dependency
-```

docs/examples/core-definitions/trait/storage.yaml

@@ -32,9 +32,6 @@ spec:
                 mountToEnv:
                   envName: TEST_ENV
                   configMapKey: key1
-                mountToEnvs:
-                  - envName: TEST_CM_ENV
-                    configMapKey: key2
                 data:
                   key1: value1
                   key2: value2
@@ -52,15 +49,9 @@ spec:
                 mountToEnv:
                   envName: TEST_SECRET
                   secretKey: key1
-                mountToEnvs:
-                  - envName: TEST_SECRET_ENV_2
-                    secretKey: key2
-                  - envName: TEST_SECRET_ENV_3
-                    secretKey: key3
                 data:
                   key1: dmFsdWUx
                   key2: dmFsdWUy
-                  key3: dmFsdWUz
             emptyDir:
               - name: test1
                 mountPath: /test/mount/emptydir

go.mod

@@ -5,7 +5,6 @@ go 1.17
 require (
 	cuelang.org/go v0.2.2
 	github.com/AlecAivazis/survey/v2 v2.1.1
-	github.com/FogDong/uitable v0.0.5
 	github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8
 	github.com/agiledragon/gomonkey/v2 v2.4.0
 	github.com/alibabacloud-go/cs-20151215/v2 v2.4.5
@@ -64,10 +63,11 @@ require (
 	github.com/wonderflow/cert-manager-api v1.0.3
 	go.mongodb.org/mongo-driver v1.5.1
 	go.uber.org/zap v1.18.1
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
-	golang.org/x/tools v0.1.7 // indirect
+	golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/src-d/go-git.v4 v4.13.1
@@ -97,17 +97,7 @@ require (
 	sigs.k8s.io/yaml v1.2.0
 )
 
-require (
-	github.com/docker/distribution v2.8.1+incompatible // indirect
-	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/xanzy/go-gitlab v0.60.0
-	github.com/xanzy/ssh-agent v0.3.0 // indirect
-	golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
-	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
-)
+require github.com/robfig/cron/v3 v3.0.1
 
 require (
 	cloud.google.com/go v0.81.0 // indirect
@@ -118,7 +108,7 @@ require (
 	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.3.1 // indirect
+	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
@@ -152,7 +142,8 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/deislabs/oras v0.11.1 // indirect
 	github.com/docker/cli v20.10.5+incompatible // indirect
-	github.com/docker/docker v20.10.14+incompatible // indirect
+	github.com/docker/distribution v2.8.0-beta.1+incompatible // indirect
+	github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.6.3 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect
@@ -163,7 +154,7 @@ require (
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.1.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
-	github.com/fatih/camelcase v1.0.0
+	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-errors/errors v1.0.1 // indirect
 	github.com/go-logr/zapr v0.4.0 // indirect
@@ -180,7 +171,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/btree v1.0.1 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
@@ -195,6 +186,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/klauspost/compress v1.11.0 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
 	github.com/kr/pty v1.1.8 // indirect
@@ -232,7 +224,6 @@ require (
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.26.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
 	github.com/russross/blackfriday v1.5.2 // indirect
@@ -246,6 +237,7 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.3.2 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.0.2 // indirect
 	github.com/xdg-go/stringprep v1.0.2 // indirect
@@ -259,15 +251,17 @@ require (
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
 	google.golang.org/grpc v1.38.0 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/gorp.v1 v1.7.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect

go.sum

@@ -110,16 +110,15 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
+github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
-github.com/FogDong/uitable v0.0.5 h1:1bJo/uvhGUC6i8JPHZCr8XKMHiDExE7mQkOCmDl0ryQ=
-github.com/FogDong/uitable v0.0.5/go.mod h1:1yEaP13SkkBUj3HvqKIUWnsb42XigyZbNle84mc5kLM=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
@@ -411,8 +410,8 @@ github.com/docker/cli v20.10.9+incompatible h1:OJ7YkwQA+k2Oi51lmCojpjiygKpi76P7b
 github.com/docker/cli v20.10.9+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
-github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.8.0-beta.1+incompatible h1:9MjVa+OTMHm4C0kKZB68jPlDM9Cg75ta4i46Gxxxn8o=
+github.com/docker/distribution v2.8.0-beta.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -783,9 +782,8 @@ github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II=
 github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -898,12 +896,8 @@ github.com/hashicorp/consul/sdk v0.4.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPA
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v0.12.2 h1:F1fdYblUEsxKiailtkhCCG2g4bipEgaHiDc8vffNpD4=
 github.com/hashicorp/go-hclog v0.12.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -913,9 +907,6 @@ github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.6.8/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4=
-github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
@@ -1630,8 +1621,6 @@ github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgq
 github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/wonderflow/cert-manager-api v1.0.3 h1:xQQMkJNQ12oYyy00jOQUlSKgdraApaURxv3PHFdVTfA=
 github.com/wonderflow/cert-manager-api v1.0.3/go.mod h1:1Se7MSg11/eNYlo4fWv6vOM55/jTBMOzg2DN1kVFiSc=
-github.com/xanzy/go-gitlab v0.60.0 h1:HaIlc14k4t9eJjAhY0Gmq2fBHgKd1MthBn3+vzDtsbA=
-github.com/xanzy/go-gitlab v0.60.0/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
@@ -1668,7 +1657,7 @@ github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE=
@@ -1810,8 +1799,9 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1855,8 +1845,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1921,13 +1912,11 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc=
-golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2064,7 +2053,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -2095,9 +2084,8 @@ golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs=
-golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -2221,8 +2209,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
-golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a h1:ofrrl6c6NG5/IOSx/R1cyiQxxjqlur0h/TvbUhkH0II=
+golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2267,7 +2255,6 @@ google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk
 google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
@@ -2376,9 +2363,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=

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

@@ -934,8 +934,6 @@ spec:
                             type: array
                           suspend:
                             type: boolean
-                          suspendState:
-                            type: string
                           terminated:
                             type: boolean
                         required:
@@ -2745,8 +2743,6 @@ spec:
                             type: array
                           suspend:
                             type: boolean
-                          suspendState:
-                            type: string
                           terminated:
                             type: boolean
                         required:
@@ -3390,10 +3386,6 @@ spec:
                             - type
                             type: object
                           type: array
-                        configMapRef:
-                          description: ConfigMapRef refer to a ConfigMap which contains
-                            OpenAPI V3 JSON schema of Component parameters.
-                          type: string
                         latestRevision:
                           description: LatestRevision of the component definition
                           properties:
@@ -4690,8 +4682,6 @@ spec:
                     type: array
                   suspend:
                     type: boolean
-                  suspendState:
-                    type: string
                   terminated:
                     type: boolean
                 required:

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

@@ -854,8 +854,6 @@ spec:
                     type: array
                   suspend:
                     type: boolean
-                  suspendState:
-                    type: string
                   terminated:
                     type: boolean
                 required:
@@ -1521,8 +1519,6 @@ spec:
                     type: array
                   suspend:
                     type: boolean
-                  suspendState:
-                    type: string
                   terminated:
                     type: boolean
                 required:

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

@@ -636,10 +636,6 @@ spec:
                           - type
                           type: object
                         type: array
-                      configMapRef:
-                        description: ConfigMapRef refer to a ConfigMap which contains
-                          OpenAPI V3 JSON schema of Component parameters.
-                        type: string
                       latestRevision:
                         description: LatestRevision of the component definition
                         properties:

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

@@ -244,10 +244,6 @@ spec:
                   - type
                   type: object
                 type: array
-              configMapRef:
-                description: ConfigMapRef refer to a ConfigMap which contains OpenAPI
-                  V3 JSON schema of Component parameters.
-                type: string
               latestRevision:
                 description: LatestRevision of the component definition
                 properties:

makefiles/const.mk

@@ -47,5 +47,5 @@ VELA_CORE_TEST_IMAGE ?= vela-core-test:$(GIT_COMMIT)
 VELA_APISERVER_IMAGE      ?= apiserver:latest
 VELA_RUNTIME_ROLLOUT_IMAGE       ?= vela-runtime-rollout:latest
 VELA_RUNTIME_ROLLOUT_TEST_IMAGE  ?= vela-runtime-rollout-test:$(GIT_COMMIT)
-RUNTIME_CLUSTER_CONFIG ?= /tmp/worker.client.kubeconfig
+RUNTIME_CLUSTER_CONFIG ?= /tmp/worker.kubeconfig
 RUNTIME_CLUSTER_NAME ?= worker

makefiles/dependency.mk

@@ -56,7 +56,7 @@ else
 CUE=$(shell which cue)
 endif
 
-KUSTOMIZE_VERSION ?= 3.8.2
+KUSTOMIZE_VERSION ?= 4.5.4	
 
 .PHONY: kustomize
 kustomize:

makefiles/e2e.mk

@@ -15,7 +15,7 @@ setup-runtime-e2e-cluster:
 
 .PHONY: e2e-setup
 e2e-setup:
-	helm install kruise https://github.com/openkruise/charts/releases/download/kruise-1.1.0/kruise-1.1.0.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true"
+	helm install kruise https://github.com/openkruise/kruise/releases/download/v0.9.0/kruise-chart.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true"
 	sh ./hack/e2e/modify_charts.sh
 	helm upgrade --install --create-namespace --namespace vela-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set applicationRevisionLimit=5 --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait kubevela ./charts/vela-core
 	helm upgrade --install --create-namespace --namespace oam-runtime-system --set image.pullPolicy=IfNotPresent --set image.repository=vela-core-test --set dependCheckWait=10s --set image.tag=$(GIT_COMMIT) --wait oam-runtime ./charts/oam-runtime
@@ -48,8 +48,8 @@ ADDONSERVER = $(shell pgrep vela_addon_mock_server)
 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
+	sleep 15
 	@$(OK) tests pass
 
 .PHONY: e2e-test

pkg/addon/addon.go

@@ -36,7 +36,6 @@ import (
 	"github.com/google/go-github/v32/github"
 	"github.com/hashicorp/go-version"
 	"github.com/pkg/errors"
-	"github.com/xanzy/go-gitlab"
 	"golang.org/x/oauth2"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -196,6 +195,10 @@ func GetPatternFromItem(it Item, r AsyncReader, rootPath string) string {
 		if strings.HasPrefix(relativePath, strings.Join([]string{rootPath, p.Value}, "/")) {
 			return p.Value
 		}
+		if strings.HasPrefix(relativePath, filepath.Join(rootPath, p.Value)) {
+			// for enable addon by load dir, compatible with linux or windows os
+			return p.Value
+		}
 	}
 	return ""
 }
@@ -358,7 +361,7 @@ func readResFile(a *InstallPackage, reader AsyncReader, readPath string) error {
 	if filename == "parameter.cue" {
 		return nil
 	}
-	file := ElementFile{Data: b, Name: path.Base(readPath)}
+	file := ElementFile{Data: b, Name: filepath.Base(readPath)}
 	switch filepath.Ext(filename) {
 	case ".cue":
 		a.CUETemplates = append(a.CUETemplates, file)
@@ -376,7 +379,7 @@ func readDefSchemaFile(a *InstallPackage, reader AsyncReader, readPath string) e
 	if err != nil {
 		return err
 	}
-	a.DefSchemas = append(a.DefSchemas, ElementFile{Data: b, Name: path.Base(readPath)})
+	a.DefSchemas = append(a.DefSchemas, ElementFile{Data: b, Name: filepath.Base(readPath)})
 	return nil
 }
 
@@ -387,7 +390,7 @@ func readDefFile(a *UIData, reader AsyncReader, readPath string) error {
 		return err
 	}
 	filename := path.Base(readPath)
-	file := ElementFile{Data: b, Name: path.Base(readPath)}
+	file := ElementFile{Data: b, Name: filepath.Base(readPath)}
 	switch filepath.Ext(filename) {
 	case ".cue":
 		a.CUEDefinitions = append(a.CUEDefinitions, file)
@@ -448,15 +451,6 @@ func createGiteeHelper(content *utils.Content, token string) *giteeHelper {
 	}
 }
 
-func createGitlabHelper(content *utils.Content, token string) (*gitlabHelper, error) {
-	newClient, err := gitlab.NewClient(token, gitlab.WithBaseURL(content.GitlabContent.Host))
-
-	return &gitlabHelper{
-		Client: newClient,
-		Meta:   content,
-	}, err
-}
-
 // readRepo will read relative path (relative to Meta.Path)
 func (h *gitHelper) readRepo(relativePath string) (*github.RepositoryContent, []*github.RepositoryContent, error) {
 	file, items, _, err := h.Client.Repositories.GetContents(context.Background(), h.Meta.GithubContent.Owner, h.Meta.GithubContent.Repo, path.Join(h.Meta.GithubContent.Path, relativePath), nil)

pkg/addon/addon_suite_test.go

@@ -21,6 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/oam-dev/kubevela/pkg/utils/apply"
+
 	"github.com/oam-dev/cluster-gateway/pkg/apis/cluster/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -362,6 +364,21 @@ var _ = Describe("func addon update ", func() {
 	})
 })
 
+var _ = Describe("test enable addon in local dir", func() {
+	BeforeEach(func() {
+		app := v1beta1.Application{ObjectMeta: metav1.ObjectMeta{Namespace: "vela-system", Name: "addon-example"}}
+		Expect(k8sClient.Delete(ctx, &app)).Should(SatisfyAny(BeNil(), util.NotFoundMatcher{}))
+	})
+
+	It("test enable addon by local dir", func() {
+		ctx := context.Background()
+		err := EnableAddonByLocalDir(ctx, "example", "./testdata/example", k8sClient, dc, apply.NewAPIApplicator(k8sClient), cfg, map[string]interface{}{"example": "test"})
+		Expect(err).Should(BeNil())
+		app := v1beta1.Application{}
+		Expect(k8sClient.Get(ctx, types2.NamespacedName{Namespace: "vela-system", Name: "addon-example"}, &app)).Should(BeNil())
+	})
+})
+
 const (
 	appYaml = `apiVersion: core.oam.dev/v1beta1
 kind: Application

pkg/addon/addon_test.go

@@ -147,7 +147,7 @@ func TestGetAddonData(t *testing.T) {
 	server := httptest.NewServer(ossHandler)
 	defer server.Close()
 
-	reader, err := NewAsyncReader(server.URL, "", "", "", "", ossType)
+	reader, err := NewAsyncReader(server.URL, "", "", "", ossType)
 	assert.NoError(t, err)
 	testReaderFunc(t, reader)
 }
@@ -617,9 +617,9 @@ func TestRenderApp4ObservabilityWithK8sData(t *testing.T) {
 }
 
 func TestGetPatternFromItem(t *testing.T) {
-	ossR, err := NewAsyncReader("http://ep.beijing", "some-bucket", "", "some-sub-path", "", ossType)
+	ossR, err := NewAsyncReader("http://ep.beijing", "some-bucket", "some-sub-path", "", ossType)
 	assert.NoError(t, err)
-	gitR, err := NewAsyncReader("https://github.com/oam-dev/catalog", "", "", "addons", "", gitType)
+	gitR, err := NewAsyncReader("https://github.com/oam-dev/catalog", "", "addons", "", gitType)
 	assert.NoError(t, err)
 	gitItemName := "parameter.cue"
 	gitItemType := FileType
@@ -657,7 +657,7 @@ func TestGetPatternFromItem(t *testing.T) {
 }
 
 func TestGitLabReaderNotPanic(t *testing.T) {
-	_, err := NewAsyncReader("https://gitlab.com/test/catalog", "", "", "addons", "", gitType)
+	_, err := NewAsyncReader("https://gitlab.com/test/catalog", "", "addons", "", gitType)
 	assert.EqualError(t, err, "git type repository only support github for now")
 }
 

pkg/addon/cache.go

@@ -19,12 +19,12 @@ package addon
 import (
 	"context"
 	"fmt"
+	"strings"
 	"sync"
 	"time"
 
-	"github.com/oam-dev/kubevela/pkg/utils"
-
 	"github.com/oam-dev/kubevela/pkg/apiserver/log"
+	"github.com/oam-dev/kubevela/pkg/utils"
 )
 
 // We have three addon layer here
@@ -119,28 +119,27 @@ func (u *Cache) GetUIData(r Registry, addonName, version string) (*UIData, error
 // ListUIData will always list UIData from cache first, if not exist, read from source.
 func (u *Cache) ListUIData(r Registry) ([]*UIData, error) {
 	var err error
-	listAddons := u.listCachedUIData(r.Name)
-	if listAddons != nil {
-		return listAddons, nil
-	}
+	var listAddons []*UIData
 	if !IsVersionRegistry(r) {
-		addonMeta, err := u.ListAddonMeta(r)
+		listAddons = u.listCachedUIData(r.Name)
+		if listAddons != nil {
+			return listAddons, nil
+		}
+		listAddons, err = u.listUIDataAndCache(r)
 		if err != nil {
 			return nil, err
 		}
-		listAddons, err = r.ListUIData(addonMeta, UIMetaOptions)
-		if err != nil {
-			return nil, fmt.Errorf("fail to get addons from registry %s, %w", r.Name, err)
-		}
 	} else {
-		versionedRegistry := BuildVersionedRegistry(r.Name, r.Helm.URL)
-		listAddons, err = versionedRegistry.ListAddon()
+		listAddons = u.listVersionRegistryCachedUIData(r.Name)
+		if listAddons != nil {
+			return listAddons, nil
+		}
+		listAddons, err = u.listVersionRegistryUIDataAndCache(r)
 		if err != nil {
-			log.Logger.Errorf("fail to get addons from registry %s for cache updating, %v", r.Name, err)
 			return nil, err
 		}
 	}
-	u.putAddonUIData2Cache(r.Name, listAddons)
+
 	return listAddons, nil
 }
 
@@ -175,6 +174,27 @@ func (u *Cache) listCachedUIData(name string) []*UIData {
 	return d
 }
 
+// listVersionRegistryCachedUIData will get cached addons from specified VersionRegistry in cache
+func (u *Cache) listVersionRegistryCachedUIData(name string) []*UIData {
+	if u == nil {
+		return nil
+	}
+	u.mutex.RLock()
+	defer u.mutex.RUnlock()
+	d, ok := u.versionedUIData[name]
+	if !ok {
+		return nil
+	}
+	var uiDatas []*UIData
+	for version, uiData := range d {
+		if !strings.Contains(version, "-latest") {
+			uiDatas = append(uiDatas, uiData)
+		}
+	}
+
+	return uiDatas
+}
+
 // getCachedAddonMeta will get cached registry meta from specified registry in cache
 func (u *Cache) getCachedAddonMeta(name string) map[string]SourceMeta {
 	if u == nil {
@@ -260,35 +280,51 @@ func (u *Cache) discoverAndRefreshRegistry() {
 
 	for _, r := range registries {
 		if !IsVersionRegistry(r) {
-			registryMeta, err := r.ListAddonMeta()
+			_, err = u.listUIDataAndCache(r)
 			if err != nil {
-				log.Logger.Errorf("fail to list registry %s metadata,  %v", r.Name, err)
 				continue
 			}
-			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)
-				continue
-			}
-			u.putAddonUIData2Cache(r.Name, uiData)
 		} else {
-			versionedRegistry := BuildVersionedRegistry(r.Name, r.Helm.URL)
-			uiDatas, err := versionedRegistry.ListAddon()
+			_, err = u.listVersionRegistryUIDataAndCache(r)
 			if err != nil {
-				log.Logger.Errorf("fail to get addons from registry %s for cache updating, %v", r.Name, err)
 				continue
 			}
-			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 registry %s, addon %s version %s for cache updating, %v", addon.Name, r.Name, err)
-					continue
-				}
-				u.putVersionedUIData2Cache(r.Name, addon.Name, addon.Version, uiData)
-				// we also no version key, if use get addonUIData without version will return this vale as latest data.
-				u.putVersionedUIData2Cache(r.Name, addon.Name, "latest", uiData)
-			}
 		}
 	}
 }
+
+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)
+		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)
+		return nil, err
+	}
+	u.putAddonUIData2Cache(r.Name, uiData)
+	return uiData, nil
+}
+
+func (u *Cache) listVersionRegistryUIDataAndCache(r Registry) ([]*UIData, error) {
+	versionedRegistry := BuildVersionedRegistry(r.Name, r.Helm.URL)
+	uiDatas, err := versionedRegistry.ListAddon()
+	if err != nil {
+		log.Logger.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)
+			continue
+		}
+		u.putVersionedUIData2Cache(r.Name, addon.Name, addon.Version, uiData)
+		// we also no version key, if use get addonUIData without version will return this vale as latest data.
+		u.putVersionedUIData2Cache(r.Name, addon.Name, "latest", uiData)
+	}
+	return uiDatas, nil
+}

pkg/addon/cache_test.go

@@ -31,3 +31,63 @@ func TestPutVersionedUIData2cache(t *testing.T) {
 	assert.NotEmpty(t, u.versionedUIData["helm-repo"]["fluxcd-1.0.0"])
 	assert.Equal(t, u.versionedUIData["helm-repo"]["fluxcd-1.0.0"].Name, "fluxcd")
 }
+
+func TestPutAddonUIData2Cache(t *testing.T) {
+	uiData := UIData{Meta: Meta{Name: "fluxcd", Icon: "test.com/fluxcd.png", Version: "1.0.0"}}
+	addons := []*UIData{&uiData}
+	name := "helm-repo"
+	u := NewCache(nil)
+	u.putAddonUIData2Cache(name, addons)
+	assert.NotEmpty(t, u.uiData)
+	assert.Equal(t, u.uiData[name], addons)
+}
+
+func TestListCachedUIData(t *testing.T) {
+	uiData := UIData{Meta: Meta{Name: "fluxcd", Icon: "test.com/fluxcd.png", Version: "1.0.0"}}
+	addons := []*UIData{&uiData}
+	name := "helm-repo"
+	u := NewCache(nil)
+	u.putAddonUIData2Cache(name, addons)
+
+	assert.Equal(t, u.listCachedUIData(name), addons)
+}
+
+func TestPutAddonMeta2Cache(t *testing.T) {
+	addonMeta := map[string]SourceMeta{
+		"fluxcd": {
+			Name: "fluxcd",
+			Items: []Item{
+				&OSSItem{
+					tp:   FileType,
+					path: "fluxcd/definitions/helm-release.yaml",
+					name: "helm-release.yaml",
+				},
+			},
+		},
+	}
+	name := "helm-repo"
+	u := NewCache(nil)
+	u.putAddonMeta2Cache(name, addonMeta)
+	assert.NotEmpty(t, u.registryMeta)
+	assert.Equal(t, u.registryMeta[name], addonMeta)
+}
+
+func TestGetCachedAddonMeta(t *testing.T) {
+	addonMeta := map[string]SourceMeta{
+		"fluxcd": {
+			Name: "fluxcd",
+			Items: []Item{
+				&OSSItem{
+					tp:   FileType,
+					path: "fluxcd/definitions/helm-release.yaml",
+					name: "helm-release.yaml",
+				},
+			},
+		},
+	}
+	name := "helm-repo"
+	u := NewCache(nil)
+	u.putAddonMeta2Cache(name, addonMeta)
+
+	assert.Equal(t, u.getCachedAddonMeta(name), addonMeta)
+}

pkg/addon/helper.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"path/filepath"
 
 	"k8s.io/client-go/discovery"
 	"k8s.io/klog/v2"
@@ -92,7 +93,11 @@ func DisableAddon(ctx context.Context, cli client.Client, name string, config *r
 
 // EnableAddonByLocalDir enable an addon from local dir
 func EnableAddonByLocalDir(ctx context.Context, name string, dir string, cli client.Client, dc *discovery.DiscoveryClient, applicator apply.Applicator, config *rest.Config, args map[string]interface{}) error {
-	r := localReader{dir: dir, name: name}
+	absDir, err := filepath.Abs(dir)
+	if err != nil {
+		return err
+	}
+	r := localReader{dir: absDir, name: name}
 	metas, err := r.ListAddonMeta()
 	if err != nil {
 		return err

pkg/addon/reader_gitlab.go

@@ -1,150 +0,0 @@
-/*
-Copyright 2021 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 addon
-
-import (
-	"encoding/base64"
-
-	"github.com/xanzy/go-gitlab"
-
-	"github.com/oam-dev/kubevela/pkg/utils"
-)
-
-var _ AsyncReader = &gitlabReader{}
-
-// gitlabReader helps get addon's file by git
-type gitlabReader struct {
-	h *gitlabHelper
-}
-
-// gitlabHelper helps get addon's file by git
-type gitlabHelper struct {
-	Client *gitlab.Client
-	Meta   *utils.Content
-}
-
-// GitLabItem  addon's sub item
-type GitLabItem struct {
-	basePath string
-	tp       string
-	path     string
-	name     string
-}
-
-// GetType get addon's sub item type
-func (g GitLabItem) GetType() string {
-	return g.tp
-}
-
-// GetPath get addon's sub item path
-func (g GitLabItem) GetPath() string {
-	return g.path[len(g.basePath)+1:]
-}
-
-// GetName get addon's sub item name
-func (g GitLabItem) GetName() string {
-	return g.name
-}
-
-// GetRef ref is empty , use default branch master
-func (g *gitlabReader) GetRef() string {
-	var ref = "master"
-	if g.h.Meta.GitlabContent.Ref != "" {
-		return g.h.Meta.GitlabContent.Ref
-	}
-	return ref
-}
-
-// GetProjectID get gitlab project id
-func (g *gitlabReader) GetProjectID() int {
-	return g.h.Meta.GitlabContent.PId
-}
-
-// GetProjectPath get gitlab project path
-func (g *gitlabReader) GetProjectPath() string {
-	return g.h.Meta.GitlabContent.Path
-}
-
-// ListAddonMeta relative path to repoURL/basePath
-func (g *gitlabReader) ListAddonMeta() (addonCandidates map[string]SourceMeta, err error) {
-	addonCandidates = make(map[string]SourceMeta)
-	path := g.GetProjectPath()
-	ref := g.GetRef()
-	tree, _, err := g.h.Client.Repositories.ListTree(g.GetProjectID(), &gitlab.ListTreeOptions{Path: &path, Ref: &ref})
-
-	if err != nil {
-		return nil, err
-	}
-
-	for _, node := range tree {
-		if node.Type == TreeType {
-			items, err := g.listAddonItem(make([]Item, 0), node.Path)
-			if err != nil {
-				return nil, err
-			}
-			addonCandidates[node.Name] = SourceMeta{
-				Name:  node.Name,
-				Items: items,
-			}
-		}
-	}
-
-	return addonCandidates, nil
-}
-
-func (g *gitlabReader) listAddonItem(item []Item, path string) ([]Item, error) {
-	ref := g.GetRef()
-	tree, _, err := g.h.Client.Repositories.ListTree(g.GetProjectID(), &gitlab.ListTreeOptions{Path: &path, Ref: &ref})
-	if err != nil {
-		return item, err
-	}
-	for _, node := range tree {
-		switch node.Type {
-		case TreeType:
-			item, err = g.listAddonItem(item, node.Path)
-			if err != nil {
-				return nil, err
-			}
-		case BlobType:
-			item = append(item, &GitLabItem{
-				basePath: g.GetProjectPath(),
-				tp:       FileType,
-				path:     node.Path,
-				name:     node.Name,
-			})
-		}
-	}
-	return item, nil
-}
-
-// ReadFile read file content from gitlab
-func (g *gitlabReader) ReadFile(path string) (content string, err error) {
-	ref := g.GetRef()
-	getFile, _, err := g.h.Client.RepositoryFiles.GetFile(g.GetProjectID(), g.GetProjectPath()+"/"+path, &gitlab.GetFileOptions{Ref: &ref})
-	if err != nil {
-		return "", err
-	}
-	decodeString, err := base64.StdEncoding.DecodeString(getFile.Content)
-	if err != nil {
-		return "", err
-	}
-	return string(decodeString), nil
-}
-
-func (g *gitlabReader) RelativePath(item Item) string {
-	return item.GetPath()
-}

pkg/addon/reader_gitlab_test.go

@@ -1,113 +0,0 @@
-/*
-Copyright 2021 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 addon
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/xanzy/go-gitlab"
-
-	"github.com/oam-dev/kubevela/pkg/utils"
-)
-
-var baseUrl = "/api/v4"
-
-func gitlabSetup() (client *gitlab.Client, mux *http.ServeMux, teardown func()) {
-	// mux is the HTTP request multiplexer used with the test server.
-	mux = http.NewServeMux()
-
-	apiHandler := http.NewServeMux()
-	apiHandler.Handle(baseUrl+"/", http.StripPrefix(baseUrl, mux))
-
-	// server is a test HTTP server used to provide mock API responses.
-	server := httptest.NewServer(apiHandler)
-
-	// client is the Gitlab client being tested and is
-	// configured to use test server.
-	client, err := gitlab.NewClient("", gitlab.WithBaseURL(server.URL+baseUrl+"/"))
-	if err != nil {
-		return
-	}
-
-	return client, mux, server.Close
-}
-
-func TestGitlabReader(t *testing.T) {
-	client, mux, teardown := gitlabSetup()
-	gitlabPattern := "/projects/9999/repository/files/"
-	mux.HandleFunc(gitlabPattern, func(rw http.ResponseWriter, req *http.Request) {
-		queryPath := strings.TrimPrefix(req.URL.Path, gitlabPattern)
-		localPath := path.Join(testdataPrefix, queryPath)
-		file, err := testdata.ReadFile(localPath)
-		// test if it's a file
-		if err == nil {
-			content := &gitlab.File{
-				FilePath: localPath,
-				FileName: path.Base(queryPath),
-				Size:     *Int(len(file)),
-				Encoding: "base64",
-				Ref:      "master",
-				Content:  base64.StdEncoding.EncodeToString(file),
-			}
-			res, _ := json.Marshal(content)
-			rw.Write(res)
-			return
-		}
-
-		// otherwise, it could be directory
-		dir, err := testdata.ReadDir(localPath)
-		if err == nil {
-			contents := make([]*gitlab.TreeNode, 0)
-			for _, item := range dir {
-				tp := "file"
-				if item.IsDir() {
-					tp = "dir"
-				}
-				contents = append(contents, &gitlab.TreeNode{
-					ID:   "",
-					Name: item.Name(),
-					Type: tp,
-					Path: localPath + "/" + item.Name(),
-					Mode: "",
-				})
-			}
-			dRes, _ := json.Marshal(contents)
-			rw.Write(dRes)
-			return
-		}
-
-		rw.Write([]byte("invalid gitlab query"))
-	})
-	defer teardown()
-
-	gith := &gitlabHelper{
-		Client: client,
-		Meta: &utils.Content{GitlabContent: utils.GitlabContent{
-			PId: 9999,
-		}},
-	}
-	var r AsyncReader = &gitlabReader{gith}
-	_, err := r.ReadFile("example/metadata.yaml")
-	assert.NoError(t, err)
-}

pkg/addon/reader_local.go

@@ -37,8 +37,10 @@ func (l localReader) ListAddonMeta() (map[string]SourceMeta, error) {
 }
 
 func (l localReader) ReadFile(path string) (string, error) {
-	file := strings.TrimPrefix(path, l.name+"/")
-	b, err := ioutil.ReadFile(filepath.Clean(filepath.Join(l.dir, file)))
+	path = strings.TrimPrefix(path, l.name+"/")
+	// for windows
+	path = strings.TrimPrefix(path, l.name+"\\")
+	b, err := ioutil.ReadFile(filepath.Clean(filepath.Join(l.dir, path)))
 	if err != nil {
 		return "", err
 	}
@@ -46,7 +48,8 @@ func (l localReader) ReadFile(path string) (string, error) {
 }
 
 func (l localReader) RelativePath(item Item) string {
-	return filepath.Join(l.name, strings.TrimPrefix(item.GetPath()+"/", l.dir))
+	file := strings.TrimPrefix(item.GetPath(), filepath.Clean(l.dir))
+	return filepath.Join(l.name, file)
 }
 
 func recursiveFetchFiles(path string, metas *SourceMeta) error {
@@ -60,7 +63,7 @@ func recursiveFetchFiles(path string, metas *SourceMeta) error {
 				return err
 			}
 		} else {
-			metas.Items = append(metas.Items, OSSItem{tp: "file", path: fmt.Sprintf("%s/%s", path, file.Name()), name: file.Name()})
+			metas.Items = append(metas.Items, OSSItem{tp: "file", path: filepath.Join(path, file.Name()), name: file.Name()})
 		}
 	}
 	return nil

pkg/addon/registry.go

@@ -37,11 +37,10 @@ const registriesKey = "registries"
 type Registry struct {
 	Name string `json:"name"`
 
-	Helm   *HelmSource        `json:"helm,omitempty"`
-	Git    *GitAddonSource    `json:"git,omitempty"`
-	OSS    *OSSAddonSource    `json:"oss,omitempty"`
-	Gitee  *GiteeAddonSource  `json:"gitee,omitempty"`
-	Gitlab *GitlabAddonSource `json:"gitlab,omitempty"`
+	Helm  *HelmSource       `json:"helm,omitempty"`
+	Git   *GitAddonSource   `json:"git,omitempty"`
+	OSS   *OSSAddonSource   `json:"oss,omitempty"`
+	Gitee *GiteeAddonSource `json:"gitee,omitempty"`
 }
 
 // RegistryDataStore CRUD addon registry data in configmap

pkg/addon/source.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/go-resty/resty/v2"
 	"github.com/pkg/errors"
-	"github.com/xanzy/go-gitlab"
 
 	"github.com/oam-dev/kubevela/pkg/utils"
 )
@@ -36,10 +35,6 @@ const (
 	DirType = "dir"
 	// FileType means a file
 	FileType = "file"
-	// BlobType means a blob
-	BlobType = "blob"
-	// TreeType means a tree
-	TreeType = "tree"
 
 	bucketTmpl        = "%s://%s.%s"
 	singleOSSFileTmpl = "%s/%s"
@@ -68,19 +63,48 @@ type GiteeAddonSource struct {
 	Token string `json:"token,omitempty"`
 }
 
-// GitlabAddonSource defines the information about the Gitlab as addon source
-type GitlabAddonSource struct {
-	URL   string `json:"url,omitempty" validate:"required"`
-	Repo  string `json:"repo,omitempty" validate:"required"`
-	Path  string `json:"path,omitempty"`
-	Token string `json:"token,omitempty"`
-}
-
 // HelmSource  defines the information about the helm repo addon source
 type HelmSource struct {
 	URL string `json:"url,omitempty" validate:"required"`
 }
 
+// SafeCopier is an interface to copy Struct without sensitive fields, such as Token, Username, Password
+type SafeCopier interface {
+	SafeCopy() interface{}
+}
+
+// SafeCopy hides field Token
+func (g *GitAddonSource) SafeCopy() *GitAddonSource {
+	if g == nil {
+		return nil
+	}
+	return &GitAddonSource{
+		URL:  g.URL,
+		Path: g.Path,
+	}
+}
+
+// SafeCopy hides field Token
+func (g *GiteeAddonSource) SafeCopy() *GiteeAddonSource {
+	if g == nil {
+		return nil
+	}
+	return &GiteeAddonSource{
+		URL:  g.URL,
+		Path: g.Path,
+	}
+}
+
+// SafeCopy hides field Username, Password
+func (h *HelmSource) SafeCopy() *HelmSource {
+	if h == nil {
+		return nil
+	}
+	return &HelmSource{
+		URL: h.URL,
+	}
+}
+
 // Item is a partial interface for github.RepositoryContent
 type Item interface {
 	// GetType return "dir" or "file"
@@ -135,16 +159,15 @@ func pathWithParent(subPath, parent string) string {
 type ReaderType string
 
 const (
-	gitType    ReaderType = "git"
-	ossType    ReaderType = "oss"
-	giteeType  ReaderType = "gitee"
-	gitlabType ReaderType = "gitlab"
+	gitType   ReaderType = "git"
+	ossType   ReaderType = "oss"
+	giteeType ReaderType = "gitee"
 )
 
 // NewAsyncReader create AsyncReader from
 // 1. GitHub url and directory
 // 2. OSS endpoint and bucket
-func NewAsyncReader(baseURL, bucket, repo, subPath, token string, rdType ReaderType) (AsyncReader, error) {
+func NewAsyncReader(baseURL, bucket, subPath, token string, rdType ReaderType) (AsyncReader, error) {
 
 	switch rdType {
 	case gitType:
@@ -196,63 +219,23 @@ func NewAsyncReader(baseURL, bucket, repo, subPath, token string, rdType ReaderT
 		return &giteeReader{
 			h: gitee,
 		}, nil
-	case gitlabType:
-		baseURL = strings.TrimSuffix(baseURL, ".git")
-		u, err := url.Parse(baseURL)
-		if err != nil {
-			return nil, errors.New("addon registry invalid")
-		}
-		_, content, err := utils.ParseGitlab(u.String(), repo)
-		content.GitlabContent.Path = subPath
-		if err != nil {
-			return nil, err
-		}
-		gitlabHelper, err := createGitlabHelper(content, token)
-		if err != nil {
-			return nil, errors.New("addon registry connect fail")
-		}
-
-		err = gitlabHelper.getGitlabProject(content)
-		if err != nil {
-			return nil, err
-		}
-
-		return &gitlabReader{
-			h: gitlabHelper,
-		}, nil
 	}
 	return nil, fmt.Errorf("invalid addon registry type '%s'", rdType)
 }
 
-// getGitlabProject get gitlab project , set project id
-func (h *gitlabHelper) getGitlabProject(content *utils.Content) error {
-	projectURL := content.GitlabContent.Owner + "/" + content.GitlabContent.Repo
-	projects, _, err := h.Client.Projects.GetProject(projectURL, &gitlab.GetProjectOptions{})
-	if err != nil {
-		return err
-	}
-	content.GitlabContent.PId = projects.ID
-
-	return nil
-}
-
 // BuildReader will build a AsyncReader from registry, AsyncReader are needed to read addon files
 func (r *Registry) BuildReader() (AsyncReader, error) {
 	if r.OSS != nil {
 		o := r.OSS
-		return NewAsyncReader(o.Endpoint, o.Bucket, "", o.Path, "", ossType)
+		return NewAsyncReader(o.Endpoint, o.Bucket, o.Path, "", ossType)
 	}
 	if r.Git != nil {
 		g := r.Git
-		return NewAsyncReader(g.URL, "", "", g.Path, g.Token, gitType)
+		return NewAsyncReader(g.URL, "", g.Path, g.Token, gitType)
 	}
 	if r.Gitee != nil {
 		g := r.Gitee
-		return NewAsyncReader(g.URL, "", "", g.Path, g.Token, giteeType)
-	}
-	if r.Gitlab != nil {
-		g := r.Gitlab
-		return NewAsyncReader(g.URL, "", g.Repo, g.Path, g.Token, gitlabType)
+		return NewAsyncReader(g.URL, "", g.Path, g.Token, giteeType)
 	}
 	return nil, errors.New("registry don't have enough info to build a reader")
 }

pkg/addon/source_test.go

@@ -47,7 +47,7 @@ func TestPathWithParent(t *testing.T) {
 
 func TestConvert2OssItem(t *testing.T) {
 	subPath := "sub-addons"
-	reader, err := NewAsyncReader("ep-beijing.com", "bucket", "", subPath, "", ossType)
+	reader, err := NewAsyncReader("ep-beijing.com", "bucket", subPath, "", ossType)
 
 	assert.NoError(t, err)
 
@@ -115,3 +115,30 @@ func TestConvert2OssItem(t *testing.T) {
 	assert.Equal(t, expectItemCase, addonMetas)
 
 }
+
+func TestSafeCopy(t *testing.T) {
+	var git *GitAddonSource
+	sgit := git.SafeCopy()
+	assert.Nil(t, sgit)
+	git = &GitAddonSource{URL: "http://github.com/kubevela", Path: "addons", Token: "123456"}
+	sgit = git.SafeCopy()
+	assert.Empty(t, sgit.Token)
+	assert.Equal(t, "http://github.com/kubevela", sgit.URL)
+	assert.Equal(t, "addons", sgit.Path)
+
+	var gitee *GiteeAddonSource
+	sgitee := gitee.SafeCopy()
+	assert.Nil(t, sgitee)
+	gitee = &GiteeAddonSource{URL: "http://gitee.com/kubevela", Path: "addons", Token: "123456"}
+	sgitee = gitee.SafeCopy()
+	assert.Empty(t, sgitee.Token)
+	assert.Equal(t, "http://gitee.com/kubevela", sgitee.URL)
+	assert.Equal(t, "addons", sgitee.Path)
+
+	var helm *HelmSource
+	shelm := helm.SafeCopy()
+	assert.Nil(t, shelm)
+	helm = &HelmSource{URL: "https://hub.vela.com/chartrepo/addons"}
+	shelm = helm.SafeCopy()
+	assert.Equal(t, "https://hub.vela.com/chartrepo/addons", shelm.URL)
+}

pkg/apiserver/rest/apis/v1/types.go

@@ -74,31 +74,28 @@ type NameAlias struct {
 
 // CreateAddonRegistryRequest defines the format for addon registry create request
 type CreateAddonRegistryRequest struct {
-	Name   string                   `json:"name" validate:"checkname"`
-	Helm   *addon.HelmSource        `json:"helm,omitempty"`
-	Git    *addon.GitAddonSource    `json:"git,omitempty" `
-	Oss    *addon.OSSAddonSource    `json:"oss,omitempty"`
-	Gitee  *addon.GiteeAddonSource  `json:"gitee,omitempty" `
-	Gitlab *addon.GitlabAddonSource `json:"gitlab,omitempty" `
+	Name  string                  `json:"name" validate:"checkname"`
+	Helm  *addon.HelmSource       `json:"helm,omitempty"`
+	Git   *addon.GitAddonSource   `json:"git,omitempty" `
+	Oss   *addon.OSSAddonSource   `json:"oss,omitempty"`
+	Gitee *addon.GiteeAddonSource `json:"gitee,omitempty" `
 }
 
 // UpdateAddonRegistryRequest defines the format for addon registry update request
 type UpdateAddonRegistryRequest struct {
-	Helm   *addon.HelmSource        `json:"helm,omitempty"`
-	Git    *addon.GitAddonSource    `json:"git,omitempty"`
-	Oss    *addon.OSSAddonSource    `json:"oss,omitempty"`
-	Gitee  *addon.GiteeAddonSource  `json:"gitee,omitempty" `
-	Gitlab *addon.GitlabAddonSource `json:"gitlab,omitempty" `
+	Helm  *addon.HelmSource       `json:"helm,omitempty"`
+	Git   *addon.GitAddonSource   `json:"git,omitempty"`
+	Oss   *addon.OSSAddonSource   `json:"oss,omitempty"`
+	Gitee *addon.GiteeAddonSource `json:"gitee,omitempty" `
 }
 
 // AddonRegistry defines the format for a single addon registry
 type AddonRegistry struct {
-	Name   string                   `json:"name" validate:"required"`
-	Helm   *addon.HelmSource        `json:"helm,omitempty"`
-	Git    *addon.GitAddonSource    `json:"git,omitempty"`
-	OSS    *addon.OSSAddonSource    `json:"oss,omitempty"`
-	Gitee  *addon.GiteeAddonSource  `json:"gitee,omitempty" `
-	Gitlab *addon.GitlabAddonSource `json:"gitlab,omitempty" `
+	Name  string                  `json:"name" validate:"required"`
+	Helm  *addon.HelmSource       `json:"helm,omitempty"`
+	Git   *addon.GitAddonSource   `json:"git,omitempty"`
+	OSS   *addon.OSSAddonSource   `json:"oss,omitempty"`
+	Gitee *addon.GiteeAddonSource `json:"gitee,omitempty" `
 }
 
 // ListAddonRegistryResponse list addon registry

pkg/apiserver/rest/usecase/addon.go

@@ -313,12 +313,11 @@ func (u *defaultAddonHandler) CreateAddonRegistry(ctx context.Context, req apis.
 
 func convertAddonRegistry(r pkgaddon.Registry) *apis.AddonRegistry {
 	return &apis.AddonRegistry{
-		Name:   r.Name,
-		Git:    r.Git,
-		Gitee:  r.Gitee,
-		OSS:    r.OSS,
-		Helm:   r.Helm,
-		Gitlab: r.Gitlab,
+		Name:  r.Name,
+		Git:   r.Git.SafeCopy(),
+		Gitee: r.Gitee.SafeCopy(),
+		OSS:   r.OSS,
+		Helm:  r.Helm.SafeCopy(),
 	}
 }
 
@@ -344,8 +343,6 @@ func (u defaultAddonHandler) UpdateAddonRegistry(ctx context.Context, name strin
 		r.OSS = req.Oss
 	case req.Helm != nil:
 		r.Helm = req.Helm
-	case req.Gitlab != nil:
-		r.Gitlab = req.Gitlab
 	}
 
 	err = u.addonRegistryDS.UpdateRegistry(ctx, r)
@@ -479,12 +476,11 @@ func (u *defaultAddonHandler) UpdateAddon(ctx context.Context, name string, args
 
 func addonRegistryModelFromCreateAddonRegistryRequest(req apis.CreateAddonRegistryRequest) pkgaddon.Registry {
 	return pkgaddon.Registry{
-		Name:   req.Name,
-		Git:    req.Git,
-		OSS:    req.Oss,
-		Gitee:  req.Gitee,
-		Helm:   req.Helm,
-		Gitlab: req.Gitlab,
+		Name:  req.Name,
+		Git:   req.Git,
+		OSS:   req.Oss,
+		Gitee: req.Gitee,
+		Helm:  req.Helm,
 	}
 }
 

pkg/apiserver/rest/usecase/config.go

@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	set "github.com/deckarep/golang-set"
+	terraformtypes "github.com/oam-dev/terraform-controller/api/types"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -38,13 +39,13 @@ import (
 	"github.com/oam-dev/kubevela/pkg/apiserver/model"
 	apis "github.com/oam-dev/kubevela/pkg/apiserver/rest/apis/v1"
 	"github.com/oam-dev/kubevela/pkg/definition"
+	"github.com/oam-dev/kubevela/pkg/utils/config"
 )
 
 const (
 	definitionAlias = definition.UserPrefix + "alias.config.oam.dev"
 	definitionType  = definition.UserPrefix + "type.config.oam.dev"
 
-	velaCoreConfig          = "velacore-config"
 	configIsReady           = "Ready"
 	configIsNotReady        = "Not ready"
 	terraformProviderAlias  = "Terraform Cloud Provider"
@@ -82,7 +83,7 @@ type configUseCaseImpl struct {
 func (u *configUseCaseImpl) ListConfigTypes(ctx context.Context, query string) ([]*apis.ConfigType, error) {
 	defs := &v1beta1.ComponentDefinitionList{}
 	if err := u.kubeClient.List(ctx, defs, client.InNamespace(types.DefaultKubeVelaNS),
-		client.MatchingLabels{definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig}); err != nil {
+		client.MatchingLabels{definition.UserPrefix + "catalog.config.oam.dev": types.VelaCoreConfig}); err != nil {
 		return nil, err
 	}
 
@@ -137,7 +138,7 @@ func (u *configUseCaseImpl) GetConfigType(ctx context.Context, configType string
 func (u *configUseCaseImpl) CreateConfig(ctx context.Context, req apis.CreateConfigRequest) error {
 	p := req.Properties
 	// If the component is Terraform type, set the provider name same as the application name and the component name
-	if strings.HasPrefix(req.ComponentType, types.TerrfaormComponentPrefix) {
+	if strings.HasPrefix(req.ComponentType, types.TerraformComponentPrefix) {
 		var properties map[string]interface{}
 		if err := json.Unmarshal([]byte(p), &properties); err != nil {
 			return errors.Wrapf(err, "unable to process the properties of %s", req.ComponentType)
@@ -149,52 +150,45 @@ func (u *configUseCaseImpl) CreateConfig(ctx context.Context, req apis.CreateCon
 		}
 		p = string(tmp)
 	}
-	app := v1beta1.Application{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      req.Name,
-			Namespace: types.DefaultKubeVelaNS,
-			Annotations: map[string]string{
-				types.AnnotationConfigAlias:       req.Alias,
-				types.AnnotationConfigDescription: req.Description,
-			},
-			Labels: map[string]string{
-				model.LabelSourceOfTruth: model.FromInner,
-				types.LabelConfigCatalog: velaCoreConfig,
-				types.LabelConfigType:    req.ComponentType,
-				types.LabelConfigProject: req.Project,
-			},
-		},
-		Spec: v1beta1.ApplicationSpec{
-			Components: []common.ApplicationComponent{
-				{
-					Name:       req.Name,
-					Type:       req.ComponentType,
-					Properties: &runtime.RawExtension{Raw: []byte(p)},
-				},
-			},
-		},
+	ui := config.UIParam{
+		Alias:       req.Alias,
+		Description: req.Description,
+		Project:     req.Project,
 	}
-	return u.kubeClient.Create(ctx, &app)
+	return config.CreateApplication(ctx, u.kubeClient, req.Name, req.ComponentType, p, ui)
 }
 
 func (u *configUseCaseImpl) GetConfigs(ctx context.Context, configType string) ([]*apis.Config, error) {
 	switch configType {
 	case types.TerraformProvider:
-		defs := &v1beta1.ComponentDefinitionList{}
-		if err := u.kubeClient.List(ctx, defs, client.InNamespace(types.DefaultKubeVelaNS),
-			client.MatchingLabels{
-				definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig,
-				definition.UserPrefix + "type.config.oam.dev":    types.TerraformProvider,
-			}); err != nil {
+		providers, err := config.ListTerraformProviders(ctx, u.kubeClient)
+		if err != nil {
 			return nil, err
 		}
-		var configs []*apis.Config
-		for _, d := range defs.Items {
-			subConfigs, err := u.getConfigsByConfigType(ctx, d.Name)
-			if err != nil {
+		configs := make([]*apis.Config, len(providers))
+		for i, p := range providers {
+			var a v1beta1.Application
+			if err := u.kubeClient.Get(ctx, client.ObjectKey{Namespace: types.DefaultKubeVelaNS, Name: p.Name}, &a); err != nil {
+				if kerrors.IsNotFound(err) {
+					t := p.CreationTimestamp.Time
+					configs[i] = &apis.Config{
+						Name:        p.Name,
+						CreatedTime: &t,
+					}
+					if p.Status.State == terraformtypes.ProviderIsReady {
+						configs[i].Status = configIsReady
+					} else {
+						configs[i].Status = configIsNotReady
+					}
+					continue
+				}
 				return nil, err
 			}
-			configs = append(configs, subConfigs...)
+			// If the application doesn't have any components, skip it as something wrong happened.
+			if !strings.HasPrefix(a.Labels[types.LabelConfigType], types.TerraformComponentPrefix) {
+				continue
+			}
+			configs[i] = retrieveConfigFromApplication(a, a.Labels[types.LabelConfigProject])
 		}
 		return configs, nil
 
@@ -209,7 +203,7 @@ func (u *configUseCaseImpl) getConfigsByConfigType(ctx context.Context, configTy
 	if err := u.kubeClient.List(ctx, apps, client.InNamespace(types.DefaultKubeVelaNS),
 		client.MatchingLabels{
 			model.LabelSourceOfTruth: model.FromInner,
-			types.LabelConfigCatalog: velaCoreConfig,
+			types.LabelConfigCatalog: types.VelaCoreConfig,
 			types.LabelConfigType:    configType,
 		}); err != nil {
 		return nil, err
@@ -218,12 +212,6 @@ func (u *configUseCaseImpl) getConfigsByConfigType(ctx context.Context, configTy
 	configs := make([]*apis.Config, len(apps.Items))
 	for i, a := range apps.Items {
 		configs[i] = retrieveConfigFromApplication(a, a.Labels[types.LabelConfigProject])
-		switch a.Status.Phase {
-		case common.ApplicationRunning:
-			configs[i].Status = configIsReady
-		default:
-			configs[i].Status = configIsNotReady
-		}
 	}
 	return configs, nil
 }
@@ -245,11 +233,11 @@ func (u *configUseCaseImpl) GetConfig(ctx context.Context, configType, name stri
 }
 
 func (u *configUseCaseImpl) DeleteConfig(ctx context.Context, configType, name string) error {
-	var a = &v1beta1.Application{}
-	if err := u.kubeClient.Get(ctx, client.ObjectKey{Namespace: types.DefaultKubeVelaNS, Name: name}, a); err != nil {
-		return err
+	var isTerraformProvider bool
+	if strings.HasPrefix(configType, types.TerraformComponentPrefix) {
+		isTerraformProvider = true
 	}
-	return u.kubeClient.Delete(ctx, a)
+	return config.DeleteApplication(ctx, u.kubeClient, name, isTerraformProvider)
 }
 
 // ApplicationDeployTarget is the struct of application deploy target
@@ -265,7 +253,7 @@ func SyncConfigs(ctx context.Context, k8sClient client.Client, project string, t
 	var secrets v1.SecretList
 	if err := k8sClient.List(ctx, &secrets, client.InNamespace(types.DefaultKubeVelaNS),
 		client.MatchingLabels{
-			types.LabelConfigCatalog:            velaCoreConfig,
+			types.LabelConfigCatalog:            types.VelaCoreConfig,
 			types.LabelConfigSyncToMultiCluster: "true",
 		}); err != nil {
 		return err
@@ -324,7 +312,7 @@ func SyncConfigs(ctx context.Context, k8sClient client.Client, project string, t
 				Namespace: types.DefaultKubeVelaNS,
 				Labels: map[string]string{
 					model.LabelSourceOfTruth: model.FromInner,
-					types.LabelConfigCatalog: velaCoreConfig,
+					types.LabelConfigCatalog: types.VelaCoreConfig,
 					types.LabelConfigProject: project,
 				},
 			},

pkg/apiserver/rest/usecase/config_test.go

@@ -22,8 +22,11 @@ import (
 	"sort"
 	"strings"
 	"testing"
+	"time"
 
 	. "github.com/agiledragon/gomonkey/v2"
+	terraformtypes "github.com/oam-dev/terraform-controller/api/types"
+	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta1"
 	"gotest.tools/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -32,6 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
+	"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/model"
@@ -53,7 +57,7 @@ func TestListConfigTypes(t *testing.T) {
 			Name:      "def1",
 			Namespace: types.DefaultKubeVelaNS,
 			Labels: map[string]string{
-				definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig,
+				definition.UserPrefix + "catalog.config.oam.dev": types.VelaCoreConfig,
 				definitionType: types.TerraformProvider,
 			},
 		},
@@ -70,7 +74,7 @@ func TestListConfigTypes(t *testing.T) {
 				definitionAlias: "Def2",
 			},
 			Labels: map[string]string{
-				definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig,
+				definition.UserPrefix + "catalog.config.oam.dev": types.VelaCoreConfig,
 			},
 		},
 	}
@@ -150,7 +154,7 @@ func TestGetConfigType(t *testing.T) {
 				definitionAlias: "Def2",
 			},
 			Labels: map[string]string{
-				definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig,
+				definition.UserPrefix + "catalog.config.oam.dev": types.VelaCoreConfig,
 			},
 		},
 	}
@@ -285,37 +289,53 @@ func TestGetConfigs(t *testing.T) {
 	s := runtime.NewScheme()
 	v1beta1.AddToScheme(s)
 	corev1.AddToScheme(s)
-	def1 := &v1beta1.ComponentDefinition{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ComponentDefinition",
-			APIVersion: "core.oam.dev/v1beta1",
-		},
+	terraformapi.AddToScheme(s)
+	createdTime, _ := time.Parse(time.UnixDate, "Wed Apr 7 11:06:39 PST 2022")
+
+	provider1 := &terraformapi.Provider{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "def1",
-			Namespace: types.DefaultKubeVelaNS,
-			Labels: map[string]string{
-				definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig,
-				definitionType: types.TerraformProvider,
-			},
+			Name:              "provider1",
+			Namespace:         "default",
+			CreationTimestamp: metav1.NewTime(createdTime),
+		},
+		Status: terraformapi.ProviderStatus{
+			State: terraformtypes.ProviderIsReady,
 		},
 	}
-	def2 := &v1beta1.ComponentDefinition{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ComponentDefinition",
-			APIVersion: "core.oam.dev/v1beta1",
-		},
+
+	provider2 := &terraformapi.Provider{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "def2",
-			Namespace: types.DefaultKubeVelaNS,
-			Annotations: map[string]string{
-				definitionAlias: "Def2",
-			},
-			Labels: map[string]string{
-				definition.UserPrefix + "catalog.config.oam.dev": velaCoreConfig,
-			},
+			Name:              "provider2",
+			Namespace:         "default",
+			CreationTimestamp: metav1.NewTime(createdTime),
+		},
+		Status: terraformapi.ProviderStatus{
+			State: terraformtypes.ProviderIsNotReady,
 		},
 	}
-	k8sClient := fake.NewClientBuilder().WithScheme(s).WithObjects(def1, def2).Build()
+
+	provider3 := &terraformapi.Provider{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "provider3",
+			Namespace: "default",
+		},
+	}
+
+	app1 := &v1beta1.Application{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "provider3",
+			Namespace: types.DefaultKubeVelaNS,
+			Labels: map[string]string{
+				types.LabelConfigType: "terraform-alibaba",
+			},
+			CreationTimestamp: metav1.NewTime(createdTime),
+		},
+		Status: common.AppStatus{
+			Phase: common.ApplicationRendering,
+		},
+	}
+
+	k8sClient := fake.NewClientBuilder().WithScheme(s).WithObjects(provider1, provider2, provider3, app1).Build()
 
 	h := &configUseCaseImpl{kubeClient: k8sClient}
 
@@ -343,7 +363,25 @@ func TestGetConfigs(t *testing.T) {
 				h:          h,
 			},
 			want: want{
-				configs: nil,
+				configs: []*apis.Config{
+					{
+						Name:        "provider1",
+						CreatedTime: &createdTime,
+						Status:      "Ready",
+					},
+					{
+						Name:        "provider2",
+						CreatedTime: &createdTime,
+						Status:      "Not ready",
+					},
+					{
+						Name:              "provider3",
+						CreatedTime:       &createdTime,
+						Status:            "Not ready",
+						ConfigType:        "terraform-alibaba",
+						ApplicationStatus: common.ApplicationRendering,
+					},
+				},
 			},
 		},
 	}
@@ -519,7 +557,7 @@ func TestSyncConfigs(t *testing.T) {
 			Name:      "s1",
 			Namespace: types.DefaultKubeVelaNS,
 			Labels: map[string]string{
-				types.LabelConfigCatalog:            velaCoreConfig,
+				types.LabelConfigCatalog:            types.VelaCoreConfig,
 				types.LabelConfigProject:            "p1",
 				types.LabelConfigSyncToMultiCluster: "true",
 			},
@@ -604,3 +642,129 @@ func TestSyncConfigs(t *testing.T) {
 		})
 	}
 }
+
+func TestDeleteConfig(t *testing.T) {
+	s := runtime.NewScheme()
+	v1beta1.AddToScheme(s)
+	corev1.AddToScheme(s)
+	terraformapi.AddToScheme(s)
+	provider1 := &terraformapi.Provider{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "p1",
+			Namespace: "default",
+		},
+	}
+
+	provider2 := &terraformapi.Provider{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "p2",
+			Namespace: "default",
+		},
+	}
+
+	provider3 := &terraformapi.Provider{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "p3",
+			Namespace: "default",
+		},
+	}
+
+	app1 := &v1beta1.Application{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "config-terraform-provider-p1",
+			Namespace: types.DefaultKubeVelaNS,
+			Labels: map[string]string{
+				types.LabelConfigType: "terraform-alibaba",
+			},
+		},
+	}
+
+	app2 := &v1beta1.Application{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "p2",
+			Namespace: types.DefaultKubeVelaNS,
+			Labels: map[string]string{
+				types.LabelConfigType: "terraform-alibaba",
+			},
+		},
+	}
+
+	normalApp := &v1beta1.Application{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "a9",
+			Namespace: types.DefaultKubeVelaNS,
+		},
+	}
+
+	k8sClient := fake.NewClientBuilder().WithScheme(s).WithObjects(provider1, provider2, provider3, app1, app2, normalApp).Build()
+
+	h := &configUseCaseImpl{kubeClient: k8sClient}
+
+	type args struct {
+		configType string
+		name       string
+		h          ConfigHandler
+	}
+
+	type want struct {
+		errMsg string
+	}
+
+	ctx := context.Background()
+
+	testcases := []struct {
+		name string
+		args args
+		want want
+	}{
+		{
+			name: "delete a legacy terraform provider",
+			args: args{
+				configType: "terraform-alibaba",
+				name:       "p1",
+				h:          h,
+			},
+			want: want{},
+		},
+		{
+			name: "delete a terraform provider",
+			args: args{
+				configType: "terraform-alibaba",
+				name:       "p2",
+				h:          h,
+			},
+			want: want{},
+		},
+		{
+			name: "delete a terraform provider, but its application not found",
+			args: args{
+				configType: "terraform-alibaba",
+				name:       "p3",
+				h:          h,
+			},
+			want: want{
+				errMsg: "could not be disabled because it was created by enabling a Terraform provider or was manually created",
+			},
+		},
+		{
+			name: "delete a normal config, but failed",
+			args: args{
+				configType: "config-image-registry",
+				name:       "a10",
+				h:          h,
+			},
+			want: want{
+				errMsg: "not found",
+			},
+		},
+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := tc.args.h.DeleteConfig(ctx, tc.args.configType, tc.args.name)
+			if tc.want.errMsg != "" || err != nil {
+				assert.ErrorContains(t, err, tc.want.errMsg)
+			}
+		})
+	}
+}

pkg/apiserver/rest/usecase/definition.go

@@ -190,7 +190,7 @@ func (d *definitionUsecaseImpl) listDefinitions(ctx context.Context, list *unstr
 
 // DetailDefinition get definition detail
 func (d *definitionUsecaseImpl) DetailDefinition(ctx context.Context, name, defType string) (*apisv1.DetailDefinitionResponse, error) {
-	if !utils.StringsContain([]string{"component", "trait", "workflowstep", "policy"}, defType) {
+	if !utils.StringsContain([]string{"component", "trait", "workflowstep"}, defType) {
 		return nil, bcode.ErrDefinitionTypeNotSupport
 	}
 	var cm v1.ConfigMap

pkg/apiserver/rest/usecase/helm.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"strconv"
 
+	"github.com/oam-dev/kubevela/pkg/utils/config"
+
 	"github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/apiserver/clients"
 	"github.com/oam-dev/kubevela/pkg/apiserver/log"
@@ -31,7 +33,6 @@ import (
 	"github.com/oam-dev/kubevela/pkg/utils/helm"
 
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types2 "k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -133,41 +134,20 @@ func (d defaultHelmHandler) ListChartRepo(ctx context.Context, projectName strin
 	var res []*v1.ChartRepoResponse
 	var err error
 
-	if len(projectName) != 0 {
-		projectSecrets := corev1.SecretList{}
-		opts := []client.ListOption{
-			client.MatchingLabels{oam.LabelConfigType: "config-helm-repository", types.LabelConfigProject: projectName},
-			client.InNamespace(types.DefaultKubeVelaNS),
-		}
-		err = d.k8sClient.List(ctx, &projectSecrets, opts...)
-		if err != nil {
-			return nil, err
-		}
-
-		for _, item := range projectSecrets.Items {
-			res = append(res, &v1.ChartRepoResponse{URL: string(item.Data["url"]), SecretName: item.Name})
-		}
+	projectSecrets := corev1.SecretList{}
+	opts := []client.ListOption{
+		client.MatchingLabels{oam.LabelConfigType: "config-helm-repository"},
+		client.InNamespace(types.DefaultKubeVelaNS),
 	}
-
-	globalSecrets := corev1.SecretList{}
-	selector := metav1.LabelSelector{
-		MatchLabels: map[string]string{oam.LabelConfigType: "config-helm-repository"},
-		MatchExpressions: []metav1.LabelSelectorRequirement{
-			{Key: types.LabelConfigProject, Operator: metav1.LabelSelectorOpDoesNotExist},
-		},
-	}
-
-	ls, _ := metav1.LabelSelectorAsSelector(&selector)
-	err = d.k8sClient.List(ctx, &globalSecrets, &client.ListOptions{
-		LabelSelector: ls,
-		Namespace:     types.DefaultKubeVelaNS,
-	})
+	err = d.k8sClient.List(ctx, &projectSecrets, opts...)
 	if err != nil {
 		return nil, err
 	}
 
-	for _, item := range globalSecrets.Items {
-		res = append(res, &v1.ChartRepoResponse{URL: string(item.Data["url"]), SecretName: item.Name})
+	for _, item := range projectSecrets.Items {
+		if config.ProjectMatched(item.DeepCopy(), projectName) {
+			res = append(res, &v1.ChartRepoResponse{URL: string(item.Data["url"]), SecretName: item.Name})
+		}
 	}
 
 	return &v1.ChartRepoResponseList{ChartRepoResponse: res}, nil

pkg/apiserver/rest/usecase/helm_test.go

@@ -338,6 +338,7 @@ kind: Secret
 metadata:
   labels:
     config.oam.dev/type: config-helm-repository
+    config.oam.dev/project: ""
   name: global-helm-repo
   namespace: vela-system
 type: Opaque

pkg/apiserver/rest/usecase/project.go

@@ -487,7 +487,7 @@ func (p *projectUsecaseImpl) GetConfigs(ctx context.Context, projectName, config
 	if err := p.k8sClient.List(ctx, apps, client.InNamespace(types.DefaultKubeVelaNS),
 		client.MatchingLabels{
 			model.LabelSourceOfTruth: model.FromInner,
-			types.LabelConfigCatalog: velaCoreConfig,
+			types.LabelConfigCatalog: types.VelaCoreConfig,
 		}); err != nil {
 		return nil, err
 	}
@@ -499,7 +499,7 @@ func (p *projectUsecaseImpl) GetConfigs(ctx context.Context, projectName, config
 			return nil, err
 		}
 		for _, p := range providers.Items {
-			if p.Labels[types.LabelConfigCatalog] == velaCoreConfig {
+			if p.Labels[types.LabelConfigCatalog] == types.VelaCoreConfig {
 				continue
 			}
 			t := p.CreationTimestamp.Time
@@ -520,7 +520,7 @@ func (p *projectUsecaseImpl) GetConfigs(ctx context.Context, projectName, config
 		for _, a := range apps.Items {
 			appProject := a.Labels[types.LabelConfigProject]
 			if a.Status.Phase != common.ApplicationRunning || (appProject != "" && appProject != projectName) ||
-				!strings.Contains(a.Labels[types.LabelConfigType], types.TerrfaormComponentPrefix) {
+				!strings.Contains(a.Labels[types.LabelConfigType], types.TerraformComponentPrefix) {
 				continue
 			}
 			configs = append(configs, retrieveConfigFromApplication(a, appProject))
@@ -561,13 +561,6 @@ func (p *projectUsecaseImpl) GetConfigs(ctx context.Context, projectName, config
 				configs[i].ConfigTypeAlias = d.Annotations[definitionAlias]
 			}
 		}
-		if c.ApplicationStatus != "" {
-			if c.ApplicationStatus == common.ApplicationRunning {
-				configs[i].Status = configIsReady
-			} else {
-				configs[i].Status = configIsNotReady
-			}
-		}
 	}
 	return configs, nil
 }
@@ -600,12 +593,22 @@ func ConvertProjectUserModel2Base(user *model.ProjectUser) *apisv1.ProjectUserBa
 }
 
 func retrieveConfigFromApplication(a v1beta1.Application, project string) *apisv1.Config {
+	var (
+		applicationStatus = a.Status.Phase
+		status            string
+	)
+	if applicationStatus == common.ApplicationRunning {
+		status = configIsReady
+	} else {
+		status = configIsNotReady
+	}
 	return &apisv1.Config{
 		ConfigType:        a.Labels[types.LabelConfigType],
 		Name:              a.Name,
 		Project:           project,
 		CreatedTime:       &(a.CreationTimestamp.Time),
-		ApplicationStatus: a.Status.Phase,
+		ApplicationStatus: applicationStatus,
+		Status:            status,
 		Alias:             a.Annotations[types.AnnotationConfigAlias],
 		Description:       a.Annotations[types.AnnotationConfigDescription],
 	}

pkg/apiserver/rest/usecase/project_test.go

@@ -293,7 +293,7 @@ func TestProjectGetConfigs(t *testing.T) {
 			Namespace: velatypes.DefaultKubeVelaNS,
 			Labels: map[string]string{
 				model.LabelSourceOfTruth:     model.FromInner,
-				velatypes.LabelConfigCatalog: velaCoreConfig,
+				velatypes.LabelConfigCatalog: velatypes.VelaCoreConfig,
 				velatypes.LabelConfigType:    "terraform-provider",
 				"config.oam.dev/project":     "p1",
 			},
@@ -308,7 +308,7 @@ func TestProjectGetConfigs(t *testing.T) {
 			Namespace: velatypes.DefaultKubeVelaNS,
 			Labels: map[string]string{
 				model.LabelSourceOfTruth:     model.FromInner,
-				velatypes.LabelConfigCatalog: velaCoreConfig,
+				velatypes.LabelConfigCatalog: velatypes.VelaCoreConfig,
 				velatypes.LabelConfigType:    "terraform-provider",
 			},
 			CreationTimestamp: metav1.NewTime(createdTime),
@@ -322,7 +322,7 @@ func TestProjectGetConfigs(t *testing.T) {
 			Namespace: velatypes.DefaultKubeVelaNS,
 			Labels: map[string]string{
 				model.LabelSourceOfTruth:     model.FromInner,
-				velatypes.LabelConfigCatalog: velaCoreConfig,
+				velatypes.LabelConfigCatalog: velatypes.VelaCoreConfig,
 				velatypes.LabelConfigType:    "dex-connector",
 				"config.oam.dev/project":     "p3",
 			},
@@ -347,7 +347,7 @@ func TestProjectGetConfigs(t *testing.T) {
 			Name:      "provider2",
 			Namespace: "default",
 			Labels: map[string]string{
-				velatypes.LabelConfigCatalog: velaCoreConfig,
+				velatypes.LabelConfigCatalog: velatypes.VelaCoreConfig,
 			},
 		},
 		Status: terraformapi.ProviderStatus{

pkg/apiserver/rest/webservice/webservice.go

@@ -22,11 +22,11 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/emicklei/go-restful/v3"
+
 	"github.com/oam-dev/kubevela/pkg/apiserver/datastore"
 	apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/rest/apis/v1"
 	"github.com/oam-dev/kubevela/pkg/apiserver/rest/usecase"
-
-	"github.com/emicklei/go-restful/v3"
 )
 
 // versionPrefix API version prefix.

pkg/appfile/appfile.go

@@ -27,7 +27,7 @@ import (
 	"cuelang.org/go/cue/format"
 	json2cue "cuelang.org/go/encoding/json"
 	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
-	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta1"
+	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta2"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -63,7 +63,9 @@ const (
 	// WriteConnectionSecretToRefKey is used to create a secret for cloud resource connection
 	WriteConnectionSecretToRefKey = "writeConnectionSecretToRef"
 	// RegionKey is the region of a Cloud Provider
-	RegionKey = "region"
+	// It's used to override the region of a Cloud Provider
+	// Refer to https://github.com/oam-dev/terraform-controller/blob/master/api/v1beta2/configuration_types.go#L66 for details
+	RegionKey = "customRegion"
 	// ProviderRefKey is the reference of a Provider
 	ProviderRefKey = "providerRef"
 )
@@ -182,8 +184,6 @@ type Appfile struct {
 
 	parser *Parser
 	app    *v1beta1.Application
-
-	Debug bool
 }
 
 // GeneratePolicyManifests generates policy manifests from an appFile
@@ -668,7 +668,7 @@ func generateTerraformConfigurationWorkload(wl *Workload, ns string) (*unstructu
 	}
 
 	configuration := terraformapi.Configuration{
-		TypeMeta: metav1.TypeMeta{APIVersion: "terraform.core.oam.dev/v1beta1", Kind: "Configuration"},
+		TypeMeta: metav1.TypeMeta{APIVersion: "terraform.core.oam.dev/v1beta2", Kind: "Configuration"},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      wl.Name,
 			Namespace: ns,
@@ -681,8 +681,6 @@ func generateTerraformConfigurationWorkload(wl *Workload, ns string) (*unstructu
 	switch wl.FullTemplate.Terraform.Type {
 	case "hcl":
 		configuration.Spec.HCL = wl.FullTemplate.Terraform.Configuration
-	case "json":
-		configuration.Spec.JSON = wl.FullTemplate.Terraform.Configuration
 	case "remote":
 		configuration.Spec.Remote = wl.FullTemplate.Terraform.Configuration
 		configuration.Spec.Path = wl.FullTemplate.Terraform.Path

pkg/appfile/appfile_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/test"
 	"github.com/google/go-cmp/cmp"
 	terraformtypes "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
-	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta1"
+	terraformapi "github.com/oam-dev/terraform-controller/api/v1beta2"
 	"github.com/pkg/errors"
 	"gotest.tools/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -584,10 +584,6 @@ variable "password" {
 		raw.Raw = data
 
 		workload := terraformapi.Configuration{
-			TypeMeta: metav1.TypeMeta{
-				APIVersion: "terraform.core.oam.dev/v1beta1",
-				Kind:       "Configuration",
-			},
 			ObjectMeta: metav1.ObjectMeta{
 				Labels: map[string]string{
 					"app.oam.dev/appRevision": "v1",
@@ -902,7 +898,6 @@ func TestGenerateTerraformConfigurationWorkload(t *testing.T) {
 
 	type args struct {
 		writeConnectionSecretToRef *terraformtypes.SecretReference
-		json                       string
 		hcl                        string
 		remote                     string
 		params                     map[string]interface{}
@@ -917,16 +912,6 @@ func TestGenerateTerraformConfigurationWorkload(t *testing.T) {
 		args args
 		want want
 	}{
-		"json workload with secret": {
-			args: args{
-
-				json: "abc",
-				params: map[string]interface{}{"acl": "private",
-					"writeConnectionSecretToRef": map[string]interface{}{"name": "oss", "namespace": ""}},
-				writeConnectionSecretToRef: &terraformtypes.SecretReference{Name: "oss", Namespace: "default"},
-			},
-			want: want{err: nil}},
-
 		"valid hcl workload": {
 			args: args{
 				hcl: "abc",
@@ -999,19 +984,6 @@ func TestGenerateTerraformConfigurationWorkload(t *testing.T) {
 			}
 			configSpec.WriteConnectionSecretToReference = tc.args.writeConnectionSecretToRef
 		}
-		if tc.args.json != "" {
-			template = &Template{
-				Terraform: &common.Terraform{
-					Configuration: tc.args.json,
-					Type:          "json",
-				},
-			}
-			configSpec = terraformapi.ConfigurationSpec{
-				JSON:     tc.args.json,
-				Variable: raw,
-			}
-			configSpec.WriteConnectionSecretToReference = tc.args.writeConnectionSecretToRef
-		}
 		if tc.args.remote != "" {
 			template = &Template{
 				Terraform: &common.Terraform{
@@ -1025,7 +997,7 @@ func TestGenerateTerraformConfigurationWorkload(t *testing.T) {
 			}
 			configSpec.WriteConnectionSecretToReference = tc.args.writeConnectionSecretToRef
 		}
-		if tc.args.hcl == "" && tc.args.json == "" && tc.args.remote == "" {
+		if tc.args.hcl == "" && tc.args.remote == "" {
 			template = &Template{
 				Terraform: &common.Terraform{},
 			}
@@ -1061,7 +1033,7 @@ func TestGenerateTerraformConfigurationWorkload(t *testing.T) {
 
 		if err == nil {
 			tfConfiguration := terraformapi.Configuration{
-				TypeMeta:   metav1.TypeMeta{APIVersion: "terraform.core.oam.dev/v1beta1", Kind: "Configuration"},
+				TypeMeta:   metav1.TypeMeta{APIVersion: "terraform.core.oam.dev/v1beta2", Kind: "Configuration"},
 				ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
 				Spec:       configSpec,
 			}

pkg/appfile/parser.go

@@ -288,6 +288,30 @@ func (p *Parser) GenerateAppFileFromRevision(appRev *v1beta1.ApplicationRevision
 	for k, v := range appRev.Spec.WorkflowStepDefinitions {
 		appfile.RelatedWorkflowStepDefinitions[k] = v.DeepCopy()
 	}
+
+	// add compatible code for upgrading to v1.3 as the workflow steps were not recorded before v1.2
+	if len(appfile.RelatedWorkflowStepDefinitions) == 0 && len(appfile.WorkflowSteps) > 0 {
+		ctx := context.Background()
+		for _, workflowStep := range appfile.WorkflowSteps {
+			if wftypes.IsBuiltinWorkflowStepType(workflowStep.Type) {
+				continue
+			}
+			if _, found := appfile.RelatedWorkflowStepDefinitions[workflowStep.Type]; found {
+				continue
+			}
+			def := &v1beta1.WorkflowStepDefinition{}
+			if err := util.GetCapabilityDefinition(ctx, p.client, def, workflowStep.Type); err != nil {
+				return nil, errors.Wrapf(err, "failed to get workflow step definition %s", workflowStep.Type)
+			}
+			appfile.RelatedWorkflowStepDefinitions[workflowStep.Type] = def
+		}
+
+		appRev.Spec.WorkflowStepDefinitions = make(map[string]v1beta1.WorkflowStepDefinition)
+		for name, def := range appfile.RelatedWorkflowStepDefinitions {
+			appRev.Spec.WorkflowStepDefinitions[name] = *def
+		}
+	}
+
 	for k, v := range appRev.Spec.ScopeDefinitions {
 		appfile.RelatedScopeDefinitions[k] = v.DeepCopy()
 	}
@@ -345,8 +369,6 @@ func (p *Parser) parsePoliciesFromRevision(ctx context.Context, af *Appfile) (er
 		case v1alpha1.EnvBindingPolicyType:
 		case v1alpha1.TopologyPolicyType:
 		case v1alpha1.OverridePolicyType:
-		case v1alpha1.DebugPolicyType:
-			af.Debug = true
 		default:
 			w, err := p.makeWorkloadFromRevision(policy.Name, policy.Type, types.TypePolicy, policy.Properties, af.AppRevision)
 			if err != nil {
@@ -369,8 +391,6 @@ func (p *Parser) parsePolicies(ctx context.Context, af *Appfile) (err error) {
 		case v1alpha1.ApplyOncePolicyType:
 		case v1alpha1.EnvBindingPolicyType:
 		case v1alpha1.TopologyPolicyType:
-		case v1alpha1.DebugPolicyType:
-			af.Debug = true
 		case v1alpha1.OverridePolicyType:
 			compDefs, traitDefs, err := policypkg.ParseOverridePolicyRelatedDefinitions(ctx, p.client, af.app, policy)
 			if err != nil {

pkg/appfile/parser_test.go

@@ -22,6 +22,8 @@ import (
 	"reflect"
 	"strings"
 
+	common2 "github.com/oam-dev/kubevela/pkg/utils/common"
+
 	"github.com/google/go-cmp/cmp"
 
 	"github.com/crossplane/crossplane-runtime/pkg/test"
@@ -506,3 +508,202 @@ var _ = Describe("Test appFile parser", func() {
 	})
 
 })
+
+var _ = Describe("Test application parser", func() {
+	var app v1beta1.Application
+	var apprev v1beta1.ApplicationRevision
+	var wsd v1beta1.WorkflowStepDefinition
+	var expectedExceptAppfile *Appfile
+	var mockClient test.MockClient
+
+	BeforeEach(func() {
+		// prepare WorkflowStepDefinition
+		Expect(common2.ReadYamlToObject("testdata/backport-1-2/wsd.yaml", &wsd)).Should(BeNil())
+
+		// prepare verify data
+		expectedExceptAppfile = &Appfile{
+			Name: "backport-1-2-test-demo",
+			Workloads: []*Workload{
+				{
+					Name: "backport-1-2-test-demo",
+					Type: "webservice",
+					Params: map[string]interface{}{
+						"image": "nginx",
+					},
+					FullTemplate: &Template{
+						TemplateStr: `
+      output: {
+        apiVersion: "apps/v1"
+      	kind:       "Deployment"
+      	spec: {
+      		selector: matchLabels: {
+      			"app.oam.dev/component": context.name
+      		}
+      
+      		template: {
+      			metadata: labels: {
+      				"app.oam.dev/component": context.name
+      			}
+      
+      			spec: {
+      				containers: [{
+      					name:  context.name
+      					image: parameter.image
+      
+      					if parameter["cmd"] != _|_ {
+      						command: parameter.cmd
+      					}
+      				}]
+      			}
+      		}
+      
+      		selector:
+      			matchLabels:
+      				"app.oam.dev/component": context.name
+      	}
+      }
+      
+      parameter: {
+      	// +usage=Which image would you like to use for your service
+      	// +short=i
+      	image: string
+      
+      	cmd?: [...string]
+      }`,
+					},
+					Traits: []*Trait{
+						{
+							Name: "scaler",
+							Params: map[string]interface{}{
+								"replicas": float64(1),
+							},
+							Template: `
+parameter: {
+	// +usage=Specify the number of workload
+	replicas: *1 | int
+}
+// +patchStrategy=retainKeys
+patch: spec: replicas: parameter.replicas
+
+`,
+						},
+					},
+				},
+			},
+			WorkflowSteps: []v1beta1.WorkflowStep{
+				{
+					Name: "apply",
+					Type: "apply-application",
+				},
+			},
+		}
+
+		// Create mock client
+		mockClient = test.MockClient{
+			MockGet: func(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+				if strings.Contains(key.Name, "unknown") {
+					return &errors2.StatusError{ErrStatus: metav1.Status{Reason: "NotFound", Message: "not found"}}
+				}
+				switch o := obj.(type) {
+				case *v1beta1.ComponentDefinition:
+					wd, err := util.UnMarshalStringToComponentDefinition(componenetDefinition)
+					if err != nil {
+						return err
+					}
+					*o = *wd
+				case *v1beta1.TraitDefinition:
+					td, err := util.UnMarshalStringToTraitDefinition(traitDefinition)
+					if err != nil {
+						return err
+					}
+					*o = *td
+				case *v1beta1.WorkflowStepDefinition:
+					*o = wsd
+				case *v1beta1.ApplicationRevision:
+					*o = apprev
+				default:
+					// skip
+				}
+				return nil
+			},
+		}
+	})
+
+	When("with apply-application workflowStep", func() {
+		BeforeEach(func() {
+			// prepare application
+			Expect(common2.ReadYamlToObject("testdata/backport-1-2/app.yaml", &app)).Should(BeNil())
+			// prepare application revision
+			Expect(common2.ReadYamlToObject("testdata/backport-1-2/apprev1.yaml", &apprev)).Should(BeNil())
+		})
+
+		It("Test we can parse an application revision to an appFile 1", func() {
+
+			appfile, err := NewApplicationParser(&mockClient, dm, pd).GenerateAppFile(context.TODO(), &app)
+			Expect(err).ShouldNot(HaveOccurred())
+			Expect(equal(expectedExceptAppfile, appfile)).Should(BeTrue())
+			Expect(len(appfile.WorkflowSteps) > 0 &&
+				len(appfile.RelatedWorkflowStepDefinitions) == len(appfile.AppRevision.Spec.WorkflowStepDefinitions)).Should(BeTrue())
+
+			Expect(len(appfile.WorkflowSteps) > 0 && func() bool {
+				this := appfile.RelatedWorkflowStepDefinitions
+				that := appfile.AppRevision.Spec.WorkflowStepDefinitions
+				for i, w := range this {
+					thatW := that[i]
+					if !reflect.DeepEqual(*w, thatW) {
+						fmt.Printf("appfile wsd:%s apprev wsd%s", (*w).Name, thatW.Name)
+						return false
+					}
+				}
+				return true
+			}()).Should(BeTrue())
+		})
+	})
+
+	When("with apply-application and apply-component build-in workflowStep", func() {
+		BeforeEach(func() {
+			// prepare application
+			Expect(common2.ReadYamlToObject("testdata/backport-1-2/app.yaml", &app)).Should(BeNil())
+			// prepare application revision
+			Expect(common2.ReadYamlToObject("testdata/backport-1-2/apprev2.yaml", &apprev)).Should(BeNil())
+		})
+
+		It("Test we can parse an application revision to an appFile 2", func() {
+
+			appfile, err := NewApplicationParser(&mockClient, dm, pd).GenerateAppFile(context.TODO(), &app)
+			Expect(err).ShouldNot(HaveOccurred())
+			Expect(equal(expectedExceptAppfile, appfile)).Should(BeTrue())
+			Expect(len(appfile.WorkflowSteps) > 0 &&
+				len(appfile.RelatedWorkflowStepDefinitions) == len(appfile.AppRevision.Spec.WorkflowStepDefinitions)).Should(BeTrue())
+
+			Expect(len(appfile.WorkflowSteps) > 0 && func() bool {
+				this := appfile.RelatedWorkflowStepDefinitions
+				that := appfile.AppRevision.Spec.WorkflowStepDefinitions
+				for i, w := range this {
+					thatW := that[i]
+					if !reflect.DeepEqual(*w, thatW) {
+						fmt.Printf("appfile wsd:%s apprev wsd%s", (*w).Name, thatW.Name)
+						return false
+					}
+				}
+				return true
+			}()).Should(BeTrue())
+		})
+	})
+
+	When("with unknown workflowStep", func() {
+		BeforeEach(func() {
+			// prepare application
+			Expect(common2.ReadYamlToObject("testdata/backport-1-2/app.yaml", &app)).Should(BeNil())
+			// prepare application revision
+			Expect(common2.ReadYamlToObject("testdata/backport-1-2/apprev3.yaml", &apprev)).Should(BeNil())
+		})
+
+		It("Test we can parse an application revision to an appFile 3", func() {
+
+			_, err := NewApplicationParser(&mockClient, dm, pd).GenerateAppFile(context.TODO(), &app)
+			Expect(err).Should(HaveOccurred())
+			Expect(err.Error() == "failed to get workflow step definition apply-application-unknown: not found").Should(BeTrue())
+		})
+	})
+})

pkg/appfile/testdata/backport-1-2/app.yaml

@@ -0,0 +1,26 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  annotations:
+    app.oam.dev/publishVersion: workflow-default-123456
+  name: backport-1-2-test-demo
+  namespace: default
+spec:
+  components:
+    - name: backport-1-2-test-demo
+      properties:
+        image: nginx
+      traits:
+        - properties:
+            replicas: 1
+          type: scaler
+      type: webservice
+  workflow:
+    steps:
+      - name: apply
+        type: apply-application
+status:
+  latestRevision:
+    name: backport-1-2-test-demo-v1
+    revision: 1
+    revisionHash: 38ddf4e721073703

pkg/appfile/testdata/backport-1-2/apprev1.yaml

@@ -0,0 +1,271 @@
+apiVersion: core.oam.dev/v1beta1
+kind: ApplicationRevision
+metadata:
+  annotations:
+    app.oam.dev/publishVersion: workflow-default-123456
+  name: backport-1-2-test-demo-v1
+  namespace: default
+spec:
+  application:
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        app.oam.dev/publishVersion: workflow-default-123456
+      name: backport-1-2-test-demo
+      namespace: default
+    spec:
+      components:
+        - name: backport-1-2-test-demo
+          properties:
+            image: nginx
+          traits:
+            - properties:
+                replicas: 1
+              type: scaler
+          type: webservice
+      workflow:
+        steps:
+          - name: apply
+            type: apply-application
+    status: {}
+  componentDefinitions:
+    webservice:
+      apiVersion: core.oam.dev/v1beta1
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Describes long-running, scalable, containerized
+            services that have a stable network endpoint to receive external network
+            traffic from customers.
+          meta.helm.sh/release-name: kubevela
+          meta.helm.sh/release-namespace: vela-system
+        labels:
+          app.kubernetes.io/managed-by: Helm
+        name: webservice
+        namespace: vela-system
+      spec:
+        schematic:
+          cue:
+            template: "import (\n\t\"strconv\"\n)\n\nmountsArray: {\n\tpvc: *[\n\t\tfor
+              v in parameter.volumeMounts.pvc {\n\t\t\t{\n\t\t\t\tmountPath: v.mountPath\n\t\t\t\tname:
+              \     v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\tconfigMap: *[\n\t\t\tfor
+              v in parameter.volumeMounts.configMap {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\tsecret:
+              *[\n\t\tfor v in parameter.volumeMounts.secret {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\temptyDir:
+              *[\n\t\t\tfor v in parameter.volumeMounts.emptyDir {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\thostPath:
+              *[\n\t\t\tfor v in parameter.volumeMounts.hostPath {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n}\nvolumesArray:
+              {\n\tpvc: *[\n\t\tfor v in parameter.volumeMounts.pvc {\n\t\t\t{\n\t\t\t\tname:
+              v.name\n\t\t\t\tpersistentVolumeClaim: claimName: v.claimName\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\tconfigMap: *[\n\t\t\tfor v in parameter.volumeMounts.configMap
+              {\n\t\t\t{\n\t\t\t\tname: v.name\n\t\t\t\tconfigMap: {\n\t\t\t\t\tdefaultMode:
+              v.defaultMode\n\t\t\t\t\tname:        v.cmName\n\t\t\t\t\tif v.items
+              != _|_ {\n\t\t\t\t\t\titems: v.items\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\tsecret: *[\n\t\tfor v in parameter.volumeMounts.secret {\n\t\t\t{\n\t\t\t\tname:
+              v.name\n\t\t\t\tsecret: {\n\t\t\t\t\tdefaultMode: v.defaultMode\n\t\t\t\t\tsecretName:
+              \ v.secretName\n\t\t\t\t\tif v.items != _|_ {\n\t\t\t\t\t\titems: v.items\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\temptyDir: *[\n\t\t\tfor v in parameter.volumeMounts.emptyDir
+              {\n\t\t\t{\n\t\t\t\tname: v.name\n\t\t\t\temptyDir: medium: v.medium\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\thostPath: *[\n\t\t\tfor v in parameter.volumeMounts.hostPath
+              {\n\t\t\t{\n\t\t\t\tname: v.name\n\t\t\t\thostPath: path: v.path\n\t\t\t}\n\t\t},\n\t]
+              | []\n}\noutput: {\n\tapiVersion: \"apps/v1\"\n\tkind:       \"Deployment\"\n\tspec:
+              {\n\t\tselector: matchLabels: \"app.oam.dev/component\": context.name\n\n\t\ttemplate:
+              {\n\t\t\tmetadata: {\n\t\t\t\tlabels: {\n\t\t\t\t\tif parameter.labels
+              != _|_ {\n\t\t\t\t\t\tparameter.labels\n\t\t\t\t\t}\n\t\t\t\t\tif parameter.addRevisionLabel
+              {\n\t\t\t\t\t\t\"app.oam.dev/revision\": context.revision\n\t\t\t\t\t}\n\t\t\t\t\t\"app.oam.dev/component\":
+              context.name\n\t\t\t\t}\n\t\t\t\tif parameter.annotations != _|_ {\n\t\t\t\t\tannotations:
+              parameter.annotations\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tspec: {\n\t\t\t\tcontainers:
+              [{\n\t\t\t\t\tname:  context.name\n\t\t\t\t\timage: parameter.image\n\t\t\t\t\tif
+              parameter[\"port\"] != _|_ && parameter[\"ports\"] == _|_ {\n\t\t\t\t\t\tports:
+              [{\n\t\t\t\t\t\t\tcontainerPort: parameter.port\n\t\t\t\t\t\t}]\n\t\t\t\t\t}\n\t\t\t\t\tif
+              parameter[\"ports\"] != _|_ {\n\t\t\t\t\t\tports: [ for v in parameter.ports
+              {\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tcontainerPort: v.port\n\t\t\t\t\t\t\t\tprotocol:
+              \     v.protocol\n\t\t\t\t\t\t\t\tif v.name != _|_ {\n\t\t\t\t\t\t\t\t\tname:
+              v.name\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\tif v.name == _|_ {\n\t\t\t\t\t\t\t\t\tname:
+              \"port-\" + strconv.FormatInt(v.port, 10)\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}}]\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
+              parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"cmd\"]
+              != _|_ {\n\t\t\t\t\t\tcommand: parameter.cmd\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"env\"] != _|_ {\n\t\t\t\t\t\tenv: parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              context[\"config\"] != _|_ {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"cpu\"] != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits:
+              cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests: cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"memory\"] != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits:
+              memory:   parameter.memory\n\t\t\t\t\t\t\trequests: memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"volumes\"] != _|_ && parameter[\"volumeMounts\"] == _|_
+              {\n\t\t\t\t\t\tvolumeMounts: [ for v in parameter.volumes {\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\t\t\t\t\tname:      v.name\n\t\t\t\t\t\t\t}}]\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"volumeMounts\"] != _|_ {\n\t\t\t\t\t\tvolumeMounts: mountsArray.pvc
+              + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir
+              + mountsArray.hostPath\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"livenessProbe\"]
+              != _|_ {\n\t\t\t\t\t\tlivenessProbe: parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"readinessProbe\"] != _|_ {\n\t\t\t\t\t\treadinessProbe:
+              parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t}]\n\n\t\t\t\tif parameter[\"hostAliases\"]
+              != _|_ {\n\t\t\t\t\t// +patchKey=ip\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\n\t\t\t\tif
+              parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
+              [ for v in parameter.imagePullSecrets {\n\t\t\t\t\t\tname: v\n\t\t\t\t\t},\n\t\t\t\t\t]\n\t\t\t\t}\n\n\t\t\t\tif
+              parameter[\"volumes\"] != _|_ && parameter[\"volumeMounts\"] == _|_
+              {\n\t\t\t\t\tvolumes: [ for v in parameter.volumes {\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tname:
+              v.name\n\t\t\t\t\t\t\tif v.type == \"pvc\" {\n\t\t\t\t\t\t\t\tpersistentVolumeClaim:
+              claimName: v.claimName\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif v.type ==
+              \"configMap\" {\n\t\t\t\t\t\t\t\tconfigMap: {\n\t\t\t\t\t\t\t\t\tdefaultMode:
+              v.defaultMode\n\t\t\t\t\t\t\t\t\tname:        v.cmName\n\t\t\t\t\t\t\t\t\tif
+              v.items != _|_ {\n\t\t\t\t\t\t\t\t\t\titems: v.items\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif
+              v.type == \"secret\" {\n\t\t\t\t\t\t\t\tsecret: {\n\t\t\t\t\t\t\t\t\tdefaultMode:
+              v.defaultMode\n\t\t\t\t\t\t\t\t\tsecretName:  v.secretName\n\t\t\t\t\t\t\t\t\tif
+              v.items != _|_ {\n\t\t\t\t\t\t\t\t\t\titems: v.items\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif
+              v.type == \"emptyDir\" {\n\t\t\t\t\t\t\t\temptyDir: medium: v.medium\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}]\n\t\t\t\t}\n\n\t\t\t\tif
+              parameter[\"volumeMounts\"] != _|_ {\n\t\t\t\t\tvolumes: volumesArray.pvc
+              + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir
+              + volumesArray.hostPath\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\nexposePorts:
+              [\n\tfor v in parameter.ports if v.expose == true {\n\t\tport:       v.port\n\t\ttargetPort:
+              v.port\n\t\tif v.name != _|_ {\n\t\t\tname: v.name\n\t\t}\n\t\tif v.name
+              == _|_ {\n\t\t\tname: \"port-\" + strconv.FormatInt(v.port, 10)\n\t\t}\n\t},\n]\noutputs:
+              {\n\tif len(exposePorts) != 0 {\n\t\twebserviceExpose: {\n\t\t\tapiVersion:
+              \"v1\"\n\t\t\tkind:       \"Service\"\n\t\t\tmetadata: name: context.name\n\t\t\tspec:
+              {\n\t\t\t\tselector: \"app.oam.dev/component\": context.name\n\t\t\t\tports:
+              exposePorts\n\t\t\t\ttype:  parameter.exposeType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter:
+              {\n\t// +usage=Specify the labels in the workload\n\tlabels?: [string]:
+              string\n\n\t// +usage=Specify the annotations in the workload\n\tannotations?:
+              [string]: string\n\n\t// +usage=Which image would you like to use for
+              your service\n\t// +short=i\n\timage: string\n\n\t// +usage=Specify
+              image pull policy for your service\n\timagePullPolicy?: \"Always\" |
+              \"Never\" | \"IfNotPresent\"\n\n\t// +usage=Specify image pull secrets
+              for your service\n\timagePullSecrets?: [...string]\n\n\t// +ignore\n\t//
+              +usage=Deprecated field, please use ports instead\n\t// +short=p\n\tport?:
+              int\n\n\t// +usage=Which ports do you want customer traffic sent to,
+              defaults to 80\n\tports?: [...{\n\t\t// +usage=Number of port to expose
+              on the pod's IP address\n\t\tport: int\n\t\t// +usage=Name of the port\n\t\tname?:
+              string\n\t\t// +usage=Protocol for port. Must be UDP, TCP, or SCTP\n\t\tprotocol:
+              *\"TCP\" | \"UDP\" | \"SCTP\"\n\t\t// +usage=Specify if the port should
+              be exposed\n\t\texpose: *false | bool\n\t}]\n\n\t// +ignore\n\t// +usage=Specify
+              what kind of Service you want. options: \"ClusterIP\", \"NodePort\",
+              \"LoadBalancer\", \"ExternalName\"\n\texposeType: *\"ClusterIP\" | \"NodePort\"
+              | \"LoadBalancer\" | \"ExternalName\"\n\n\t// +ignore\n\t// +usage=If
+              addRevisionLabel is true, the revision label will be added to the underlying
+              pods\n\taddRevisionLabel: *false | bool\n\n\t// +usage=Commands to run
+              in the container\n\tcmd?: [...string]\n\n\t// +usage=Define arguments
+              by using environment variables\n\tenv?: [...{\n\t\t// +usage=Environment
+              variable name\n\t\tname: string\n\t\t// +usage=The value of the environment
+              variable\n\t\tvalue?: string\n\t\t// +usage=Specifies a source the value
+              of this var should come from\n\t\tvalueFrom?: {\n\t\t\t// +usage=Selects
+              a key of a secret in the pod's namespace\n\t\t\tsecretKeyRef?: {\n\t\t\t\t//
+              +usage=The name of the secret in the pod's namespace to select from\n\t\t\t\tname:
+              string\n\t\t\t\t// +usage=The key of the secret to select from. Must
+              be a valid secret key\n\t\t\t\tkey: string\n\t\t\t}\n\t\t\t// +usage=Selects
+              a key of a config map in the pod's namespace\n\t\t\tconfigMapKeyRef?:
+              {\n\t\t\t\t// +usage=The name of the config map in the pod's namespace
+              to select from\n\t\t\t\tname: string\n\t\t\t\t// +usage=The key of the
+              config map to select from. Must be a valid secret key\n\t\t\t\tkey:
+              string\n\t\t\t}\n\t\t}\n\t}]\n\n\t// +usage=Number of CPU units for
+              the service, like \n\tcpu?: string\n\n\t//
+              +usage=Specifies the attributes of the memory resource required for
+              the container.\n\tmemory?: string\n\n\tvolumeMounts?: {\n\t\t// +usage=Mount
+              PVC type volume\n\t\tpvc?: [...{\n\t\t\tname:      string\n\t\t\tmountPath:
+              string\n\t\t\t// +usage=The name of the PVC\n\t\t\tclaimName: string\n\t\t}]\n\t\t//
+              +usage=Mount ConfigMap type volume\n\t\tconfigMap?: [...{\n\t\t\tname:
+              \       string\n\t\t\tmountPath:   string\n\t\t\tdefaultMode: *420 |
+              int\n\t\t\tcmName:      string\n\t\t\titems?: [...{\n\t\t\t\tkey:  string\n\t\t\t\tpath:
+              string\n\t\t\t\tmode: *511 | int\n\t\t\t}]\n\t\t}]\n\t\t// +usage=Mount
+              Secret type volume\n\t\tsecret?: [...{\n\t\t\tname:        string\n\t\t\tmountPath:
+              \  string\n\t\t\tdefaultMode: *420 | int\n\t\t\tsecretName:  string\n\t\t\titems?:
+              [...{\n\t\t\t\tkey:  string\n\t\t\t\tpath: string\n\t\t\t\tmode: *511
+              | int\n\t\t\t}]\n\t\t}]\n\t\t// +usage=Mount EmptyDir type volume\n\t\temptyDir?:
+              [...{\n\t\t\tname:      string\n\t\t\tmountPath: string\n\t\t\tmedium:
+              \   *\"\" | \"Memory\"\n\t\t}]\n\t\t// +usage=Mount HostPath type volume\n\t\thostPath?:
+              [...{\n\t\t\tname:      string\n\t\t\tmountPath: string\n\t\t\tpath:
+              \     string\n\t\t}]\n\t}\n\n\t// +usage=Deprecated field, use volumeMounts
+              instead.\n\tvolumes?: [...{\n\t\tname:      string\n\t\tmountPath: string\n\t\t//
+              +usage=Specify volume type, options: \"pvc\",\"configMap\",\"secret\",\"emptyDir\"\n\t\ttype:
+              \"pvc\" | \"configMap\" | \"secret\" | \"emptyDir\"\n\t\tif type ==
+              \"pvc\" {\n\t\t\tclaimName: string\n\t\t}\n\t\tif type == \"configMap\"
+              {\n\t\t\tdefaultMode: *420 | int\n\t\t\tcmName:      string\n\t\t\titems?:
+              [...{\n\t\t\t\tkey:  string\n\t\t\t\tpath: string\n\t\t\t\tmode: *511
+              | int\n\t\t\t}]\n\t\t}\n\t\tif type == \"secret\" {\n\t\t\tdefaultMode:
+              *420 | int\n\t\t\tsecretName:  string\n\t\t\titems?: [...{\n\t\t\t\tkey:
+              \ string\n\t\t\t\tpath: string\n\t\t\t\tmode: *511 | int\n\t\t\t}]\n\t\t}\n\t\tif
+              type == \"emptyDir\" {\n\t\t\tmedium: *\"\" | \"Memory\"\n\t\t}\n\t}]\n\n\t//
+              +usage=Instructions for assessing whether the container is alive.\n\tlivenessProbe?:
+              #HealthProbe\n\n\t// +usage=Instructions for assessing whether the container
+              is in a suitable state to serve traffic.\n\treadinessProbe?: #HealthProbe\n\n\t//
+              +usage=Specify the hostAliases to add\n\thostAliases?: [...{\n\t\tip:
+              string\n\t\thostnames: [...string]\n\t}]\n}\n#HealthProbe: {\n\n\t//
+              +usage=Instructions for assessing container health by executing a command.
+              Either this attribute or the httpGet attribute or the tcpSocket attribute
+              MUST be specified. This attribute is mutually exclusive with both the
+              httpGet attribute and the tcpSocket attribute.\n\texec?: {\n\t\t// +usage=A
+              command to be executed inside the container to assess its health. Each
+              space delimited token of the command is a separate array element. Commands
+              exiting 0 are considered to be successful probes, whilst all other exit
+              codes are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
+              +usage=Instructions for assessing container health by executing an HTTP
+              GET request. Either this attribute or the exec attribute or the tcpSocket
+              attribute MUST be specified. This attribute is mutually exclusive with
+              both the exec attribute and the tcpSocket attribute.\n\thttpGet?: {\n\t\t//
+              +usage=The endpoint, relative to the port, to which the HTTP GET request
+              should be directed.\n\t\tpath: string\n\t\t// +usage=The TCP socket
+              within the container to which the HTTP GET request should be directed.\n\t\tport:
+              int\n\t\thttpHeaders?: [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
+              +usage=Instructions for assessing container health by probing a TCP
+              socket. Either this attribute or the exec attribute or the httpGet attribute
+              MUST be specified. This attribute is mutually exclusive with both the
+              exec attribute and the httpGet attribute.\n\ttcpSocket?: {\n\t\t// +usage=The
+              TCP socket within the container that should be probed to assess container
+              health.\n\t\tport: int\n\t}\n\n\t// +usage=Number of seconds after the
+              container is started before the first probe is initiated.\n\tinitialDelaySeconds:
+              *0 | int\n\n\t// +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
+              *10 | int\n\n\t// +usage=Number of seconds after which the probe times
+              out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
+              successes for the probe to be considered successful after having failed.\n\tsuccessThreshold:
+              *1 | int\n\n\t// +usage=Number of consecutive failures required to determine
+              the container is not alive (liveness probe) or not ready (readiness
+              probe).\n\tfailureThreshold: *3 | int\n}\n"
+        status:
+          customStatus: "ready: {\n\treadyReplicas: *0 | int\n} & {\n\tif context.output.status.readyReplicas
+            != _|_ {\n\t\treadyReplicas: context.output.status.readyReplicas\n\t}\n}\nmessage:
+            \"Ready:\\(ready.readyReplicas)/\\(context.output.spec.replicas)\""
+          healthPolicy: "ready: {\n\tupdatedReplicas:    *0 | int\n\treadyReplicas:
+            \     *0 | int\n\treplicas:           *0 | int\n\tobservedGeneration:
+            *0 | int\n} & {\n\tif context.output.status.updatedReplicas != _|_ {\n\t\tupdatedReplicas:
+            context.output.status.updatedReplicas\n\t}\n\tif context.output.status.readyReplicas
+            != _|_ {\n\t\treadyReplicas: context.output.status.readyReplicas\n\t}\n\tif
+            context.output.status.replicas != _|_ {\n\t\treplicas: context.output.status.replicas\n\t}\n\tif
+            context.output.status.observedGeneration != _|_ {\n\t\tobservedGeneration:
+            context.output.status.observedGeneration\n\t}\n}\nisHealth: (context.output.spec.replicas
+            == ready.readyReplicas) && (context.output.spec.replicas == ready.updatedReplicas)
+            && (context.output.spec.replicas == ready.replicas) && (ready.observedGeneration
+            == context.output.metadata.generation || ready.observedGeneration > context.output.metadata.generation)"
+        workload:
+          definition:
+            apiVersion: apps/v1
+            kind: Deployment
+          type: deployments.apps
+      status: {}
+  traitDefinitions:
+    scaler:
+      apiVersion: core.oam.dev/v1beta1
+      kind: TraitDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Manually scale K8s pod for your workload
+            which follows the pod spec in path 'spec.template'.
+          meta.helm.sh/release-name: kubevela
+          meta.helm.sh/release-namespace: vela-system
+        labels:
+          app.kubernetes.io/managed-by: Helm
+        name: scaler
+        namespace: vela-system
+      spec:
+        appliesToWorkloads:
+          - '*'
+        definitionRef:
+          name: ""
+        schematic:
+          cue:
+            template: "parameter: {\n\t// +usage=Specify the number of workload\n\treplicas:
+              *1 | int\n}\n// +patchStrategy=retainKeys\npatch: spec: replicas: parameter.replicas\n"
+      status: {}
+status: {}

pkg/appfile/testdata/backport-1-2/apprev2.yaml

@@ -0,0 +1,277 @@
+apiVersion: core.oam.dev/v1beta1
+kind: ApplicationRevision
+metadata:
+  annotations:
+    app.oam.dev/publishVersion: workflow-default-123456
+  name: backport-1-2-test-demo-v1
+  namespace: default
+spec:
+  application:
+    apiVersion: core.oam.dev/v1beta1
+    kind: Application
+    metadata:
+      annotations:
+        app.oam.dev/publishVersion: workflow-default-123456
+      name: backport-1-2-test-demo
+      namespace: default
+    spec:
+      components:
+        - name: backport-1-2-test-demo
+          properties:
+            image: nginx
+          traits:
+            - properties:
+                replicas: 1
+              type: scaler
+          type: webservice
+      workflow:
+        steps:
+          - name: apply-component
+            type: apply-component
+            properties:
+              name: backport-1-2-test-demo
+          - name: apply1
+            type: apply-application
+          - name: apply2
+            type: apply-application
+    status: {}
+  componentDefinitions:
+    webservice:
+      apiVersion: core.oam.dev/v1beta1
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Describes long-running, scalable, containerized
+            services that have a stable network endpoint to receive external network
+            traffic from customers.
+          meta.helm.sh/release-name: kubevela
+          meta.helm.sh/release-namespace: vela-system
+        labels:
+          app.kubernetes.io/managed-by: Helm
+        name: webservice
+        namespace: vela-system
+      spec:
+        schematic:
+          cue:
+            template: "import (\n\t\"strconv\"\n)\n\nmountsArray: {\n\tpvc: *[\n\t\tfor
+              v in parameter.volumeMounts.pvc {\n\t\t\t{\n\t\t\t\tmountPath: v.mountPath\n\t\t\t\tname:
+              \     v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\tconfigMap: *[\n\t\t\tfor
+              v in parameter.volumeMounts.configMap {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\tsecret:
+              *[\n\t\tfor v in parameter.volumeMounts.secret {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\temptyDir:
+              *[\n\t\t\tfor v in parameter.volumeMounts.emptyDir {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n\n\thostPath:
+              *[\n\t\t\tfor v in parameter.volumeMounts.hostPath {\n\t\t\t{\n\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\tname:      v.name\n\t\t\t}\n\t\t},\n\t] | []\n}\nvolumesArray:
+              {\n\tpvc: *[\n\t\tfor v in parameter.volumeMounts.pvc {\n\t\t\t{\n\t\t\t\tname:
+              v.name\n\t\t\t\tpersistentVolumeClaim: claimName: v.claimName\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\tconfigMap: *[\n\t\t\tfor v in parameter.volumeMounts.configMap
+              {\n\t\t\t{\n\t\t\t\tname: v.name\n\t\t\t\tconfigMap: {\n\t\t\t\t\tdefaultMode:
+              v.defaultMode\n\t\t\t\t\tname:        v.cmName\n\t\t\t\t\tif v.items
+              != _|_ {\n\t\t\t\t\t\titems: v.items\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\tsecret: *[\n\t\tfor v in parameter.volumeMounts.secret {\n\t\t\t{\n\t\t\t\tname:
+              v.name\n\t\t\t\tsecret: {\n\t\t\t\t\tdefaultMode: v.defaultMode\n\t\t\t\t\tsecretName:
+              \ v.secretName\n\t\t\t\t\tif v.items != _|_ {\n\t\t\t\t\t\titems: v.items\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\temptyDir: *[\n\t\t\tfor v in parameter.volumeMounts.emptyDir
+              {\n\t\t\t{\n\t\t\t\tname: v.name\n\t\t\t\temptyDir: medium: v.medium\n\t\t\t}\n\t\t},\n\t]
+              | []\n\n\thostPath: *[\n\t\t\tfor v in parameter.volumeMounts.hostPath
+              {\n\t\t\t{\n\t\t\t\tname: v.name\n\t\t\t\thostPath: path: v.path\n\t\t\t}\n\t\t},\n\t]
+              | []\n}\noutput: {\n\tapiVersion: \"apps/v1\"\n\tkind:       \"Deployment\"\n\tspec:
+              {\n\t\tselector: matchLabels: \"app.oam.dev/component\": context.name\n\n\t\ttemplate:
+              {\n\t\t\tmetadata: {\n\t\t\t\tlabels: {\n\t\t\t\t\tif parameter.labels
+              != _|_ {\n\t\t\t\t\t\tparameter.labels\n\t\t\t\t\t}\n\t\t\t\t\tif parameter.addRevisionLabel
+              {\n\t\t\t\t\t\t\"app.oam.dev/revision\": context.revision\n\t\t\t\t\t}\n\t\t\t\t\t\"app.oam.dev/component\":
+              context.name\n\t\t\t\t}\n\t\t\t\tif parameter.annotations != _|_ {\n\t\t\t\t\tannotations:
+              parameter.annotations\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tspec: {\n\t\t\t\tcontainers:
+              [{\n\t\t\t\t\tname:  context.name\n\t\t\t\t\timage: parameter.image\n\t\t\t\t\tif
+              parameter[\"port\"] != _|_ && parameter[\"ports\"] == _|_ {\n\t\t\t\t\t\tports:
+              [{\n\t\t\t\t\t\t\tcontainerPort: parameter.port\n\t\t\t\t\t\t}]\n\t\t\t\t\t}\n\t\t\t\t\tif
+              parameter[\"ports\"] != _|_ {\n\t\t\t\t\t\tports: [ for v in parameter.ports
+              {\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tcontainerPort: v.port\n\t\t\t\t\t\t\t\tprotocol:
+              \     v.protocol\n\t\t\t\t\t\t\t\tif v.name != _|_ {\n\t\t\t\t\t\t\t\t\tname:
+              v.name\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\tif v.name == _|_ {\n\t\t\t\t\t\t\t\t\tname:
+              \"port-\" + strconv.FormatInt(v.port, 10)\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}}]\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
+              parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"cmd\"]
+              != _|_ {\n\t\t\t\t\t\tcommand: parameter.cmd\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"env\"] != _|_ {\n\t\t\t\t\t\tenv: parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              context[\"config\"] != _|_ {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"cpu\"] != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits:
+              cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests: cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"memory\"] != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits:
+              memory:   parameter.memory\n\t\t\t\t\t\t\trequests: memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"volumes\"] != _|_ && parameter[\"volumeMounts\"] == _|_
+              {\n\t\t\t\t\t\tvolumeMounts: [ for v in parameter.volumes {\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tmountPath:
+              v.mountPath\n\t\t\t\t\t\t\t\tname:      v.name\n\t\t\t\t\t\t\t}}]\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"volumeMounts\"] != _|_ {\n\t\t\t\t\t\tvolumeMounts: mountsArray.pvc
+              + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir
+              + mountsArray.hostPath\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"livenessProbe\"]
+              != _|_ {\n\t\t\t\t\t\tlivenessProbe: parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"readinessProbe\"] != _|_ {\n\t\t\t\t\t\treadinessProbe:
+              parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t}]\n\n\t\t\t\tif parameter[\"hostAliases\"]
+              != _|_ {\n\t\t\t\t\t// +patchKey=ip\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\n\t\t\t\tif
+              parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
+              [ for v in parameter.imagePullSecrets {\n\t\t\t\t\t\tname: v\n\t\t\t\t\t},\n\t\t\t\t\t]\n\t\t\t\t}\n\n\t\t\t\tif
+              parameter[\"volumes\"] != _|_ && parameter[\"volumeMounts\"] == _|_
+              {\n\t\t\t\t\tvolumes: [ for v in parameter.volumes {\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tname:
+              v.name\n\t\t\t\t\t\t\tif v.type == \"pvc\" {\n\t\t\t\t\t\t\t\tpersistentVolumeClaim:
+              claimName: v.claimName\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif v.type ==
+              \"configMap\" {\n\t\t\t\t\t\t\t\tconfigMap: {\n\t\t\t\t\t\t\t\t\tdefaultMode:
+              v.defaultMode\n\t\t\t\t\t\t\t\t\tname:        v.cmName\n\t\t\t\t\t\t\t\t\tif
+              v.items != _|_ {\n\t\t\t\t\t\t\t\t\t\titems: v.items\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif
+              v.type == \"secret\" {\n\t\t\t\t\t\t\t\tsecret: {\n\t\t\t\t\t\t\t\t\tdefaultMode:
+              v.defaultMode\n\t\t\t\t\t\t\t\t\tsecretName:  v.secretName\n\t\t\t\t\t\t\t\t\tif
+              v.items != _|_ {\n\t\t\t\t\t\t\t\t\t\titems: v.items\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif
+              v.type == \"emptyDir\" {\n\t\t\t\t\t\t\t\temptyDir: medium: v.medium\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}]\n\t\t\t\t}\n\n\t\t\t\tif
+              parameter[\"volumeMounts\"] != _|_ {\n\t\t\t\t\tvolumes: volumesArray.pvc
+              + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir
+              + volumesArray.hostPath\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\nexposePorts:
+              [\n\tfor v in parameter.ports if v.expose == true {\n\t\tport:       v.port\n\t\ttargetPort:
+              v.port\n\t\tif v.name != _|_ {\n\t\t\tname: v.name\n\t\t}\n\t\tif v.name
+              == _|_ {\n\t\t\tname: \"port-\" + strconv.FormatInt(v.port, 10)\n\t\t}\n\t},\n]\noutputs:
+              {\n\tif len(exposePorts) != 0 {\n\t\twebserviceExpose: {\n\t\t\tapiVersion:
+              \"v1\"\n\t\t\tkind:       \"Service\"\n\t\t\tmetadata: name: context.name\n\t\t\tspec:
+              {\n\t\t\t\tselector: \"app.oam.dev/component\": context.name\n\t\t\t\tports:
+              exposePorts\n\t\t\t\ttype:  parameter.exposeType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter:
+              {\n\t// +usage=Specify the labels in the workload\n\tlabels?: [string]:
+              string\n\n\t// +usage=Specify the annotations in the workload\n\tannotations?:
+              [string]: string\n\n\t// +usage=Which image would you like to use for
+              your service\n\t// +short=i\n\timage: string\n\n\t// +usage=Specify
+              image pull policy for your service\n\timagePullPolicy?: \"Always\" |
+              \"Never\" | \"IfNotPresent\"\n\n\t// +usage=Specify image pull secrets
+              for your service\n\timagePullSecrets?: [...string]\n\n\t// +ignore\n\t//
+              +usage=Deprecated field, please use ports instead\n\t// +short=p\n\tport?:
+              int\n\n\t// +usage=Which ports do you want customer traffic sent to,
+              defaults to 80\n\tports?: [...{\n\t\t// +usage=Number of port to expose
+              on the pod's IP address\n\t\tport: int\n\t\t// +usage=Name of the port\n\t\tname?:
+              string\n\t\t// +usage=Protocol for port. Must be UDP, TCP, or SCTP\n\t\tprotocol:
+              *\"TCP\" | \"UDP\" | \"SCTP\"\n\t\t// +usage=Specify if the port should
+              be exposed\n\t\texpose: *false | bool\n\t}]\n\n\t// +ignore\n\t// +usage=Specify
+              what kind of Service you want. options: \"ClusterIP\", \"NodePort\",
+              \"LoadBalancer\", \"ExternalName\"\n\texposeType: *\"ClusterIP\" | \"NodePort\"
+              | \"LoadBalancer\" | \"ExternalName\"\n\n\t// +ignore\n\t// +usage=If
+              addRevisionLabel is true, the revision label will be added to the underlying
+              pods\n\taddRevisionLabel: *false | bool\n\n\t// +usage=Commands to run
+              in the container\n\tcmd?: [...string]\n\n\t// +usage=Define arguments
+              by using environment variables\n\tenv?: [...{\n\t\t// +usage=Environment
+              variable name\n\t\tname: string\n\t\t// +usage=The value of the environment
+              variable\n\t\tvalue?: string\n\t\t// +usage=Specifies a source the value
+              of this var should come from\n\t\tvalueFrom?: {\n\t\t\t// +usage=Selects
+              a key of a secret in the pod's namespace\n\t\t\tsecretKeyRef?: {\n\t\t\t\t//
+              +usage=The name of the secret in the pod's namespace to select from\n\t\t\t\tname:
+              string\n\t\t\t\t// +usage=The key of the secret to select from. Must
+              be a valid secret key\n\t\t\t\tkey: string\n\t\t\t}\n\t\t\t// +usage=Selects
+              a key of a config map in the pod's namespace\n\t\t\tconfigMapKeyRef?:
+              {\n\t\t\t\t// +usage=The name of the config map in the pod's namespace
+              to select from\n\t\t\t\tname: string\n\t\t\t\t// +usage=The key of the
+              config map to select from. Must be a valid secret key\n\t\t\t\tkey:
+              string\n\t\t\t}\n\t\t}\n\t}]\n\n\t// +usage=Number of CPU units for
+              the service, like \n\tcpu?: string\n\n\t//
+              +usage=Specifies the attributes of the memory resource required for
+              the container.\n\tmemory?: string\n\n\tvolumeMounts?: {\n\t\t// +usage=Mount
+              PVC type volume\n\t\tpvc?: [...{\n\t\t\tname:      string\n\t\t\tmountPath:
+              string\n\t\t\t// +usage=The name of the PVC\n\t\t\tclaimName: string\n\t\t}]\n\t\t//
+              +usage=Mount ConfigMap type volume\n\t\tconfigMap?: [...{\n\t\t\tname:
+              \       string\n\t\t\tmountPath:   string\n\t\t\tdefaultMode: *420 |
+              int\n\t\t\tcmName:      string\n\t\t\titems?: [...{\n\t\t\t\tkey:  string\n\t\t\t\tpath:
+              string\n\t\t\t\tmode: *511 | int\n\t\t\t}]\n\t\t}]\n\t\t// +usage=Mount
+              Secret type volume\n\t\tsecret?: [...{\n\t\t\tname:        string\n\t\t\tmountPath:
+              \  string\n\t\t\tdefaultMode: *420 | int\n\t\t\tsecretName:  string\n\t\t\titems?:
+              [...{\n\t\t\t\tkey:  string\n\t\t\t\tpath: string\n\t\t\t\tmode: *511
+              | int\n\t\t\t}]\n\t\t}]\n\t\t// +usage=Mount EmptyDir type volume\n\t\temptyDir?:
+              [...{\n\t\t\tname:      string\n\t\t\tmountPath: string\n\t\t\tmedium:
+              \   *\"\" | \"Memory\"\n\t\t}]\n\t\t// +usage=Mount HostPath type volume\n\t\thostPath?:
+              [...{\n\t\t\tname:      string\n\t\t\tmountPath: string\n\t\t\tpath:
+              \     string\n\t\t}]\n\t}\n\n\t// +usage=Deprecated field, use volumeMounts
+              instead.\n\tvolumes?: [...{\n\t\tname:      string\n\t\tmountPath: string\n\t\t//
+              +usage=Specify volume type, options: \"pvc\",\"configMap\",\"secret\",\"emptyDir\"\n\t\ttype:
+              \"pvc\" | \"configMap\" | \"secret\" | \"emptyDir\"\n\t\tif type ==
+              \"pvc\" {\n\t\t\tclaimName: string\n\t\t}\n\t\tif type == \"configMap\"
+              {\n\t\t\tdefaultMode: *420 | int\n\t\t\tcmName:      string\n\t\t\titems?:
+              [...{\n\t\t\t\tkey:  string\n\t\t\t\tpath: string\n\t\t\t\tmode: *511
+              | int\n\t\t\t}]\n\t\t}\n\t\tif type == \"secret\" {\n\t\t\tdefaultMode:
+              *420 | int\n\t\t\tsecretName:  string\n\t\t\titems?: [...{\n\t\t\t\tkey:
+              \ string\n\t\t\t\tpath: string\n\t\t\t\tmode: *511 | int\n\t\t\t}]\n\t\t}\n\t\tif
+              type == \"emptyDir\" {\n\t\t\tmedium: *\"\" | \"Memory\"\n\t\t}\n\t}]\n\n\t//
+              +usage=Instructions for assessing whether the container is alive.\n\tlivenessProbe?:
+              #HealthProbe\n\n\t// +usage=Instructions for assessing whether the container
+              is in a suitable state to serve traffic.\n\treadinessProbe?: #HealthProbe\n\n\t//
+              +usage=Specify the hostAliases to add\n\thostAliases?: [...{\n\t\tip:
+              string\n\t\thostnames: [...string]\n\t}]\n}\n#HealthProbe: {\n\n\t//
+              +usage=Instructions for assessing container health by executing a command.
+              Either this attribute or the httpGet attribute or the tcpSocket attribute
+              MUST be specified. This attribute is mutually exclusive with both the
+              httpGet attribute and the tcpSocket attribute.\n\texec?: {\n\t\t// +usage=A
+              command to be executed inside the container to assess its health. Each
+              space delimited token of the command is a separate array element. Commands
+              exiting 0 are considered to be successful probes, whilst all other exit
+              codes are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
+              +usage=Instructions for assessing container health by executing an HTTP
+              GET request. Either this attribute or the exec attribute or the tcpSocket
+              attribute MUST be specified. This attribute is mutually exclusive with
+              both the exec attribute and the tcpSocket attribute.\n\thttpGet?: {\n\t\t//
+              +usage=The endpoint, relative to the port, to which the HTTP GET request
+              should be directed.\n\t\tpath: string\n\t\t// +usage=The TCP socket
+              within the container to which the HTTP GET request should be directed.\n\t\tport:
+              int\n\t\thttpHeaders?: [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
+              +usage=Instructions for assessing container health by probing a TCP
+              socket. Either this attribute or the exec attribute or the httpGet attribute
+              MUST be specified. This attribute is mutually exclusive with both the
+              exec attribute and the httpGet attribute.\n\ttcpSocket?: {\n\t\t// +usage=The
+              TCP socket within the container that should be probed to assess container
+              health.\n\t\tport: int\n\t}\n\n\t// +usage=Number of seconds after the
+              container is started before the first probe is initiated.\n\tinitialDelaySeconds:
+              *0 | int\n\n\t// +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
+              *10 | int\n\n\t// +usage=Number of seconds after which the probe times
+              out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
+              successes for the probe to be considered successful after having failed.\n\tsuccessThreshold:
+              *1 | int\n\n\t// +usage=Number of consecutive failures required to determine
+              the container is not alive (liveness probe) or not ready (readiness
+              probe).\n\tfailureThreshold: *3 | int\n}\n"
+        status:
+          customStatus: "ready: {\n\treadyReplicas: *0 | int\n} & {\n\tif context.output.status.readyReplicas
+            != _|_ {\n\t\treadyReplicas: context.output.status.readyReplicas\n\t}\n}\nmessage:
+            \"Ready:\\(ready.readyReplicas)/\\(context.output.spec.replicas)\""
+          healthPolicy: "ready: {\n\tupdatedReplicas:    *0 | int\n\treadyReplicas:
+            \     *0 | int\n\treplicas:           *0 | int\n\tobservedGeneration:
+            *0 | int\n} & {\n\tif context.output.status.updatedReplicas != _|_ {\n\t\tupdatedReplicas:
+            context.output.status.updatedReplicas\n\t}\n\tif context.output.status.readyReplicas
+            != _|_ {\n\t\treadyReplicas: context.output.status.readyReplicas\n\t}\n\tif
+            context.output.status.replicas != _|_ {\n\t\treplicas: context.output.status.replicas\n\t}\n\tif
+            context.output.status.observedGeneration != _|_ {\n\t\tobservedGeneration:
+            context.output.status.observedGeneration\n\t}\n}\nisHealth: (context.output.spec.replicas
+            == ready.readyReplicas) && (context.output.spec.replicas == ready.updatedReplicas)
+            && (context.output.spec.replicas == ready.replicas) && (ready.observedGeneration
+            == context.output.metadata.generation || ready.observedGeneration > context.output.metadata.generation)"
+        workload:
+          definition:
+            apiVersion: apps/v1
+            kind: Deployment
+          type: deployments.apps
+      status: {}
+  traitDefinitions:
+    scaler:
+      apiVersion: core.oam.dev/v1beta1
+      kind: TraitDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Manually scale K8s pod for your workload
+            which follows the pod spec in path 'spec.template'.
+          meta.helm.sh/release-name: kubevela
+          meta.helm.sh/release-namespace: vela-system
+        labels:
+          app.kubernetes.io/managed-by: Helm
+        name: scaler
+        namespace: vela-system
+      spec:
+        appliesToWorkloads:
+          - '*'
+        definitionRef:
+          name: ""
+        schematic:
+          cue:
+            template: "parameter: {\n\t// +usage=Specify the number of workload\n\treplicas:
+              *1 | int\n}\n// +patchStrategy=retainKeys\npatch: spec: replicas: parameter.replicas\n"
+      status: {}
+status: {}