Feat: upgrade deps (#5900)

* Chore: cherry-pick #5821 #5822

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

* Chore: upgrade cluster gateway

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

* Chore: fix config test

Signed-off-by: Somefive <yd219913@alibaba-inc.com>

---------

Signed-off-by: Somefive <yd219913@alibaba-inc.com>
This commit is contained in:
Somefive
2023-04-23 17:50:37 +08:00
committed by GitHub
parent 3de9e391ee
commit 1aaab58f15
6 changed files with 20 additions and 8 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ jobs:
allow-edits: "false"
permission-level: read
- name: Handle Command
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410
env:
VERSION: ${{ steps.command.outputs.command-arguments }}
with:
+1 -1
View File
@@ -87,7 +87,7 @@ jobs:
- name: Update kubectl plugin version in krew-index
uses: rajatjindal/krew-release-bot@df3eb197549e3568be8b4767eec31c5e8e8e6ad8 # v0.0.46
- name: Update Homebrew formula
uses: dawidd6/action-homebrew-bump-formula@e9b43cd30eec6ea80777e7e22e1526beb1675c18 # v3.9.0
uses: dawidd6/action-homebrew-bump-formula@d3667e5ae14df19579e4414897498e3e88f2f458 # v3.10.0
with:
token: ${{ secrets.HOMEBREW_TOKEN }}
formula: kubevela
+1 -1
View File
@@ -111,7 +111,7 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
| `multicluster.clusterGateway.replicaCount` | ClusterGateway replica count | `1` |
| `multicluster.clusterGateway.port` | ClusterGateway port | `9443` |
| `multicluster.clusterGateway.image.repository` | ClusterGateway image repository | `oamdev/cluster-gateway` |
| `multicluster.clusterGateway.image.tag` | ClusterGateway image tag | `v1.8.0` |
| `multicluster.clusterGateway.image.tag` | ClusterGateway image tag | `v1.9.0-alpha.2` |
| `multicluster.clusterGateway.image.pullPolicy` | ClusterGateway image pull policy | `IfNotPresent` |
| `multicluster.clusterGateway.resources.requests.cpu` | ClusterGateway cpu request | `50m` |
| `multicluster.clusterGateway.resources.requests.memory` | ClusterGateway memory request | `20Mi` |
+1 -1
View File
@@ -158,7 +158,7 @@ multicluster:
port: 9443
image:
repository: oamdev/cluster-gateway
tag: v1.8.0
tag: v1.9.0-alpha.2
pullPolicy: IfNotPresent
resources:
requests:
+8 -1
View File
@@ -18,6 +18,9 @@ package config
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
"testing"
"github.com/stretchr/testify/require"
@@ -79,6 +82,10 @@ func TestImageRegistry(t *testing.T) {
func TestHelmRepository(t *testing.T) {
ctx := context.Background()
svr := httptest.NewTLSServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
_, _ = fmt.Fprintf(writer, "corrupted")
}))
defer svr.Close()
testCases := []struct {
name string
validationParams *HelmRepositoryParams
@@ -97,7 +104,7 @@ func TestHelmRepository(t *testing.T) {
name: "Shouldn't authenticate with incorrect helm repo URL",
validationParams: &HelmRepositoryParams{
Params: HelmRepositoryVars{
URL: "https://www.baidu.com",
URL: svr.URL,
},
},
expectResult: false,
+8 -3
View File
@@ -18,6 +18,9 @@ package helm
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
"os"
. "github.com/onsi/ginkgo"
@@ -133,9 +136,11 @@ var _ = Describe("Test helm helper", func() {
It("Test validate the corrupt helm repo", func() {
helper := NewHelper()
helmRepo := &Repository{
URL: "https://www.baidu.com",
}
svr := httptest.NewTLSServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
_, _ = fmt.Fprintf(writer, "corrupted")
}))
defer svr.Close()
helmRepo := &Repository{URL: svr.URL}
ok, err := helper.ValidateRepo(ctx, helmRepo)
Expect(err).To(HaveOccurred())
Expect(ok).Should(BeFalse())