Fix: upgrade workflow to fix suspend (#6623 )

* fix: upgrade workflow to fix suspend Signed-off-by: FogDong <fog@bentoml.com> * fix: fix gomega version Signed-off-by: FogDong <fog@bentoml.com> * Fix: Update docker image and workflow go version to 1.22 Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> * Fix: do dependency fix check Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> * Fix: build failure Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> * Fix: build failure Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> --------- Signed-off-by: FogDong <fog@bentoml.com> Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> Co-authored-by: Anoop Gopalakrishnan <anoop2811@aol.in>
Fix(CUE): fix volumns variable err bug in vela-cli (#6619 )
2026-03-01 09:10:43 +00:00 · 2024-09-29 01:57:45 +05:30 · 2024-09-19 09:53:07 +08:00 · 2024-09-19 09:51:43 +08:00 · 2024-04-22 15:31:51 +08:00 · 2024-04-07 10:38:33 +08:00
10 changed files with 39 additions and 24 deletions
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -18,7 +18,7 @@ permissions:

 env:
  # Common versions
-  GO_VERSION: '1.19'
+  GO_VERSION: '1.22'

 jobs:

@@ -78,7 +78,8 @@ jobs:
      - name: Get Ginkgo
        run: |
          go install github.com/onsi/ginkgo/v2/ginkgo@v2.10.0
-          go get github.com/onsi/gomega/...
+          go get github.com/onsi/gomega@v1.34.2
+          go mod tidy

      - name: Load image
        run: |
--- a/.github/workflows/license.yml
+++ b/.github/workflows/license.yml
@@ -9,7 +9,6 @@ on:
    branches:
      - master
      - release-*
-      -
 permissions:
  contents: read

--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine@sha256:2381c1e5f8350a901597d633b2e517775eeac7a6682be39225a93b22cfd0f8bb as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22.7-alpine@sha256:48eab5e3505d8c8b42a06fe5f1cf4c346c167cc6a89e772f31cb9e5c301dcf60 as builder

 WORKDIR /workspace
 # Copy the Go Modules manifests
--- a/charts/vela-core/README.md
+++ b/charts/vela-core/README.md
@@ -186,6 +186,21 @@ if [ $fluxcd ]; then
 fi
 ```

+Make sure all existing KubeVela resources deleted before uninstallation:
+```shell
+kubectl delete applicationrevisions.core.oam.dev --all
+kubectl delete applications.core.oam.dev --all
+kubectl delete componentdefinitions.core.oam.dev --all
+kubectl delete definitionrevisions.core.oam.dev --all
+kubectl delete policies.core.oam.dev --all
+kubectl delete policydefinitions.core.oam.dev --all
+kubectl delete resourcetrackers.core.oam.dev --all
+kubectl delete traitdefinitions.core.oam.dev --all
+kubectl delete workflows.core.oam.dev --all
+kubectl delete workflowstepdefinitions.core.oam.dev --all
+kubectl delete workloaddefinitions.core.oam.dev --all
+```
+
 To uninstall the KubeVela helm release:

 ```shell
--- a/charts/vela-core/templates/defwithtemplate/startup-probe.yaml
+++ b/charts/vela-core/templates/defwithtemplate/startup-probe.yaml
@@ -65,7 +65,7 @@ spec:
        	// +usage=Instructions for assessing container startup status by probing a TCP socket. Either this attribute or the exec attribute or the tcpSocket attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with the exec attribute and the httpGet attribute and the gRPC attribute.
        	tcpSocket?: {
        		// +usage=Number or name of the port to access on the container.
-        		port: string
+        		port: int
        		// +usage=Host name to connect to, defaults to the pod IP.
        		host?: string
        	}
@@ -144,7 +144,7 @@ spec:
        					grpc: parameter.grpc
        				}
        				if parameter.tcpSocket != _|_ {
-        					tcpSocket: parameter.grtcpSocketpc
+        					tcpSocket: parameter.tcpSocket
        				}
        			}}
        		}]
--- a/charts/vela-core/templates/defwithtemplate/vela-cli.yaml
+++ b/charts/vela-core/templates/defwithtemplate/vela-cli.yaml
@@ -46,11 +46,11 @@ spec:
        				}
        			}
        		}
-        		if parameter.storage != _|_ && parameter.storage.hostPath != _|_ for v in parameter.storage.hostPath {
-        			{
-        				name: "hostpath-" + v.name
-        				path: v.path
-        			}
+        	},
+        	if parameter.storage != _|_ && parameter.storage.hostPath != _|_ for v in parameter.storage.hostPath {
+        		{
+        			name: "hostpath-" + v.name
+        			path: v.path
        		}
        	},
        ]
--- a/go.mod
+++ b/go.mod
@@ -36,8 +36,8 @@ require (
 	github.com/hashicorp/hcl/v2 v2.18.0
 	github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174
 	github.com/imdario/mergo v0.3.16
-	github.com/kubevela/pkg v1.9.0
-	github.com/kubevela/workflow v0.6.0
+	github.com/kubevela/pkg v1.9.2
+	github.com/kubevela/workflow v0.6.1
 	github.com/kyokomi/emoji v2.2.4+incompatible
 	github.com/magiconair/properties v1.8.7
 	github.com/mattn/go-runewidth v0.0.15
--- a/go.sum
+++ b/go.sum
@@ -601,10 +601,10 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubevela/pkg v1.9.0 h1:k3DE8yC86K4s+hY04dUyxDSd6JKeluvmgQYvtsouDDg=
-github.com/kubevela/pkg v1.9.0/go.mod h1:u/MGuFXVSECxvIWdTKS4AQs1H+USfAMQgi30BUrOb04=
-github.com/kubevela/workflow v0.6.0 h1:fYXviOYD5zqHs3J61tNbM4HZ85EcZlPm7Fyz8Q5o9Fk=
-github.com/kubevela/workflow v0.6.0/go.mod h1:sjLcYqKHKeCQ+w77gijoNILwIShJKnCU+e3q7ETtZGI=
+github.com/kubevela/pkg v1.9.2 h1:K6pGoJikf6l8vlfehewmb36hyToX0KpUaQP4NVET/S8=
+github.com/kubevela/pkg v1.9.2/go.mod h1:u/MGuFXVSECxvIWdTKS4AQs1H+USfAMQgi30BUrOb04=
+github.com/kubevela/workflow v0.6.1 h1:x6ro6dTzi5Rrh0pnnqRbNMlhvhP5Rzsls44gP1C3qzw=
+github.com/kubevela/workflow v0.6.1/go.mod h1:sjLcYqKHKeCQ+w77gijoNILwIShJKnCU+e3q7ETtZGI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
--- a/vela-templates/definitions/internal/trait/startup-probe.cue
+++ b/vela-templates/definitions/internal/trait/startup-probe.cue
@@ -56,7 +56,7 @@ template: {
 		// +usage=Instructions for assessing container startup status by probing a TCP socket. Either this attribute or the exec attribute or the tcpSocket attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with the exec attribute and the httpGet attribute and the gRPC attribute.
 		tcpSocket?: {
 			// +usage=Number or name of the port to access on the container.
-			port: string
+			port: int
 			// +usage=Host name to connect to, defaults to the pod IP.
 			host?: string
 		}
@@ -135,7 +135,7 @@ template: {
 						grpc: parameter.grpc
 					}
 					if parameter.tcpSocket != _|_ {
-						tcpSocket: parameter.grtcpSocketpc
+						tcpSocket: parameter.tcpSocket
 					}
 				}}
 			}]
--- a/vela-templates/definitions/internal/workflowstep/vela-cli.cue
+++ b/vela-templates/definitions/internal/workflowstep/vela-cli.cue
@@ -41,11 +41,11 @@ template: {
 					}
 				}
 			}
-			if parameter.storage != _|_ && parameter.storage.hostPath != _|_ for v in parameter.storage.hostPath {
-				{
-					name: "hostpath-" + v.name
-					path: v.path
-				}
+		},
+		if parameter.storage != _|_ && parameter.storage.hostPath != _|_ for v in parameter.storage.hostPath {
+			{
+				name: "hostpath-" + v.name
+				path: v.path
 			}
 		},
 	]
Author	SHA1	Message	Date
Tianxin Dong	d56da069eb	Fix: upgrade workflow to fix suspend (#6623 ) * fix: upgrade workflow to fix suspend Signed-off-by: FogDong <fog@bentoml.com> * fix: fix gomega version Signed-off-by: FogDong <fog@bentoml.com> * Fix: Update docker image and workflow go version to 1.22 Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> * Fix: do dependency fix check Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> * Fix: build failure Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> * Fix: build failure Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> --------- Signed-off-by: FogDong <fog@bentoml.com> Signed-off-by: Anoop Gopalakrishnan <anoop2811@aol.in> Co-authored-by: Anoop Gopalakrishnan <anoop2811@aol.in>	2024-09-29 01:57:45 +05:30
github-actions[bot]	89c1d07a8f	Fix(CUE): fix volumns variable err bug in vela-cli (#6619 ) Signed-off-by: yukunjie <yukunjie007@163.com> Co-authored-by: yukunjie <yukunjie007@163.com> (cherry picked from commit `b605e0857c`) Co-authored-by: yukunjie <yukunjie007@163.com>	2024-09-19 09:53:07 +08:00
github-actions[bot]	fa8350bc50	fix: disable auto maxprocs logging (#6618 ) Signed-off-by: FogDong <fog@bentoml.com> (cherry picked from commit `d025a6d5af`) Co-authored-by: FogDong <fog@bentoml.com>	2024-09-19 09:51:43 +08:00
Tianxin Dong	8917780555	fix: bump pkg version to fix the client bug (#6507 ) Signed-off-by: FogDong <fog@bentoml.com>	2024-04-22 15:31:51 +08:00
曾子恒	f46bfcf131	Fix(CUE): fix variable error bug in startup-probe (#6472 ) The original variable is "grtcpSocketpc", but this variable does not exist in the file. According to the context, it should be "tcpSocket". In addition, its type needs to be int to work properly. Signed-off-by: zengziheng <zengziheng@datacloak.com> Co-authored-by: zengziheng <zengziheng@datacloak.com>	2024-04-07 10:38:33 +08:00
yyzxw	5bdd0db6e7	Chore: update chart readme (#6494 ) Signed-off-by: yyzxw <1020938856@qq.com> Co-authored-by: xiaowu.zhu <xiaowu.zhu@daocloud.io>	2024-04-01 16:06:20 +08:00
yyzxw	838ff055b8	chore: ci yaml err (#6492 ) Signed-off-by: xiaowu.zhu <xiaowu.zhu@daocloud.io> Co-authored-by: xiaowu.zhu <xiaowu.zhu@daocloud.io>	2024-04-01 10:28:12 +08:00