Fix: fix the typo error in vela top (#5983)

Signed-off-by: qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit e9b1b63dae)

Co-authored-by: qiaozp <qiaozhongpei.qzp@alibaba-inc.com>

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

@@ -39,7 +39,7 @@ jobs:
         continue-on-error: true
 
   e2e-multi-cluster-tests:
-    runs-on: aliyun
+    runs-on: self-hosted
     needs: [ detect-noop ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
@@ -49,11 +49,18 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
       cancel-in-progress: true
 
-
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
 
+      - name: Install tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install make gcc jq ca-certificates curl gnupg -y
+          snap install docker
+          snap install kubectl --classic
+          snap install helm --classic
+
       - name: Setup Go
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
         with:

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

@@ -39,7 +39,7 @@ jobs:
         continue-on-error: true
 
   e2e-rollout-tests:
-    runs-on: aliyun
+    runs-on: self-hosted
     needs: [ detect-noop ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
@@ -62,6 +62,8 @@ jobs:
       - name: Get dependencies
         run: |
           go get -v -t -d ./...
+          go install github.com/onsi/ginkgo/ginkgo
+          go get github.com/onsi/gomega/...
 
       - name: Tear down K3d if exist
         run: |

.github/workflows/e2e-test.yml

@@ -39,7 +39,7 @@ jobs:
         continue-on-error: true
 
   e2e-tests:
-    runs-on: aliyun
+    runs-on: self-hosted
     needs: [ detect-noop ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
@@ -54,6 +54,14 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
 
+      - name: Install tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install make gcc jq ca-certificates curl gnupg -y
+          snap install docker
+          snap install kubectl --classic
+          snap install helm --classic
+
       - name: Setup Go
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
         with:
@@ -62,6 +70,8 @@ jobs:
       - name: Get dependencies
         run: |
           go get -v -t -d ./...
+          go install github.com/onsi/ginkgo/ginkgo
+          go get github.com/onsi/gomega/...
 
       - name: Tear down K3d if exist
         run: |

.github/workflows/go.yml

@@ -88,7 +88,7 @@ jobs:
           version: ${{ env.GOLANGCI_VERSION }}
 
   check-diff:
-    runs-on: aliyun
+    runs-on: self-hosted
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 

.github/workflows/timed-task.yml

@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   clean-image:
-    runs-on: aliyun
+    runs-on: self-hosted
     steps:
       - name: Cleanup image
         run: docker image prune -f

charts/vela-core/README.md

@@ -49,7 +49,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `disableCaps`                 | Disable capability                                                                            | `rollout` |
 | `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`     |
 
-
 ### KubeVela workflow parameters
 
 | Name                                   | Description                                            | Value   |
@@ -59,7 +58,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `workflow.backoff.maxTime.failedState` | The max backoff time of workflow in a failed condition | `300`   |
 | `workflow.step.errorRetryTimes`        | The max retry times of a failed workflow step          | `10`    |
 
-
 ### KubeVela controller parameters
 
 | Name                        | Description                          | Value              |
@@ -77,7 +75,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `webhookService.port`       | KubeVela webhook service port        | `9443`             |
 | `healthCheck.port`          | KubeVela health check port           | `9440`             |
 
-
 ### KubeVela controller optimization parameters
 
 | Name                                                         | Description                                                                                                                                                                                                                      | Value   |
@@ -104,7 +101,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `featureGates.sharedDefinitionStorageForApplicationRevision` | use definition cache to reduce duplicated definition storage for application revision, must be used with InformerCacheFilterUnnecessaryFields                                                                                    | `true`  |
 | `featureGates.disableWorkflowContextConfigMapCache`          | disable the workflow context's configmap informer cache                                                                                                                                                                          | `true`  |
 
-
 ### MultiCluster parameters
 
 | Name                                                        | Description                                                                                 | Value                            |
@@ -125,7 +121,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `multicluster.clusterGateway.secureTLS.certPath`            | Path to the certificate file                                                                | `/etc/k8s-cluster-gateway-certs` |
 | `multicluster.clusterGateway.secureTLS.certManager.enabled` | Whether to enable cert-manager                                                              | `false`                          |
 
-
 ### Test parameters
 
 | Name                  | Description         | Value                |
@@ -135,7 +130,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `test.k8s.repository` | Test k8s repository | `oamdev/alpine-k8s`  |
 | `test.k8s.tag`        | Test k8s tag        | `1.18.2`             |
 
-
 ### Common parameters
 
 | Name                          | Description                                                                                                                                                        | Value                |

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

@@ -26,7 +26,6 @@ spec:
         	duration:       parameter.duration
         	failDuration:   parameter.failDuration
         }
-
         fail: op.#Steps & {
         	if check.failed != _|_ {
         		if check.failed == true {
@@ -36,14 +35,12 @@ spec:
         		}
         	}
         }
-
         wait: op.#ConditionalWait & {
         	continue: check.result
         	if check.message != _|_ {
         		message: check.message
         	}
         }
-
         parameter: {
         	// +usage=Query is a raw prometheus query to perform
         	query: string

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

@@ -350,7 +350,7 @@ spec:
             - mountPath: {{ .Values.admissionWebhooks.certificate.mountPath }}
               name: tls-cert-vol
               readOnly: true
-          {{ if and .Values.multicluster.clusterGateway.secureTLS.enabled .Values.multicluster.clusterGateway.direct }}
+          {{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled .Values.multicluster.clusterGateway.direct }}
             - mountPath: /cluster-gateway-tls-cert
               name: tls-cert-vol-cg
               readOnly: true
@@ -362,7 +362,7 @@ spec:
           secret:
             defaultMode: 420
             secretName: {{ template "kubevela.fullname" . }}-admission
-      {{ if and .Values.multicluster.clusterGateway.secureTLS.enabled .Values.multicluster.clusterGateway.direct }}
+      {{ if and .Values.multicluster.enabled .Values.multicluster.clusterGateway.secureTLS.enabled .Values.multicluster.clusterGateway.direct }}
         - name: tls-cert-vol-cg
           secret:
             defaultMode: 420

charts/vela-minimal/README.md

@@ -67,7 +67,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `disableCaps`                 | Disable capability                                                                            | `envbinding,rollout` |
 | `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`                |
 
-
 ### KubeVela workflow parameters
 
 | Name                                   | Description                                            | Value   |
@@ -77,7 +76,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `workflow.backoff.maxTime.failedState` | The max backoff time of workflow in a failed condition | `300`   |
 | `workflow.step.errorRetryTimes`        | The max retry times of a failed workflow step          | `10`    |
 
-
 ### KubeVela controller parameters
 
 | Name                        | Description                          | Value              |
@@ -95,14 +93,12 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `webhookService.port`       | KubeVela webhook service port        | `9443`             |
 | `healthCheck.port`          | KubeVela health check port           | `9440`             |
 
-
 ### KubeVela controller optimization parameters
 
 | Name                     | Description                                                                                                                           | Value   |
 | ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------- | ------- |
 | `featureGates.applyOnce` | if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker | `false` |
 
-
 ### MultiCluster parameters
 
 | Name                                                    | Description                      | Value                            |
@@ -120,7 +116,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `multicluster.clusterGateway.secureTLS.enabled`         | Whether to enable secure TLS     | `true`                           |
 | `multicluster.clusterGateway.secureTLS.certPath`        | Path to the certificate file     | `/etc/k8s-cluster-gateway-certs` |
 
-
 ### Test parameters
 
 | Name                  | Description         | Value                |
@@ -130,7 +125,6 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `test.k8s.repository` | Test k8s repository | `oamdev/alpine-k8s`  |
 | `test.k8s.tag`        | Test k8s tag        | `1.18.2`             |
 
-
 ### Common parameters
 
 | Name                          | Description                                                                                                                | Value                |

charts/vela-minimal/templates/defwithtemplate/check-metrics.yaml

@@ -26,7 +26,6 @@ spec:
         	duration:       parameter.duration
         	failDuration:   parameter.failDuration
         }
-
         fail: op.#Steps & {
         	if check.failed != _|_ {
         		if check.failed == true {
@@ -36,14 +35,12 @@ spec:
         		}
         	}
         }
-
         wait: op.#ConditionalWait & {
         	continue: check.result
         	if check.message != _|_ {
         		message: check.message
         	}
         }
-
         parameter: {
         	// +usage=Query is a raw prometheus query to perform
         	query: string

e2e/addon/addon_test.go

@@ -142,11 +142,132 @@ var _ = Describe("Addon Test", func() {
 			Expect(output).To(ContainSubstring("you can try another version by command"))
 			Expect(err).NotTo(HaveOccurred())
 		})
+	})
+
+	Context("Addon registry test", func() {
+		It("List all addon registry", func() {
+			output, err := e2e.Exec("vela addon registry list")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("KubeVela"))
+		})
+
+		It("Get addon registry", func() {
+			output, err := e2e.Exec("vela addon registry get KubeVela")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("KubeVela"))
+		})
+
+		It("Add test addon registry", func() {
+			output, err := e2e.LongTimeExec("vela addon registry add my-repo --type=git --endpoint=https://github.com/oam-dev/catalog --path=/experimental/addons", 600*time.Second)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("Successfully add an addon registry my-repo"))
+
+			Eventually(func() error {
+				output, err := e2e.LongTimeExec("vela addon registry update my-repo --type=git --endpoint=https://github.com/oam-dev/catalog --path=/addons", 300*time.Second)
+				if err != nil {
+					return err
+				}
+				if !strings.Contains(output, "Successfully update an addon registry my-repo") {
+					return fmt.Errorf("cannot update addon registry")
+				}
+				return nil
+			}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
+
+			output, err = e2e.LongTimeExec("vela addon registry delete my-repo", 600*time.Second)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("Successfully delete an addon registry my-repo"))
+		})
+	})
+
+	Context("Enable dependency addon test", func() {
+		It(" enable mock-dependence-rely without specified clusters when mock-dependence addon is not enabled", func() {
+			output, err := e2e.Exec("vela addon enable mock-dependence-rely")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("enabled successfully."))
+			Eventually(func(g Gomega) {
+				app := &v1beta1.Application{}
+				Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "addon-mock-dependence", Namespace: "vela-system"}, app)).Should(Succeed())
+				topologyPolicyValue := map[string]interface{}{}
+				for _, policy := range app.Spec.Policies {
+					if policy.Type == "topology" {
+						Expect(json.Unmarshal(policy.Properties.Raw, &topologyPolicyValue)).Should(Succeed())
+						break
+					}
+				}
+				Expect(topologyPolicyValue["clusterLabelSelector"]).Should(Equal(map[string]interface{}{}))
+			}, 30*time.Second).Should(Succeed())
+		})
+
+		It("enable mock-dependence-rely with specified clusters when mock-dependence addon is not enabled ", func() {
+			output, err := e2e.Exec("vela addon enable mock-dependence-rely2 --clusters local")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("enabled successfully."))
+			Eventually(func(g Gomega) {
+				app := &v1beta1.Application{}
+				Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "addon-mock-dependence2", Namespace: "vela-system"}, app)).Should(Succeed())
+				topologyPolicyValue := map[string]interface{}{}
+				for _, policy := range app.Spec.Policies {
+					if policy.Type == "topology" {
+						Expect(json.Unmarshal(policy.Properties.Raw, &topologyPolicyValue)).Should(Succeed())
+						break
+					}
+				}
+				Expect(topologyPolicyValue["clusters"]).Should(Equal([]interface{}{"local"}))
+			}, 30*time.Second).Should(Succeed())
+		})
+
+		It("enable mock-dependence-rely without specified clusters when mock-dependence addon was enabled with specified clusters", func() {
+			// 1. enable mock-dependence addon with local clusters
+			output, err := e2e.InteractiveExec("vela addon enable mock-dependence --clusters local myparam=test", func(c *expect.Console) {
+				_, err = c.SendLine("y")
+				Expect(err).NotTo(HaveOccurred())
+			})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output).To(ContainSubstring("enabled successfully."))
+			Eventually(func(g Gomega) {
+				// check application render cluster
+				app := &v1beta1.Application{}
+				Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "addon-mock-dependence", Namespace: "vela-system"}, app)).Should(Succeed())
+				topologyPolicyValue := map[string]interface{}{}
+				for _, policy := range app.Spec.Policies {
+					if policy.Type == "topology" {
+						Expect(json.Unmarshal(policy.Properties.Raw, &topologyPolicyValue)).Should(Succeed())
+						break
+					}
+				}
+				Expect(topologyPolicyValue["clusters"]).Should(Equal([]interface{}{"local"}))
+				Expect(topologyPolicyValue["clusterLabelSelector"]).Should(BeNil())
+			}, 600*time.Second).Should(Succeed())
+			// 2. enable mock-dependence-rely addon without clusters
+			output1, err := e2e.InteractiveExec("vela addon enable mock-dependence-rely", func(c *expect.Console) {
+				_, err = c.SendLine("y")
+				Expect(err).NotTo(HaveOccurred())
+			})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(output1).To(ContainSubstring("enabled successfully."))
+			// 3. enable mock-dependence-rely addon changes the mock-dependence topology policy
+			Eventually(func(g Gomega) {
+				app := &v1beta1.Application{}
+				Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "addon-mock-dependence", Namespace: "vela-system"}, app)).Should(Succeed())
+				topologyPolicyValue := map[string]interface{}{}
+				for _, policy := range app.Spec.Policies {
+					if policy.Type == "topology" {
+						Expect(json.Unmarshal(policy.Properties.Raw, &topologyPolicyValue)).Should(Succeed())
+						break
+					}
+				}
+				Expect(topologyPolicyValue["clusterLabelSelector"]).Should(Equal(map[string]interface{}{}))
+				Expect(topologyPolicyValue["clusters"]).Should(BeNil())
+			}, 30*time.Second).Should(Succeed())
+		})
 
 		It("Test addon dependency with specified clusters", func() {
 			const clusterName = "k3s-default"
 			// enable addon
-			output, err := e2e.Exec("vela addon enable mock-dependence --clusters local myparam=test")
+			output, err := e2e.InteractiveExec("vela addon enable mock-dependence --clusters local myparam=test", func(c *expect.Console) {
+				_, err = c.SendLine("y")
+				Expect(err).NotTo(HaveOccurred())
+			})
 			Expect(err).NotTo(HaveOccurred())
 			Expect(output).To(ContainSubstring("enabled successfully."))
 			output1, err := e2e.Exec("vela ls -A")
@@ -185,7 +306,10 @@ var _ = Describe("Addon Test", func() {
 				Expect(topologyPolicyValue["clusters"]).Should(Equal([]interface{}{"local"}))
 			}, 600*time.Second).Should(Succeed())
 			// enable addon which rely on mock-dependence addon
-			e2e.Exec("vela addon enable mock-dependence-rely --clusters local," + clusterName)
+			e2e.InteractiveExec("vela addon enable mock-dependence-rely --clusters local,"+clusterName, func(c *expect.Console) {
+				_, err = c.SendLine("y")
+				Expect(err).NotTo(HaveOccurred())
+			})
 			// check mock-dependence application parameter
 			Eventually(func(g Gomega) {
 				sec := &v1.Secret{}
@@ -210,38 +334,4 @@ var _ = Describe("Addon Test", func() {
 		})
 	})
 
-	Context("Addon registry test", func() {
-		It("List all addon registry", func() {
-			output, err := e2e.Exec("vela addon registry list")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("KubeVela"))
-		})
-
-		It("Get addon registry", func() {
-			output, err := e2e.Exec("vela addon registry get KubeVela")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("KubeVela"))
-		})
-
-		It("Add test addon registry", func() {
-			output, err := e2e.LongTimeExec("vela addon registry add my-repo --type=git --endpoint=https://github.com/oam-dev/catalog --path=/experimental/addons", 600*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("Successfully add an addon registry my-repo"))
-
-			Eventually(func() error {
-				output, err := e2e.LongTimeExec("vela addon registry update my-repo --type=git --endpoint=https://github.com/oam-dev/catalog --path=/addons", 300*time.Second)
-				if err != nil {
-					return err
-				}
-				if !strings.Contains(output, "Successfully update an addon registry my-repo") {
-					return fmt.Errorf("cannot update addon registry")
-				}
-				return nil
-			}, 30*time.Second, 300*time.Millisecond).Should(BeNil())
-
-			output, err = e2e.LongTimeExec("vela addon registry delete my-repo", 600*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(output).To(ContainSubstring("Successfully delete an addon registry my-repo"))
-		})
-	})
 })

e2e/addon/mock/testdata/mock-dependence-rely2/README.md

@@ -0,0 +1,3 @@
+# mock-dependence-rely2
+
+This is an addon template. Check how to build your own addon: https://kubevela.net/docs/platform-engineers/addon/intro

e2e/addon/mock/testdata/mock-dependence-rely2/metadata.yaml

@@ -0,0 +1,10 @@
+description: An addon for testing addon dependency with specified clusters.
+icon: ""
+invisible: false
+name: mock-dependence-rely2
+tags:
+- my-tag
+version: 1.0.0
+dependencies:
+  # install controller by helm.
+  - name: mock-dependence2

e2e/addon/mock/testdata/mock-dependence-rely2/parameter.cue

@@ -0,0 +1,4 @@
+parameter: {
+	// +usage=Custom parameter description
+	myparam: *"mynsrely" | string
+}

e2e/addon/mock/testdata/mock-dependence-rely2/template.cue

@@ -0,0 +1,9 @@
+package main
+output: {
+	apiVersion: "core.oam.dev/v1beta1"
+	kind:       "Application"
+	spec: {
+		components: []
+		policies: []
+	}
+}

e2e/addon/mock/testdata/mock-dependence2/README.md

@@ -0,0 +1,3 @@
+# mock-dependence2
+
+This is an addon template. Check how to build your own addon: https://kubevela.net/docs/platform-engineers/addon/intro

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

@@ -0,0 +1,7 @@
+description: An addon for testing addon dependency with specified clusters.
+icon: ""
+invisible: false
+name: mock-dependence2
+tags:
+- my-tag
+version: 1.0.0

e2e/addon/mock/testdata/mock-dependence2/parameter.cue

@@ -0,0 +1,6 @@
+parameter: {
+	// +usage=Custom parameter description
+	myparam: *"myns" | string
+        //+usage=Deploy to specified clusters. Leave empty to deploy to all clusters.
+	clusters?: [...string]
+}

e2e/addon/mock/testdata/mock-dependence2/template.cue

@@ -0,0 +1,24 @@
+package main
+_targetNamespace: parameter.myparam
+output: {
+	apiVersion: "core.oam.dev/v1beta1"
+	kind:       "Application"
+	spec: {
+		components: [],
+		policies: [
+			{
+				type: "topology"
+				name: "deploy-mock-dependency-ns"
+				properties: {
+					namespace: _targetNamespace
+					if parameter.clusters != _|_ {
+						clusters: parameter.clusters
+					}
+					if parameter.clusters == _|_ {
+						clusterLabelSelector: {}
+					}
+				}
+			},
+		]
+	}
+}

go.sum

@@ -954,8 +954,6 @@ github.com/kubevela/pkg v0.0.0-20230316114047-e2b41b377bac h1:TLQchMx+BRTnHyebDp
 github.com/kubevela/pkg v0.0.0-20230316114047-e2b41b377bac/go.mod h1:GilLxt+9L4sU2tLeZAGHga8wiYmjjfPX/Q6JkyuuXSM=
 github.com/kubevela/prism v1.7.0-alpha.1 h1:oeZFn1Oy6gxSSFzMTfsWjLOCKaaooMVm1JGNK4j4Mlo=
 github.com/kubevela/prism v1.7.0-alpha.1/go.mod h1:AJSDfdA+RkRSnWx3xEcogbmOTpX+l7RSIwqVHxwUtaI=
-github.com/kubevela/workflow v0.5.1-0.20230404061444-a4f3ec81fca7 h1:iYsJLZRD/eLZkVxUgM3AdbHpsMHKxhf5YhsQDolEZ/U=
-github.com/kubevela/workflow v0.5.1-0.20230404061444-a4f3ec81fca7/go.mod h1:+Ah40fwzX9fi/xeWdphew9J4kqfJiGwXw5MDeGPq3IU=
 github.com/kubevela/workflow v0.5.1-0.20230412142923-1f15ba091699 h1:XvHs/8a10AvHnetlGSpylFnx8PFvONTzmR9CAzFAHbY=
 github.com/kubevela/workflow v0.5.1-0.20230412142923-1f15ba091699/go.mod h1:+Ah40fwzX9fi/xeWdphew9J4kqfJiGwXw5MDeGPq3IU=
 github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=

pkg/addon/addon.go

@@ -1015,18 +1015,11 @@ func (h *Installer) installDependency(addon *InstallPackage) error {
 			continue
 		}
 		depHandler := *h
-		// get dependency addon original parameters
-		depArgs, depArgsErr := GetAddonLegacyParameters(h.ctx, h.cli, dep.Name)
+		// reset dependency addon clusters parameter
+		depArgs, depArgsErr := getDependencyArgs(h.ctx, h.cli, dep.Name, depClusters)
 		if depArgsErr != nil {
-			if !apierrors.IsNotFound(depArgsErr) {
-				return depArgsErr
-			}
+			return depArgsErr
 		}
-		if depArgs == nil {
-			depArgs = map[string]interface{}{}
-		}
-		// reset the cluster arg
-		depArgs[types.ClustersArg] = depClusters
 
 		depHandler.args = depArgs
 
@@ -1082,34 +1075,69 @@ func (h *Installer) installDependency(addon *InstallPackage) error {
 // checkDependencyNeedInstall checks whether dependency addon needs to be installed on other clusters
 func checkDependencyNeedInstall(ctx context.Context, k8sClient client.Client, depName string, addonClusters []string) (bool, []string, error) {
 	depApp, err := FetchAddonRelatedApp(ctx, k8sClient, depName)
-	var needInstallAddonDep = false
-	var depClusters []string
 	if err != nil {
 		if !apierrors.IsNotFound(err) {
-			return needInstallAddonDep, depClusters, err
+			return false, nil, err
 		}
-		// depApp is not exist
-		needInstallAddonDep = true
-		depClusters = addonClusters
-	} else {
-		// get the runtime clusters of current dependency addon
-		for _, r := range depApp.Status.AppliedResources {
-			if r.Cluster != "" && !stringslices.Contains(depClusters, r.Cluster) {
-				depClusters = append(depClusters, r.Cluster)
+		// dependent addon is not exist
+		return true, addonClusters, nil
+	}
+	topologyPolicyValue := map[string]interface{}{}
+	for _, policy := range depApp.Spec.Policies {
+		if policy.Type == "topology" {
+			unmarshalErr := json.Unmarshal(policy.Properties.Raw, &topologyPolicyValue)
+			if unmarshalErr != nil {
+				return false, nil, unmarshalErr
 			}
+			break
 		}
-
-		// determine if there are no dependencies on the cluster to be installed
-		for _, addonCluster := range addonClusters {
-			if !stringslices.Contains(depClusters, addonCluster) {
-				depClusters = append(depClusters, addonCluster)
-				needInstallAddonDep = true
-			}
+	}
+	// nil clusters indicates that the dependent addon is installed on all clusters
+	if topologyPolicyValue["clusters"] == nil {
+		return false, nil, nil
+	}
+	// nil addonClusters indicates the addon will be installed,
+	// thus we should set the dependent addon's clusters arg to be nil so that it is installed on all clusters
+	if addonClusters == nil {
+		return true, nil, nil
+	}
+	// Determine whether the dependent addon's existing clusters can cover the new addon's clusters
+	var needInstallAddonDep = false
+	var depClusters []string
+	originClusters := topologyPolicyValue["clusters"].([]interface{})
+	for _, r := range originClusters {
+		depClusters = append(depClusters, r.(string))
+	}
+	for _, addonCluster := range addonClusters {
+		if !stringslices.Contains(depClusters, addonCluster) {
+			depClusters = append(depClusters, addonCluster)
+			needInstallAddonDep = true
 		}
 	}
 	return needInstallAddonDep, depClusters, nil
 }
 
+// getDependencyArgs resets the dependency clusters arg according needed install depClusters
+func getDependencyArgs(ctx context.Context, k8sClient client.Client, depName string, depClusters []string) (map[string]interface{}, error) {
+	depArgs, depArgsErr := GetAddonLegacyParameters(ctx, k8sClient, depName)
+	if depArgsErr != nil && !apierrors.IsNotFound(depArgsErr) {
+		return nil, depArgsErr
+	}
+	// reset the cluster arg
+	if depClusters == nil {
+		// delete clusters args, when render addon, it will use clusterLabelSelector then render addon to all clusters
+		if depArgs != nil && depArgs[types.ClustersArg] != nil {
+			delete(depArgs, types.ClustersArg)
+		}
+	} else {
+		if depArgs == nil {
+			depArgs = map[string]interface{}{}
+		}
+		depArgs[types.ClustersArg] = depClusters
+	}
+	return depArgs, nil
+}
+
 // checkDependency checks if addon's dependency
 func (h *Installer) checkDependency(addon *InstallPackage) ([]string, error) {
 	var app v1beta1.Application

pkg/addon/addon_suite_test.go

@@ -175,7 +175,7 @@ var _ = Describe("Addon test", func() {
 	})
 
 	It("checkDependencyNeedInstall func test", func() {
-		// case1: dependency addon not enable
+		// case1: dependency addon not exist, adonClusters is not nil
 		depAddonName := "legacy-addon"
 		addonClusters := []string{"cluster1", "cluster2"}
 		needInstallAddonDep, depClusters, err := checkDependencyNeedInstall(ctx, k8sClient, depAddonName, addonClusters)
@@ -183,7 +183,13 @@ var _ = Describe("Addon test", func() {
 		Expect(depClusters).Should(Equal(addonClusters))
 		Expect(err).Should(BeNil())
 
-		// case2: dependency addon enable
+		// case1.1: dependency addon not exist, adonClusters is nil
+		needInstallAddonDep1, depClusters1, err := checkDependencyNeedInstall(ctx, k8sClient, depAddonName, nil)
+		Expect(needInstallAddonDep1).Should(BeTrue())
+		Expect(depClusters1).Should(BeNil())
+		Expect(err).Should(BeNil())
+
+		// case2: dependency addon exist, no topology policy, addonClusters is not nil
 		app = v1beta1.Application{}
 		Expect(yaml.Unmarshal([]byte(legacyAppYaml), &app)).Should(BeNil())
 		app.SetNamespace(testns)
@@ -191,9 +197,82 @@ var _ = Describe("Addon test", func() {
 		Eventually(func(g Gomega) {
 			needInstallAddonDep, depClusters, err := checkDependencyNeedInstall(ctx, k8sClient, depAddonName, addonClusters)
 			Expect(err).Should(BeNil())
-			Expect(needInstallAddonDep).Should(BeTrue())
-			Expect(depClusters).Should(Equal(addonClusters))
+			Expect(needInstallAddonDep).Should(BeFalse())
+			Expect(depClusters).Should(BeNil())
 		}, 30*time.Second).Should(Succeed())
+
+		// case3: clusters is nil (no topology policy), addonClusters is nil
+		needInstallAddonDep2, depClusters2, err := checkDependencyNeedInstall(ctx, k8sClient, depAddonName, nil)
+		Expect(needInstallAddonDep2).Should(BeFalse())
+		Expect(depClusters2).Should(BeNil())
+		Expect(err).Should(BeNil())
+
+		// case4: clusters is nil, addonClusters is nil
+		app = v1beta1.Application{}
+		Expect(yaml.Unmarshal([]byte(legacy3AppYaml), &app)).Should(BeNil())
+		app.SetNamespace(testns)
+		Expect(k8sClient.Create(ctx, &app)).Should(BeNil())
+		Eventually(func(g Gomega) {
+			needInstallAddonDep, depClusters, err := checkDependencyNeedInstall(ctx, k8sClient, "legacy-addon3", nil)
+			Expect(err).Should(BeNil())
+			Expect(needInstallAddonDep).Should(BeFalse())
+			Expect(depClusters).Should(BeNil())
+		}, 60*time.Second).Should(Succeed())
+
+		// case5: clusters is not nil, addonClusters is nil,
+		app = v1beta1.Application{}
+		Expect(yaml.Unmarshal([]byte(legacy2AppYaml), &app)).Should(BeNil())
+		app.SetNamespace(testns)
+		Expect(k8sClient.Create(ctx, &app)).Should(BeNil())
+		Eventually(func(g Gomega) {
+			needInstallAddonDep, depClusters, err := checkDependencyNeedInstall(ctx, k8sClient, "legacy-addon2", nil)
+			Expect(err).Should(BeNil())
+			Expect(needInstallAddonDep).Should(BeTrue())
+			Expect(depClusters).Should(BeNil())
+		}, 60*time.Second).Should(Succeed())
+
+		// case6: clusters is [local], addonClusters is ["cluster1", "cluster2"]
+		Eventually(func(g Gomega) {
+			needInstallAddonDep, depClusters, err := checkDependencyNeedInstall(ctx, k8sClient, "legacy-addon2", addonClusters)
+			Expect(err).Should(BeNil())
+			Expect(needInstallAddonDep).Should(BeTrue())
+			Expect(depClusters).Should(Equal(append([]string{"local"}, addonClusters...)))
+		}, 60*time.Second).Should(Succeed())
+	})
+
+	It("getDependencyArgs func test", func() {
+		// case1: depClusters is nil
+		depAddonName := "legacy-addon"
+		depArgs, err := getDependencyArgs(ctx, k8sClient, depAddonName, nil)
+		Expect(depArgs).Should(BeNil())
+		Expect(err).Should(BeNil())
+
+		// case2: depClusters is not nil
+		app = v1beta1.Application{}
+		Expect(yaml.Unmarshal([]byte(legacyAppYaml), &app)).Should(BeNil())
+		app.SetNamespace(testns)
+		//Expect(k8sClient.Create(ctx, &app)).Should(BeNil())
+		depClusters := []string{"cluster1", "cluster2"}
+		depArgs2, err := getDependencyArgs(ctx, k8sClient, depAddonName, depClusters)
+		Expect(depArgs2["clusters"]).Should(Equal(depClusters))
+		Expect(err).Should(BeNil())
+
+		// clusters exist, depClusters is nil
+		sec := v1.Secret{}
+		Expect(yaml.Unmarshal([]byte(secretYaml), &sec)).Should(BeNil())
+		Expect(k8sClient.Create(ctx, &sec)).Should(BeNil())
+		depArgs3, err := getDependencyArgs(ctx, k8sClient, "fluxcd", nil)
+		Expect(depArgs3).ToNot(BeNil())
+		Expect(depArgs3["clusters"]).Should(BeNil())
+		Expect(err).Should(BeNil())
+
+		// getArgs throw exception
+		sec1 := v1.Secret{}
+		Expect(yaml.Unmarshal([]byte(secretErrorYaml), &sec1)).Should(BeNil())
+		Expect(k8sClient.Create(ctx, &sec1)).Should(BeNil())
+		depArgs4, err := getDependencyArgs(ctx, k8sClient, "fluxcd1", nil)
+		Expect(depArgs4).Should(BeNil())
+		Expect(err).ToNot(BeNil())
 	})
 
 	It(" determineAddonAppName func test", func() {
@@ -599,6 +678,60 @@ spec:
       properties:
         image: crccheck/hello-world
         port: 8000
+`
+	legacy2AppYaml = `apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: legacy-addon2
+spec:
+  components:
+    - name: express-server
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+        port: 8000
+  policies:
+    - name: target-default
+      type: topology
+      properties:
+        clusters: ["local"]
+        namespace: "default"
+`
+	legacy3AppYaml = `apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: legacy-addon3
+spec:
+  components:
+    - name: express-server
+      type: webservice
+      properties:
+        image: crccheck/hello-world
+        port: 8000
+  policies:
+    - name: target-default
+      type: topology
+      properties:
+        clusterLabelSelector: {}
+        namespace: "default"
+`
+	secretYaml = `apiVersion: v1
+data:
+  addonParameterDataKey: eyJjbHVzdGVycyI6WyJsb2NhbCIsInZlbGEtbTEiXX0K
+kind: Secret
+metadata:
+  name: addon-secret-fluxcd
+  namespace: vela-system
+type: Opaque
+`
+	secretErrorYaml = `apiVersion: v1
+data:
+  addonParameterDataKey: eyJjbHVzdGVycyI6WyJsb2NhbCIsInZlbGEtbTEiXQo=
+kind: Secret
+metadata:
+  name: addon-secret-fluxcd1
+  namespace: vela-system
+type: Opaque
 `
 	deployYaml = `apiVersion: apps/v1
 kind: Deployment

pkg/appfile/template.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/kubevela/pkg/multicluster"
 	"github.com/pkg/errors"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -70,6 +71,7 @@ type Template struct {
 // It returns a helper struct, Template, which will be used for further
 // processing.
 func LoadTemplate(ctx context.Context, dm discoverymapper.DiscoveryMapper, cli client.Reader, capName string, capType types.CapType) (*Template, error) {
+	ctx = multicluster.WithCluster(ctx, multicluster.Local)
 	// Application Controller only load template from ComponentDefinition and TraitDefinition
 	switch capType {
 	case types.TypeComponentDefinition, types.TypeWorkload:

pkg/definition/gen_sdk/go.go

@@ -600,9 +600,9 @@ func (m *GoDefModifier) genDedicatedFunc() []*j.Statement {
 							j.Id("found").Op("=").True(),
 							j.Break(),
 						),
-						j.If(j.Op("!").Id("found")).Block(
-							j.Id(m.defFuncReceiver).Dot("Base").Dot("Traits").Op("=").Append(j.Id(m.defFuncReceiver).Dot("Base").Dot("Traits"), j.Id("addTrait")),
-						),
+					),
+					j.If(j.Op("!").Id("found")).Block(
+						j.Id(m.defFuncReceiver).Dot("Base").Dot("Traits").Op("=").Append(j.Id(m.defFuncReceiver).Dot("Base").Dot("Traits"), j.Id("addTrait")),
 					),
 				),
 				j.Return(j.Id(m.defFuncReceiver)),

pkg/workflow/operation/operation.go

@@ -489,7 +489,7 @@ func TerminateWorkflow(ctx context.Context, kubecli client.Client, app *v1beta1.
 			if step.Reason != wfTypes.StatusReasonFailedAfterRetries && step.Reason != wfTypes.StatusReasonTimeout {
 				steps[i].Reason = wfTypes.StatusReasonTerminate
 			}
-		case workflowv1alpha1.WorkflowStepPhaseRunning:
+		case workflowv1alpha1.WorkflowStepPhaseRunning, workflowv1alpha1.WorkflowStepPhaseSuspending:
 			steps[i].Phase = workflowv1alpha1.WorkflowStepPhaseFailed
 			steps[i].Reason = wfTypes.StatusReasonTerminate
 		default:
@@ -500,7 +500,7 @@ func TerminateWorkflow(ctx context.Context, kubecli client.Client, app *v1beta1.
 				if sub.Reason != wfTypes.StatusReasonFailedAfterRetries && sub.Reason != wfTypes.StatusReasonTimeout {
 					steps[i].SubStepsStatus[j].Reason = wfTypes.StatusReasonTerminate
 				}
-			case workflowv1alpha1.WorkflowStepPhaseRunning:
+			case workflowv1alpha1.WorkflowStepPhaseRunning, workflowv1alpha1.WorkflowStepPhaseSuspending:
 				steps[i].SubStepsStatus[j].Phase = workflowv1alpha1.WorkflowStepPhaseFailed
 				steps[i].SubStepsStatus[j].Reason = wfTypes.StatusReasonTerminate
 			default:

pkg/workflow/operation/operation_test.go

@@ -72,6 +72,17 @@ var _ = Describe("Kruise rollout test", func() {
 	It("Terminate workflow", func() {
 		checkApp := v1beta1.Application{}
 		Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "opt-app"}, &checkApp)).Should(BeNil())
+		checkApp.Status.Workflow = &common.WorkflowStatus{
+			Steps: []workflowv1alpha1.WorkflowStepStatus{
+				{
+					StepStatus: workflowv1alpha1.StepStatus{
+						Name:  "step1",
+						Type:  "suspend",
+						Phase: workflowv1alpha1.WorkflowStepPhaseSuspending,
+					},
+				},
+			},
+		}
 		operator := NewApplicationWorkflowOperator(k8sClient, nil, checkApp.DeepCopy())
 		Expect(operator.Terminate(ctx)).Should(BeNil())
 		checkApp = v1beta1.Application{}
@@ -98,7 +109,7 @@ var _ = Describe("Kruise rollout test", func() {
 					StepStatus: workflowv1alpha1.StepStatus{
 						Name:  "step1",
 						Type:  "suspend",
-						Phase: workflowv1alpha1.WorkflowStepPhaseRunning,
+						Phase: workflowv1alpha1.WorkflowStepPhaseSuspending,
 					},
 				},
 			},

references/cli/top/component/menu.go

@@ -48,7 +48,6 @@ func (m *Menu) StackPop(_, new model.View) {
 	} else {
 		m.UpdateMenu(new.Hint())
 	}
-
 }
 
 // StackPush change itself when accept "push" notify from app's main view

references/cli/top/view/application_view.go

@@ -134,7 +134,7 @@ func (v *ApplicationView) Title() string {
 func (v *ApplicationView) bindKeys() {
 	v.Actions().Delete([]tcell.Key{tcell.KeyEnter})
 	v.Actions().Add(model.KeyActions{
-		tcell.KeyESC:   model.KeyAction{Description: "Exist", Action: v.app.Exist, Visible: true, Shared: true},
+		tcell.KeyESC:   model.KeyAction{Description: "Exit", Action: v.app.Exist, Visible: true, Shared: true},
 		tcell.KeyEnter: model.KeyAction{Description: "Managed Resource", Action: v.managedResourceView, Visible: true, Shared: true},
 		component.KeyN: model.KeyAction{Description: "Select Namespace", Action: v.namespaceView, Visible: true, Shared: true},
 		component.KeyY: model.KeyAction{Description: "Yaml", Action: v.yamlView, Visible: true, Shared: true},

test/e2e-multicluster-test/multicluster_test.go

@@ -991,5 +991,32 @@ var _ = Describe("Test multicluster scenario", func() {
 				g.Expect(app.Status.Services[0].Traits[0].Healthy).Should(BeTrue())
 			}).WithTimeout(20 * time.Second).Should(Succeed())
 		})
+
+		It("Test application carrying deploy step with inline policy", func() {
+			ctx := context.Background()
+			wsDef := &v1beta1.WorkflowStepDefinition{}
+			bs, err := os.ReadFile("./testdata/def/inline-deploy.yaml")
+			Expect(err).Should(Succeed())
+			Expect(yaml.Unmarshal(bs, wsDef)).Should(Succeed())
+			wsDef.SetNamespace(namespace)
+			Expect(k8sClient.Create(ctx, wsDef)).Should(Succeed())
+			app := &v1beta1.Application{}
+			bs, err = os.ReadFile("./testdata/app/app-carrying-deploy-step-with-inline-policy.yaml")
+			Expect(err).Should(Succeed())
+			Expect(yaml.Unmarshal(bs, app)).Should(Succeed())
+			app.SetNamespace(namespace)
+			Eventually(func(g Gomega) {
+				g.Expect(k8sClient.Create(ctx, app)).Should(Succeed())
+			}).WithPolling(2 * time.Second).WithTimeout(5 * time.Second).Should(Succeed())
+			appKey := client.ObjectKeyFromObject(app)
+			Eventually(func(g Gomega) {
+				_app := &v1beta1.Application{}
+				g.Expect(k8sClient.Get(ctx, appKey, _app)).Should(Succeed())
+				g.Expect(_app.Status.Phase).Should(Equal(common.ApplicationRunning))
+			}).WithPolling(2 * time.Second).WithTimeout(20 * time.Second).Should(Succeed())
+			_deploy := &appsv1.Deployment{}
+			Expect(k8sClient.Get(ctx, appKey, _deploy)).Should(Succeed())
+			Expect(int(*_deploy.Spec.Replicas)).Should(Equal(0))
+		})
 	})
 })

test/e2e-multicluster-test/testdata/app/app-carrying-deploy-step-with-inline-policy.yaml

@@ -0,0 +1,19 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: test
+spec:
+  components:
+    - name: test
+      type: webservice
+      properties:
+        image: nginx:1.20
+  policies:
+    - type: topology
+      name: topo
+      properties:
+        clusters: ["cluster-worker"]
+  workflow:
+    steps:
+      - type: inline-deploy
+        name: deploy

test/e2e-multicluster-test/testdata/def/inline-deploy.yaml

@@ -0,0 +1,25 @@
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  name: inline-deploy
+spec:
+  schematic:
+    cue:
+      template: |
+        import "vela/op"
+        deploy: op.#Deploy & {
+          policies: []
+          parallelism: 5
+          ignoreTerraformComponent: true
+          inlinePolicies: [{
+            type: "override"
+            name: "set-replica"
+            properties: components: [{
+              traits: [{
+                type: "scaler"
+                properties: replicas: 0
+              }]
+            }]
+          }]
+        }
+        parameter: {}

test/e2e-test/health_scope_test.go

@@ -76,7 +76,7 @@ var _ = Describe("HealthScope", func() {
 		Expect(k8sClient.Delete(ctx, &ns, client.PropagationPolicy(metav1.DeletePropagationForeground))).Should(BeNil())
 	})
 
-	It("Test an application with health policy", func() {
+	PIt("Test an application with health policy", func() {
 		By("Apply a healthy application")
 		var newApp v1beta1.Application
 		var healthyAppName, unhealthyAppName string