Merge remote-tracking branch 'upstream/master' into postgres--operator

Author: MdSahil-oss

.github/workflows/addon-test.yaml

@@ -29,60 +29,65 @@ jobs:
 
   Addon-test:
     name: Addon-test
-    runs-on: aliyun
+    runs-on: self-hosted
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
 
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+
+      - 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@v2
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
       - name: Check addon semver
         run: |
           make check-addon-semver
 
-      - name: Install ginkgo
-        run:  |
-          sudo apt-get update
-          sudo apt-get install -y golang-ginkgo-dev
+      - name: Tear down K3d if exist
+        run: |
+          k3d cluster delete || true
+          k3d cluster delete worker || true
 
-      - name: Install Helm
-        uses: engineerd/[email protected]
+      - name: Setup K3d (Hub)
+        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
         with:
-          name: helm
-          url: https://get.helm.sh/helm-v3.1.2-linux-amd64.tar.gz
-          pathInArchive: linux-amd64/helm
-
-      - name: Setup Kind Cluster (Worker)
-        run: |
-          kind delete cluster --name worker
-          kind create cluster --image kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248 --name worker
-          kubectl version
-          kubectl cluster-info
-          kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
-          kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
+          version: ${{ matrix.k8s-version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          k3d-args: ${{ env.EGRESS_ARG }}
 
+      - name: Setup K3d (Worker)
+        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        with:
+          version: ${{ matrix.k8s-version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          k3d-name: worker
+          k3d-args: --kubeconfig-update-default=false --network=k3d-k3s-default ${{ env.EGRESS_ARG }}
 
-      - name: Setup Kind Cluster (Hub)
+      - name: Generating internal worker kubeconfig
         run: |
-          kind delete cluster
-          kind create cluster --image kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248
-          kubectl version
-          kubectl cluster-info
+          internal_ip=$(docker network inspect k3d-k3s-default|jq ".[0].Containers"| jq -r '.[]| select(.Name=="k3d-worker-server-0")|.IPv4Address' | cut -d/ -f1)
+          k3d kubeconfig get worker > /tmp/worker.client.kubeconfig
+          cp /tmp/worker.client.kubeconfig /tmp/worker.kubeconfig
+          sed -i "s/0.0.0.0:[0-9]\+/$internal_ip:6443/"  /tmp/worker.kubeconfig
 
       - name: Install vela cli
         run: |
-          curl -fsSl https://kubevela.io/script/install.sh | bash -s v1.8.0-alpha.3
+          curl -fsSl https://kubevela.io/script/install.sh | bash -s v1.9.0-alpha.3
 
       - name: Install vela core
         run: |
-          vela install --yes
+          vela install -v v1.9.0-alpha.2 --yes
           kubectl get deploy -n vela-system kubevela-vela-core -oyaml
 
       - name: Vela worker cluster join
@@ -105,5 +110,3 @@ jobs:
           go build -o main test/e2e-test/addon-test/main.go
           ./main ${{ steps.changed-files.outputs.all_changed_files }}
 
-
-

addons/fluxcd/config-templates/helm-repository.cue

@@ -1,3 +1,7 @@
+import (
+	"vela/config"
+)
+
 metadata: {
 	name:        "helm-repository"
 	alias:       "Helm Repository"
@@ -37,6 +41,11 @@ template: {
 			}
 		}
 	}
+
+	validation: config.#HelmRepository & {
+		$params: parameter
+	}
+
 	parameter: {
 		// +usage=The public url of the helm chart repository.
 		url: string

addons/fluxcd/metadata.yaml

@@ -1,5 +1,5 @@
 name: fluxcd
-version: 2.3.4
+version: 2.3.5
 description: Extended workload to do continuous and progressive delivery
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/flux/horizontal/color/flux-horizontal-color.png
 url: https://fluxcd.io
@@ -11,4 +11,4 @@ tags:
   - Helm
 
 system:
-  vela: ">=v1.7.0"
+  vela: ">=1.9.0-alpha.2"

addons/kruise-rollout/definitions/canary-deploy.cue

@@ -34,6 +34,7 @@ template: {
 						type: "rolling-release"
 						properties: {
 							weight: parameter.weight
+							rolloutType: parameter.rolloutType
 						}
 					}]
 				}]
@@ -47,5 +48,7 @@ template: {
 		components?: *[] | [...string]
 		//+usage=Specify the percentage of replicas to update to the new version at each step, as well as the routing of traffic to the new version, e.g., 20, 40...
 		weight: int
+		//+usage=Specifies the rollout type. Optional values: "partition", "canary". If not specify, the rolloutType is partition.
+    rolloutType: *"partition" | string
 	}
 }

addons/kruise-rollout/definitions/rolling-release.cue

@@ -83,6 +83,8 @@ template: {
 		final: *false | bool
 		// +usage=Define the workload for rolling. If not specified, it will be auto detected.
 		workloadType?: #WorkloadType
+		//+usage=Specifies the rollout type. Optional values: "partition", "canary". If not specify, the rolloutType is partition.
+    rolloutType: *"partition" | string
 	}
 
 	app: component: {...}
@@ -123,7 +125,7 @@ template: {
 			name:      context.name
 			namespace: context.namespace
 			annotations: {
-				"rollouts.kruise.io/rolling-style":    "partition"
+				"rollouts.kruise.io/rolling-style":    parameter.rolloutType
 				"controller.core.oam.dev/skip-resume": "true"
 			}
 		}

addons/kruise-rollout/metadata.yaml

@@ -1,13 +1,9 @@
 name: kruise-rollout
-version: 1.5.0
+version: 1.5.1
 description: Rollout workload by kruise controller
 url: https://github.com/openkruise/rollouts
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openkruise/stacked/color/openkruise-stacked-color.png
 
-deployTo:
-  control_plane: true
-  runtime_cluster: true
-
 tags:
  - Official
  - Rollout

addons/kruise-rollout/template.cue

@@ -7,23 +7,37 @@ output: {
 		name:      "kruise-rollout"
 		namespace: "vela-system"
 	}
-	spec: components: [{
-		name: "kruise-rollout"
-		type: "helm"
-		properties: {
-			repoType: "helm"
-			url:      "https://openkruise.github.io/charts/"
-			chart:    "kruise-rollout"
-			version:  "0.3.0"
-			values: {
-				replicaCount: 1
-				rollout: webhook: objectSelector: [{
-					 key: "kruise-rollout.oam.dev/webhook"
-					 operator: "Exists"
-				}]
+	spec: {
+		components: [{
+			name: "kruise-rollout"
+			type: "helm"
+			properties: {
+				repoType: "helm"
+				url:      "https://openkruise.github.io/charts/"
+				chart:    "kruise-rollout"
+				version:  "0.3.0"
+				values: {
+					replicaCount: 1
+					rollout: webhook: objectSelector: [{
+						key:      "kruise-rollout.oam.dev/webhook"
+						operator: "Exists"
+					}]
+				}
 			}
-		}
-	}]
+		}]
+		policies: [{
+			type: "topology"
+			name: "deploy-kruise-rollout"
+			properties: {
+				if parameter.clusters != _|_ {
+					clusters: parameter.clusters
+				}
+				if parameter.clusters == _|_ {
+					clusterLabelSelector: {}
+				}
+			}
+		}]
+	}
 }
 
 outputs: resourceTree: {

addons/netlify/metadata.yaml

@@ -1,14 +1,11 @@
 name: netlify
-version: 10.5.1
+version: 10.5.2
 description: Interact with Netlify from the comfort of your CLI.
 url: https://github.com/netlify/cli
 icon: https://raw.githubusercontent.com/netlify/cli/main/cli.png
 
 tags:
   - extended_workload
 
-deployTo:
-  runtime_cluster: true
-
 invisible: false
 

addons/netlify/template.cue

@@ -0,0 +1,23 @@
+output: {
+	apiVersion: "core.oam.dev/v1beta1"
+	kind:       "Application"
+	metadata: {
+		name:      "netlify"
+		namespace: "vela-system"
+	}
+	spec: {
+		components: []
+		policies: [{
+			type: "topology"
+			name: "deploy-netlify"
+			properties: {
+				if parameter.clusters != _|_ {
+					clusters: parameter.clusters
+				}
+				if parameter.clusters == _|_ {
+					clusterLabelSelector: {}
+				}
+			}
+		}]
+	}
+}

addons/rollout/metadata.yaml

@@ -1,5 +1,5 @@
 name: rollout
-version: 1.3.1
+version: 1.3.2
 description: Provides basic batch publishing capability.
 icon: https://static.kubevela.net/images/logos/KubeVela%20-03.png
 url: https://kubevela.io/docs/end-user/traits/rollout
@@ -9,9 +9,6 @@ tags:
   - rollout
   - GA
 
-deployTo:
-  runtimeCluster: true
-
 dependencies: 
   # install controller by helm.
   - name: fluxcd

addons/rollout/template.cue

@@ -0,0 +1,23 @@
+output: {
+	apiVersion: "core.oam.dev/v1beta1"
+	kind:       "Application"
+	metadata: {
+		name:      "rollout"
+		namespace: "vela-system"
+	}
+	spec: {
+		components: []
+		policies: [{
+			type: "topology"
+			name: "deploy-rollout"
+			properties: {
+				if parameter.clusters != _|_ {
+					clusters: parameter.clusters
+				}
+				if parameter.clusters == _|_ {
+					clusterLabelSelector: {}
+				}
+			}
+		}]
+	}
+}