From 4e84b0046041189ac97b62d3385c07941b486f00 Mon Sep 17 00:00:00 2001 From: qiaozp <47812250+chivalryq@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:44:31 +0800 Subject: [PATCH] Bump vela to v1.5.5 (#86) --- Makefile | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ .../static/vela/charts/vela-core/Chart.yaml | 4 ++-- .../templates/defwithtemplate/webservice.yaml | 5 +++++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 73a9c2e..f1c1a34 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include makefiles/dependency.mk K3S_VERSION ?= v1.21.10+k3s1 STATIC_DIR := pkg/resources/static -VELA_VERSION ?= v1.5.4 +VELA_VERSION ?= v1.5.5 VELAUX_VERSION ?= v1.5.4 LDFLAGS= "-X github.com/oam-dev/velad/version.VelaUXVersion=${VELAUX_VERSION} -X github.com/oam-dev/velad/version.VelaVersion=${VELA_VERSION}" OS ?= linux diff --git a/go.mod b/go.mod index 096b02f..0c1f9fb 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/fatih/color v1.13.0 github.com/k3d-io/k3d/v5 v5.4.1 github.com/kyokomi/emoji/v2 v2.2.9 - github.com/oam-dev/kubevela v1.5.4 + github.com/oam-dev/kubevela v1.5.5 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.7.1 @@ -248,10 +248,10 @@ require ( go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect - golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect + golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220624220833-87e55d714810 // indirect + golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect diff --git a/go.sum b/go.sum index 973bb73..00ab986 100644 --- a/go.sum +++ b/go.sum @@ -1486,8 +1486,8 @@ github.com/oam-dev/cluster-gateway v1.4.0 h1:ZZcNRYsUDRWM5JnNX28/zdSPRKERGstcAY+ github.com/oam-dev/cluster-gateway v1.4.0/go.mod h1:qnCczkXtTY7h0SqxjZqAAyKQPwrJjLIFy+IdeoaYKCU= github.com/oam-dev/cluster-register v1.0.4-0.20220325092210-cee4a3d3fb7d h1:ZZsBkksYDzwJEjqx9/XBD+VwlhHz8flkZvMJYzO4ASA= github.com/oam-dev/cluster-register v1.0.4-0.20220325092210-cee4a3d3fb7d/go.mod h1:nKEUMfuEB8pHKsaSah9IA+UQzezrPYebBdRozyNtlZc= -github.com/oam-dev/kubevela v1.5.4 h1:m8Gp78QZTtspifISlNggwCviHSoFgSJj1SFiILgSo/w= -github.com/oam-dev/kubevela v1.5.4/go.mod h1:bJB9TyKcPAeAXMK8XHoSiS5aFNp7O/OIXEfJGHxd23s= +github.com/oam-dev/kubevela v1.5.5 h1:WfdXmgPRhNMO/kTXxgPx4LgVDiJOD0ttM8uHNrn6IOA= +github.com/oam-dev/kubevela v1.5.5/go.mod h1:2uCMyEuTBDOItab4bqNQUG9wAcew6vLGeUMke1ACS1g= github.com/oam-dev/stern v1.13.2 h1:jlGgtJbKmIVhzkH44ft5plkgs8XEfvxbFrQdX60CQR4= github.com/oam-dev/stern v1.13.2/go.mod h1:0pLjZt0amXE/ErF16Rdrgd98H2owN8Hmn3/7CX5+AeA= github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 h1:tD8HiFKnt0jnwdTWjeqUnfnUYLD/+Nsmj8ZGIxqDWiU= @@ -2259,8 +2259,8 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220421235706-1d1ef9303861/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/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= @@ -2449,8 +2449,8 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220624220833-87e55d714810 h1:rHZQSjJdAI4Xf5Qzeh2bBc5YJIkPFVM6oDtMFYmgws0= -golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/pkg/resources/static/vela/charts/vela-core/Chart.yaml b/pkg/resources/static/vela/charts/vela-core/Chart.yaml index 776c2f7..7519115 100644 --- a/pkg/resources/static/vela/charts/vela-core/Chart.yaml +++ b/pkg/resources/static/vela/charts/vela-core/Chart.yaml @@ -14,11 +14,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: v1.5.4 +version: v1.5.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: v1.5.4 +appVersion: v1.5.5 home: https://kubevela.io icon: https://kubevela.io/img/logo.svg diff --git a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/webservice.yaml b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/webservice.yaml index 08a51c8..0568d88 100644 --- a/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/webservice.yaml +++ b/pkg/resources/static/vela/charts/vela-core/templates/defwithtemplate/webservice.yaml @@ -306,6 +306,9 @@ spec: if v.name == _|_ { name: "port-" + strconv.FormatInt(v.port, 10) } + if v.nodePort != _|_ && parameter.exposeType == "NodePort" { + nodePort: v.nodePort + } }, ] outputs: { @@ -354,6 +357,8 @@ spec: protocol: *"TCP" | "UDP" | "SCTP" // +usage=Specify if the port should be exposed expose: *false | bool + // +usage=exposed node port. Only Valid when exposeType is NodePort + nodePort?: int }] // +ignore