Skip to content

Commit

Permalink
refactor: fixed bcs-common package version (merge request !1259)
Browse files Browse the repository at this point in the history 
Squash merge branch 'fix/gomod' into 'master'
refactor: fixed bcs-common package version
  • Loading branch information
@adevjoe @ifooth
adevjoe authored and ifooth committed Jul 10, 2023
1 parent 3ed2614 commit 6d94a60
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 20 deletions.
79 changes: 77 additions & 2 deletions bcs-common/pkg/bcsapi/test/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/Tencent/bk-bcs/bcs-common/test
go 1.17

replace (
github.com/Tencent/bk-bcs/bcs-common => ../../../../bcs-common
github.com/Tencent/bk-bcs/bcs-mesos/kubebkbcsv2 => github.com/Tencent/bk-bcs/bcs-mesos/kubebkbcsv2 v0.0.0-20220221082336-47ffb7ebf0b5
github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
github.com/go-logr/logr => github.com/go-logr/logr v1.2.0
Expand All @@ -14,4 +13,80 @@ replace (
google.golang.org/grpc => google.golang.org/grpc v1.26.0
)

require github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210818040851-76fdc539dc33
require github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230707084844-155f32c8f606

require (
github.com/Tencent/bk-bcs/bcs-runtime/bcs-k8s/kubernetes/common v0.0.0-20220330120237-0bbed74dcf6d // indirect
github.com/Tencent/bk-bcs/bcs-services/pkg v0.0.0-20220926153300-4e631deaebe4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coreos/etcd v3.3.18+incompatible // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/ratelimit v1.0.1 // indirect
github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/micro/go-micro/v2 v2.9.1 // indirect
github.com/miekg/dns v1.1.50 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/parnurzeal/gorequest v0.2.16 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/ugorji/go/codec v1.2.3 // indirect
go.mongodb.org/mongo-driver v1.5.3 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // 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-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
google.golang.org/grpc v1.46.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.23.1 // indirect
k8s.io/apimachinery v0.23.1 // indirect
k8s.io/client-go v0.23.1 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
moul.io/http2curl v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
14 changes: 6 additions & 8 deletions bcs-runtime/bcs-k8s/bcs-component/bcs-webhook-server/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.17

replace (
bitbucket.org/ww/goautoneg => github.com/adjust/goautoneg v0.0.0-20150426214442-d788f35a0315
github.com/Tencent/bk-bcs/bcs-common => ../../../../bcs-common
github.com/Tencent/bk-bcs/bcs-runtime/bcs-k8s/kubernetes/common => github.com/Tencent/bk-bcs/bcs-runtime/bcs-k8s/kubernetes/common v0.0.0-20220117082205-1fdc9e155811
github.com/Tencent/bk-bcs/bcs-scenarios/kourse => github.com/TencentBlueKing/bk-bcs/bcs-scenarios/kourse v0.0.0-20230620070606-922d3a7a9517
github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
Expand Down Expand Up @@ -41,7 +40,7 @@ replace (
)

require (
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20220919094211-a1b246e54e5a
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230707084844-155f32c8f606
github.com/Tencent/bk-bcs/bcs-runtime/bcs-k8s/kubebkbcs v0.0.0-20220118090807-f41aacaffdf9
github.com/deckarep/golang-set v1.7.1
github.com/evanphx/json-patch v4.12.0+incompatible
Expand All @@ -63,13 +62,16 @@ require (
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
)

require github.com/Tencent/bk-bcs/bcs-scenarios/kourse v0.0.0-00010101000000-000000000000

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
Expand All @@ -78,6 +80,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
Expand All @@ -104,6 +107,7 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.20.0 // indirect
k8s.io/cloud-provider v0.20.0 // indirect
k8s.io/component-base v0.20.0 // indirect
Expand All @@ -113,9 +117,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

require (
github.com/Tencent/bk-bcs/bcs-scenarios/kourse v0.0.0-00010101000000-000000000000
github.com/imdario/mergo v0.3.13 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
3 changes: 1 addition & 2 deletions bcs-services/bcs-cli/bcs-cluster-manager/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/Tencent/bk-bcs/bcs-services/bcs-cli/bcs-cluster-manager
go 1.17

replace (
github.com/Tencent/bk-bcs/bcs-common => ../../../bcs-common
github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
go.etcd.io/bbolt v1.3.4 => github.com/coreos/bbolt v1.3.4
google.golang.org/grpc => google.golang.org/grpc v1.26.0
Expand Down Expand Up @@ -34,7 +33,7 @@ require (
github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e // indirect
github.com/envoyproxy/protoc-gen-validate v0.4.1 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.2.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down
3 changes: 1 addition & 2 deletions bcs-services/bcs-cluster-manager/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.18

replace (
github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.0.0-20210210161804-c7f947c0610d
github.com/Tencent/bk-bcs/bcs-common => ../../bcs-common
github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
github.com/coreos/etcd v3.3.25+incompatible => github.com/evanlixin/etcd v3.3.26-0.20210917065228-e1c46c24ee8f+incompatible
go.etcd.io/bbolt v1.3.4 => github.com/coreos/bbolt v1.3.4
Expand All @@ -26,7 +25,7 @@ require (
github.com/Azure/go-autorest/autorest v0.11.18
github.com/Azure/go-autorest/autorest/adal v0.9.13
github.com/RichardKnop/machinery/v2 v2.0.11
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230612022433-f63b3b850fe2
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230707084844-155f32c8f606
github.com/Tencent/bk-bcs/bcs-services/pkg v0.0.0-20230607093333-1f5cd2719e19
github.com/avast/retry-go v2.7.0+incompatible
github.com/coreos/etcd v3.3.25+incompatible
Expand Down
3 changes: 1 addition & 2 deletions bcs-services/bcs-netservice/bcs-ipam/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/Tencent/bk-bcs/bcs-services/bcs-netservice/bcs-ipam
go 1.18

replace (
github.com/Tencent/bk-bcs/bcs-common => ../../../bcs-common
github.com/Tencent/bk-bcs/bcs-services/bcs-netservice => ../
github.com/containernetworking/cni => github.com/containernetworking/cni v0.6.0
github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.4
Expand All @@ -12,7 +11,7 @@ replace (
)

require (
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230525082710-4d35a47c4273
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230707084844-155f32c8f606
github.com/Tencent/bk-bcs/bcs-services/bcs-netservice v0.0.0-00010101000000-000000000000
github.com/containernetworking/cni v1.1.1
github.com/fsouza/go-dockerclient v1.9.7
Expand Down
3 changes: 1 addition & 2 deletions bcs-services/bcs-netservice/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ module github.com/Tencent/bk-bcs/bcs-services/bcs-netservice
go 1.18

replace (
github.com/Tencent/bk-bcs/bcs-common => ../../bcs-common
github.com/containernetworking/cni => github.com/containernetworking/cni v0.6.0
github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.4
google.golang.org/api => google.golang.org/api v0.14.0
google.golang.org/grpc => google.golang.org/grpc v1.29.0
)

require (
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230525082710-4d35a47c4273
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230707084844-155f32c8f606
github.com/containernetworking/cni v1.1.1
github.com/emicklei/go-restful v2.16.0+incompatible
github.com/pkg/errors v0.9.1
Expand Down
3 changes: 2 additions & 1 deletion bcs-services/bcs-user-manager/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.codecc
.idea
.vscode
.vscode
etc/
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ replace (

require (
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230612022433-f63b3b850fe2
github.com/Tencent/bk-bcs/bcs-common v0.0.0-20230707084844-155f32c8f606
github.com/Tencent/bk-bcs/bcs-mesos/kubebkbcsv2 v0.0.0-00010101000000-000000000000
github.com/bitly/go-simplejson v0.5.0
github.com/containernetworking/cni v0.6.0
Expand Down

0 comments on commit 6d94a60

Please sign in to comment.