From e677ef707ada1d31147fe156928f1d18daf4eeec Mon Sep 17 00:00:00 2001 From: Somefive Date: Wed, 25 May 2022 21:06:02 +0800 Subject: [PATCH] Feat: upgrade cluster-gateway version Signed-off-by: Somefive --- charts/vela-core/README.md | 2 +- .../cluster-gateway/cluster-gateway.yaml | 2 +- charts/vela-core/values.yaml | 2 +- charts/vela-minimal/README.md | 2 +- .../templates/cluster-gateway.yaml | 2 +- charts/vela-minimal/values.yaml | 2 +- go.mod | 30 ++++++++----------- go.sum | 13 ++++---- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/charts/vela-core/README.md b/charts/vela-core/README.md index f87561691..705a524e7 100644 --- a/charts/vela-core/README.md +++ b/charts/vela-core/README.md @@ -103,7 +103,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.3.2` | +| `multicluster.clusterGateway.image.tag` | ClusterGateway image tag | `v1.4.0` | | `multicluster.clusterGateway.image.pullPolicy` | ClusterGateway image pull policy | `IfNotPresent` | | `multicluster.clusterGateway.resources.limits.cpu` | ClusterGateway cpu limit | `100m` | | `multicluster.clusterGateway.resources.limits.memory` | ClusterGateway memory limit | `200Mi` | diff --git a/charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml b/charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml index 5317b61e1..d624bc845 100644 --- a/charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml +++ b/charts/vela-core/templates/cluster-gateway/cluster-gateway.yaml @@ -31,7 +31,7 @@ spec: - "apiserver" - "--secure-port={{ .Values.multicluster.clusterGateway.port }}" - "--secret-namespace={{ .Release.Namespace }}" - - "--feature-gates=APIPriorityAndFairness=false" + - "--feature-gates=APIPriorityAndFairness=false,ClientIdentityPenetration={{ .Values.authentication.enabled }}" {{- if .Values.multicluster.clusterGateway.secureTLS.enabled }} - "--tls-cert-file={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}/tls.crt" - "--tls-private-key-file={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}/tls.key" diff --git a/charts/vela-core/values.yaml b/charts/vela-core/values.yaml index 2cc6da27e..b89c4ae34 100644 --- a/charts/vela-core/values.yaml +++ b/charts/vela-core/values.yaml @@ -130,7 +130,7 @@ multicluster: port: 9443 image: repository: oamdev/cluster-gateway - tag: v1.3.2 + tag: v1.4.0 pullPolicy: IfNotPresent resources: limits: diff --git a/charts/vela-minimal/README.md b/charts/vela-minimal/README.md index 7e8db7a8e..3d43be145 100644 --- a/charts/vela-minimal/README.md +++ b/charts/vela-minimal/README.md @@ -105,7 +105,7 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal -- | `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.3.2` | +| `multicluster.clusterGateway.image.tag` | ClusterGateway image tag | `v1.4.0` | | `multicluster.clusterGateway.image.pullPolicy` | ClusterGateway image pull policy | `IfNotPresent` | | `multicluster.clusterGateway.resources.limits.cpu` | ClusterGateway cpu limit | `100m` | | `multicluster.clusterGateway.resources.limits.memory` | ClusterGateway memory limit | `200Mi` | diff --git a/charts/vela-minimal/templates/cluster-gateway.yaml b/charts/vela-minimal/templates/cluster-gateway.yaml index ea2539ae9..dfdcbd3db 100644 --- a/charts/vela-minimal/templates/cluster-gateway.yaml +++ b/charts/vela-minimal/templates/cluster-gateway.yaml @@ -31,7 +31,7 @@ spec: - "apiserver" - "--secure-port={{ .Values.multicluster.clusterGateway.port }}" - "--secret-namespace={{ .Release.Namespace }}" - - "--feature-gates=APIPriorityAndFairness=false" + - "--feature-gates=APIPriorityAndFairness=false,ClientIdentityPenetration={{ .Values.authentication.enabled }}" {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }} - "--cert-dir={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}" {{ end }} diff --git a/charts/vela-minimal/values.yaml b/charts/vela-minimal/values.yaml index a8bd9c2b0..32d45270e 100644 --- a/charts/vela-minimal/values.yaml +++ b/charts/vela-minimal/values.yaml @@ -107,7 +107,7 @@ multicluster: port: 9443 image: repository: oamdev/cluster-gateway - tag: v1.3.2 + tag: v1.4.0 pullPolicy: IfNotPresent resources: limits: diff --git a/go.mod b/go.mod index 2f4f45697..2ffd6dd07 100644 --- a/go.mod +++ b/go.mod @@ -25,6 +25,7 @@ require ( github.com/emicklei/go-restful-openapi/v2 v2.3.0 github.com/emicklei/go-restful/v3 v3.0.0-rc2 github.com/evanphx/json-patch v4.12.0+incompatible + github.com/fatih/camelcase v1.0.0 github.com/fatih/color v1.13.0 github.com/form3tech-oss/jwt-go v3.2.3+incompatible github.com/gertd/go-pluralize v0.1.7 @@ -34,6 +35,7 @@ require ( github.com/go-playground/validator/v10 v10.9.0 github.com/go-resty/resty/v2 v2.7.0 github.com/google/go-cmp v0.5.8 + github.com/google/go-containerregistry v0.9.0 github.com/google/go-github/v32 v32.1.0 github.com/google/uuid v1.3.0 github.com/gosuri/uilive v0.0.4 @@ -42,10 +44,10 @@ require ( github.com/hashicorp/hcl/v2 v2.9.1 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 github.com/imdario/mergo v0.3.12 - github.com/kubevela/prism v0.0.0-20220512081342-9b641aa819f3 + github.com/kubevela/prism v1.4.0 github.com/kyokomi/emoji v2.2.4+incompatible github.com/mitchellh/hashstructure/v2 v2.0.1 - github.com/oam-dev/cluster-gateway v1.3.3-0.20220509095841-4272c540e1e9 + github.com/oam-dev/cluster-gateway v1.4.0 github.com/oam-dev/cluster-register v1.0.4-0.20220325092210-cee4a3d3fb7d github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 github.com/oam-dev/terraform-controller v0.7.0 @@ -56,6 +58,7 @@ require ( github.com/openkruise/kruise-api v1.1.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.11.0 + github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 @@ -63,6 +66,7 @@ require ( github.com/tidwall/gjson v1.9.3 github.com/wercker/stern v0.0.0-20190705090245-4fa46dd6987f github.com/wonderflow/cert-manager-api v1.0.3 + github.com/xanzy/go-gitlab v0.60.0 github.com/xlab/treeprint v1.1.0 go.mongodb.org/mongo-driver v1.5.1 go.uber.org/zap v1.19.1 @@ -70,6 +74,7 @@ require ( golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/src-d/go-git.v4 v4.13.1 @@ -98,20 +103,6 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -require ( - github.com/fatih/camelcase v1.0.0 - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-retryablehttp v0.7.0 // indirect - github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect - github.com/robfig/cron/v3 v3.0.1 - github.com/xanzy/go-gitlab v0.60.0 - github.com/xanzy/ssh-agent v0.3.0 // indirect - golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 -) - -require github.com/google/go-containerregistry v0.9.0 - require ( cloud.google.com/go/compute v1.6.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect @@ -194,6 +185,8 @@ require ( github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-retryablehttp v0.7.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect @@ -203,6 +196,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect + github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect github.com/klauspost/compress v1.15.4 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/kr/pty v1.1.8 // indirect @@ -255,6 +249,7 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tjfoc/gmsm v1.3.2 // indirect + github.com/xanzy/ssh-agent v0.3.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.0.2 // indirect github.com/xdg-go/stringprep v1.0.2 // indirect @@ -285,6 +280,7 @@ require ( golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 // indirect @@ -301,7 +297,7 @@ require ( istio.io/api v0.0.0-20210128181506-0c4b8e54850f // indirect istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a // indirect oras.land/oras-go v0.4.0 // indirect - sigs.k8s.io/apiserver-network-proxy v0.0.24 // indirect + sigs.k8s.io/apiserver-network-proxy v0.0.30 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect sigs.k8s.io/apiserver-runtime v1.1.1 // indirect sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect diff --git a/go.sum b/go.sum index b16c0fbba..64611c899 100644 --- a/go.sum +++ b/go.sum @@ -1331,8 +1331,8 @@ 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/prism v0.0.0-20220512081342-9b641aa819f3 h1:SiQjuAJVLa75M/uVufyEylzlmi+1sZzCnsDN76IFTr4= -github.com/kubevela/prism v0.0.0-20220512081342-9b641aa819f3/go.mod h1:Ms3P9eWEeddXk7Q51+9sV1cGQL0cjlpBcSdp1/HoCaI= +github.com/kubevela/prism v1.4.0 h1:wYCKXA3p9YpkcSsZjGnSEGBVL+3bPoZNEt4DYs3IxW4= +github.com/kubevela/prism v1.4.0/go.mod h1:RP69+bRb57Occer6BeeF5zK3hrD1IhnYf2RNRsIdh9E= github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= github.com/kunwardeep/paralleltest v1.0.3/go.mod h1:vLydzomDFpk7yu5UX02RmP0H8QfRPOV/oFhWN85Mjb4= @@ -1551,8 +1551,8 @@ github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oam-dev/cluster-gateway v1.3.3-0.20220509095841-4272c540e1e9 h1:D3Z+QJi/5+J+wHwVPEo2ygFHXPaMS9t4NHfyIHZatiw= -github.com/oam-dev/cluster-gateway v1.3.3-0.20220509095841-4272c540e1e9/go.mod h1:WcxTF3tOZFxRm1wztAJnXPM4cpjYqnEFIuAU9EM6pD0= +github.com/oam-dev/cluster-gateway v1.4.0 h1:ZZcNRYsUDRWM5JnNX28/zdSPRKERGstcAY+PaJKA0mE= +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/stern v1.13.2 h1:jlGgtJbKmIVhzkH44ft5plkgs8XEfvxbFrQdX60CQR4= @@ -2905,6 +2905,7 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= @@ -3287,8 +3288,8 @@ rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy v0.0.24 h1:yaswrAqidc2XdLK2GRacVEBb55g4dg91f/B7b0SYliY= -sigs.k8s.io/apiserver-network-proxy v0.0.24/go.mod h1:z/U9KltvRVSMttVl3cdQo8cPuXEjr+Qn3A5sUJR55XI= +sigs.k8s.io/apiserver-network-proxy v0.0.30 h1:Zr5Zqd2GymcYUwijHUDEaQ1I3Dx0giTIWaD80N6j2mE= +sigs.k8s.io/apiserver-network-proxy v0.0.30/go.mod h1:0wSWl5ohhp7kYl5XOP0w1IZSWTHhe9TojjDGityZxnc= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24 h1:bCO6TN9VG1bK3nCG5ghQ5httx1HpsG5MD8XtRDySHDM= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-runtime v1.1.0/go.mod h1:cmahVEn9R791yUnSiFMFdwTqi2dOe5WQRNwcY6jb7l0=