diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2020-01-08 22:45:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 22:45:13 +0800 |
| commit | 75b392476d7879b02b00f242d32520b7057dcf65 (patch) | |
| tree | f7f006cf8767681aea07ad2fc72f2dd0334ceee6 /staging | |
| parent | Merge pull request #1350 from kuramal/bugfix-modify-default-kube-qps-value (diff) | |
| parent | update the Compatibility matrix (diff) | |
| download | kubeedge-75b392476d7879b02b00f242d32520b7057dcf65.tar.gz | |
Merge pull request #1349 from fisherxu/upgrade-17
Bump kubernetes dependency to 1.17 and golang to 1.13
Diffstat (limited to 'staging')
| -rw-r--r-- | staging/src/github.com/kubeedge/beehive/go.mod | 10 | ||||
| -rw-r--r-- | staging/src/github.com/kubeedge/beehive/go.sum | 4 | ||||
| -rw-r--r-- | staging/src/github.com/kubeedge/viaduct/go.mod | 4 | ||||
| -rw-r--r-- | staging/src/github.com/kubeedge/viaduct/go.sum | 3 |
4 files changed, 10 insertions, 11 deletions
diff --git a/staging/src/github.com/kubeedge/beehive/go.mod b/staging/src/github.com/kubeedge/beehive/go.mod index 9a6385f13..fc2b8d923 100644 --- a/staging/src/github.com/kubeedge/beehive/go.mod +++ b/staging/src/github.com/kubeedge/beehive/go.mod @@ -1,26 +1,22 @@ module github.com/kubeedge/beehive -go 1.12 +go 1.13 require ( github.com/go-chassis/go-archaius v0.20.0 github.com/go-chassis/go-chassis v1.7.1 // indirect - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect + github.com/go-chassis/paas-lager v1.1.1 // indirect github.com/onsi/ginkgo v1.10.1 // indirect github.com/onsi/gomega v1.7.0 // indirect - github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f // indirect - github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 // indirect github.com/satori/go.uuid v1.2.0 - github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect github.com/spf13/cast v1.3.0 // indirect golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect golang.org/x/sys v0.0.0-20190318195719-6c81ef8f67ca // indirect - gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/yaml.v2 v2.2.2 k8s.io/klog v1.0.0 ) replace ( - github.com/apache/servicecomb-kie v0.1.0 => github.com/apache/servicecomb-kie v0.0.0-20190905142319-5ee098c8886f // indirect. TODO: remove this line when servicecomb-kie has a stable release + github.com/apache/servicecomb-kie v0.1.0 => github.com/apache/servicecomb-kie v0.0.0-20190905062319-5ee098c8886f // indirect. TODO: remove this line when servicecomb-kie has a stable release github.com/kubeedge/beehive => ../beehive ) diff --git a/staging/src/github.com/kubeedge/beehive/go.sum b/staging/src/github.com/kubeedge/beehive/go.sum index 5416c9a5b..fce4ec2c7 100644 --- a/staging/src/github.com/kubeedge/beehive/go.sum +++ b/staging/src/github.com/kubeedge/beehive/go.sum @@ -1,6 +1,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/servicecomb-kie v0.0.0-20190905142319-5ee098c8886f/go.mod h1:UbinHy4mdkrTqM71CmmDtc/xGyq46mud04OgprdETkM= +github.com/apache/servicecomb-kie v0.0.0-20190905062319-5ee098c8886f/go.mod h1:UbinHy4mdkrTqM71CmmDtc/xGyq46mud04OgprdETkM= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/cenkalti/backoff v2.0.0+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -23,6 +23,8 @@ github.com/go-chassis/go-restful-swagger20 v1.0.1/go.mod h1:s+06mcAnGsVYQ2sqM4ZP github.com/go-chassis/paas-lager v1.0.1/go.mod h1:tILYbn3+0jjCxhY6/ue9L8eRq+VJ60U6VYIdugqchB4= github.com/go-chassis/paas-lager v1.0.2-0.20190328010332-cf506050ddb2 h1:iORWPbIQ81tJPKWs9TNvcjCQnqvyTlL41F9ILgiTcyM= github.com/go-chassis/paas-lager v1.0.2-0.20190328010332-cf506050ddb2/go.mod h1:tILYbn3+0jjCxhY6/ue9L8eRq+VJ60U6VYIdugqchB4= +github.com/go-chassis/paas-lager v1.1.1 h1:/6wqawUGjPCpd57A/tzJzgC4MnEhNuigbayQS+2VWPQ= +github.com/go-chassis/paas-lager v1.1.1/go.mod h1:tILYbn3+0jjCxhY6/ue9L8eRq+VJ60U6VYIdugqchB4= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= diff --git a/staging/src/github.com/kubeedge/viaduct/go.mod b/staging/src/github.com/kubeedge/viaduct/go.mod index 7d65cebf6..61797cae2 100644 --- a/staging/src/github.com/kubeedge/viaduct/go.mod +++ b/staging/src/github.com/kubeedge/viaduct/go.mod @@ -1,6 +1,6 @@ module github.com/kubeedge/viaduct -go 1.12 +go 1.13 require ( github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115 // indirect @@ -20,7 +20,7 @@ require ( ) replace ( - github.com/apache/servicecomb-kie v0.1.0 => github.com/apache/servicecomb-kie v0.0.0-20190905142319-5ee098c8886f // indirect. TODO: remove this line when servicecomb-kie has a stable release + github.com/apache/servicecomb-kie v0.1.0 => github.com/apache/servicecomb-kie v0.0.0-20190905062319-5ee098c8886f // indirect. TODO: remove this line when servicecomb-kie has a stable release github.com/kubeedge/beehive => ../beehive github.com/kubeedge/viaduct => ../viaduct ) diff --git a/staging/src/github.com/kubeedge/viaduct/go.sum b/staging/src/github.com/kubeedge/viaduct/go.sum index 0ffc60758..84aa027e1 100644 --- a/staging/src/github.com/kubeedge/viaduct/go.sum +++ b/staging/src/github.com/kubeedge/viaduct/go.sum @@ -1,6 +1,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/servicecomb-kie v0.0.0-20190905142319-5ee098c8886f/go.mod h1:UbinHy4mdkrTqM71CmmDtc/xGyq46mud04OgprdETkM= +github.com/apache/servicecomb-kie v0.0.0-20190905062319-5ee098c8886f/go.mod h1:UbinHy4mdkrTqM71CmmDtc/xGyq46mud04OgprdETkM= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115 h1:fUjoj2bT6dG8LoEe+uNsKk8J+sLkDbQkJnB6Z1F02Bc= github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU= @@ -21,6 +21,7 @@ github.com/go-chassis/go-chassis-config v0.10.0/go.mod h1:DfYm3gwb4QLcuMvTbAA43O github.com/go-chassis/go-restful-swagger20 v1.0.1/go.mod h1:s+06mcAnGsVYQ2sqM4ZPiMJeRj7BTeAM/4gkhZNcsjA= github.com/go-chassis/paas-lager v1.0.1/go.mod h1:tILYbn3+0jjCxhY6/ue9L8eRq+VJ60U6VYIdugqchB4= github.com/go-chassis/paas-lager v1.0.2-0.20190328010332-cf506050ddb2/go.mod h1:tILYbn3+0jjCxhY6/ue9L8eRq+VJ60U6VYIdugqchB4= +github.com/go-chassis/paas-lager v1.1.1/go.mod h1:tILYbn3+0jjCxhY6/ue9L8eRq+VJ60U6VYIdugqchB4= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= |
