Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/ui/framewor…
Browse files Browse the repository at this point in the history
…k/vue3
  • Loading branch information
Helltab committed Jan 13, 2024
2 parents 8b82013 + 3e060ac commit e96dd23
Show file tree
Hide file tree
Showing 718 changed files with 165,374 additions and 108 deletions.
2 changes: 2 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ header:
- '**/deploy.tpl'
- '**/docs/**'
- '**/.nvmrc'
- '**/**.txtar'
- '**/**gen.go'
comment: on-failure

license-location-threshold: 130
8 changes: 6 additions & 2 deletions app/dubbo-cp/cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"os"
"time"

"github.com/apache/dubbo-kubernetes/pkg/webhook"

"github.com/apache/dubbo-kubernetes/pkg/admin"
"github.com/apache/dubbo-kubernetes/pkg/bufman"
"github.com/apache/dubbo-kubernetes/pkg/core/kubeclient"
"github.com/apache/dubbo-kubernetes/pkg/dds"
"github.com/apache/dubbo-kubernetes/pkg/snp"
"github.com/apache/dubbo-kubernetes/pkg/webhook"

"github.com/apache/dubbo-kubernetes/pkg/authority"
"github.com/apache/dubbo-kubernetes/pkg/config"
Expand Down Expand Up @@ -90,6 +90,10 @@ func newRunCmdWithOpts(opts cmd.RunCmdOpts) *cobra.Command {
logger.Sugar().Error(err, "unable to set up Metrics")
}

if err := bufman.Setup(rt); err != nil {
logger.Sugar().Error(err, "unable to set up bufman")
}

if err := cert.Setup(rt); err != nil {
logger.Sugar().Error(err, "unable to set up certProvider")
}
Expand Down
39 changes: 27 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/Microsoft/go-winio v0.6.1
github.com/apache/dubbo-go-hessian2 v1.12.2
github.com/bufbuild/connect-go v1.10.0
github.com/bufbuild/protocompile v0.5.1
github.com/buildpacks/pack v0.30.0
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/containers/image/v5 v5.27.0
Expand All @@ -38,43 +40,62 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0
github.com/ghodss/yaml v1.0.0
github.com/gin-gonic/gin v1.9.1
github.com/go-chi/chi/v5 v5.0.11
github.com/go-git/go-billy/v5 v5.4.1
github.com/go-git/go-git/v5 v5.8.1
github.com/gofrs/flock v0.8.1
github.com/gofrs/uuid/v5 v5.0.0
github.com/gogo/protobuf v1.3.2
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/google/go-containerregistry v0.16.1
github.com/google/uuid v1.3.0
github.com/google/yamlfmt v0.9.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hashicorp/go-multierror v1.1.1
github.com/heroku/color v0.0.6
github.com/jdxcode/netrc v1.0.0
github.com/klauspost/compress v1.16.6
github.com/kylelemons/godebug v1.1.0
github.com/mattbaird/jsonpatch v0.0.0-20230413205102-771768614e91
github.com/moby/term v0.5.0
github.com/onsi/gomega v1.27.10
github.com/ory/viper v1.7.5
github.com/pkg/errors v0.9.1
github.com/pkg/profile v1.5.0
github.com/prometheus/client_golang v1.15.1
github.com/prometheus/common v0.44.0
github.com/spf13/cobra v1.7.0
github.com/rs/cors v1.10.1
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/tetratelabs/wazero v1.2.1
github.com/tidwall/gjson v1.14.4
github.com/vcraescu/go-paginator v1.0.0
go.opentelemetry.io/otel v1.15.0
go.opentelemetry.io/otel/sdk v1.14.0
go.opentelemetry.io/otel/trace v1.15.0
go.uber.org/atomic v1.10.0
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.14.0
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
golang.org/x/mod v0.12.0
golang.org/x/net v0.17.0
golang.org/x/sync v0.5.0
golang.org/x/term v0.13.0
golang.org/x/tools v0.9.3
google.golang.org/grpc v1.56.2
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
gorm.io/driver/mysql v1.5.1
gorm.io/driver/sqlite v1.5.2
gorm.io/gen v0.3.24
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55
gorm.io/plugin/dbresolver v1.3.0
helm.sh/helm/v3 v3.12.3
k8s.io/api v0.27.3
k8s.io/apiextensions-apiserver v0.27.3
Expand Down Expand Up @@ -136,6 +157,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20230522190001-adf1bafd791a // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
Expand All @@ -158,6 +180,7 @@ require (
github.com/containerd/typeurl v1.0.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/creasty/defaults v1.5.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/dgraph-io/ristretto v0.0.1 // indirect
Expand Down Expand Up @@ -227,7 +250,6 @@ require (
github.com/k0kubun/pp v3.0.1+incompatible // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/knadh/koanf v1.5.0 // indirect
Expand Down Expand Up @@ -321,23 +343,15 @@ require (
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect
go.opentelemetry.io/otel v1.15.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/zipkin v1.10.0 // indirect
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
go.opentelemetry.io/otel/trace v1.15.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.3 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
Expand All @@ -346,7 +360,8 @@ require (
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/datatypes v1.1.1-0.20230130040222-c43177d3cf8c // indirect
gorm.io/hints v1.1.0 // indirect
k8s.io/apiserver v0.27.3 // indirect
k8s.io/cli-runtime v0.27.3 // indirect
k8s.io/component-base v0.27.3 // indirect
Expand Down
Loading

0 comments on commit e96dd23

Please sign in to comment.