Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update go dependencies #4322

Merged
merged 1 commit into from
Jul 17, 2019
Merged

Update go dependencies #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 13 additions & 32 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,15 @@ module k8s.io/ingress-nginx
go 1.12

require (
cloud.google.com/go v0.37.2 // indirect
contrib.go.opencensus.io/exporter/ocagent v0.4.12 // indirect
github.com/Azure/go-autorest v11.7.1+incompatible // indirect
github.com/Sirupsen/logrus v1.4.0 // indirect
github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/eapache/channels v1.1.0
github.com/elazarl/goproxy v0.0.0-20190410145444-c548f45dcf1d // indirect
github.com/elazarl/goproxy/ext v0.0.0-20190410145444-c548f45dcf1d // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
github.com/go-logr/logr v0.1.0 // indirect
github.com/go-logr/zapr v0.1.1 // indirect
github.com/go-openapi/spec v0.19.0 // indirect
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/google/uuid v1.0.0
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gophercloud/gophercloud v0.0.0-20190410012400-2c55d17f707c // indirect
github.com/google/uuid v1.1.1
github.com/imdario/mergo v0.3.7
github.com/json-iterator/go v1.1.6
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
Expand All @@ -41,19 +31,15 @@ require (
github.com/paultag/sniff v0.0.0-20170624152000-87325c3dddf4
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f
github.com/prometheus/common v0.2.0
github.com/prometheus/procfs v0.0.0-20190328153300-af7bedc223fb // indirect
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/smartystreets/goconvey v0.0.0-20190710185942-9d28bd7c0945 // indirect
github.com/spf13/cobra v0.0.4
github.com/spf13/pflag v1.0.3
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926
github.com/zakjan/cert-chain-resolver v0.0.0-20180703112424-6076e1ded272
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.10.0 // indirect
golang.org/x/net v0.0.0-20190328230028-74de082e2cca
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980
google.golang.org/grpc v1.19.1
gopkg.in/fsnotify/fsnotify.v1 v1.4.7
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
Expand All @@ -63,26 +49,21 @@ require (
k8s.io/apiextensions-apiserver v0.0.0-20190626210203-fdc73e13f9a6
k8s.io/apimachinery v0.0.0
k8s.io/apiserver v0.0.0-20190625052034-8c075cba2f8c
k8s.io/cli-runtime v0.0.0-20190314001948-2899ed30580f
k8s.io/client-go v11.0.0+incompatible
k8s.io/cloud-provider v0.0.0-20190323031113-9c9d72d1bf90 // indirect
k8s.io/code-generator v0.0.0
k8s.io/cli-runtime v0.0.0-20190711111425-61e036b70227
k8s.io/client-go v12.0.0+incompatible
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How was this version derived? It fails validation in Go 1.13: the +incompatible annotation is only supported for versions that lack a go.mod file, and the version of client-go tagged v12.0.0 does include such a file.

(See kubernetes/client-go#631 and golang/go#33558.)

Copy link
Member Author

@aledbf aledbf Aug 9, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@willb we are aware of this issue and will be fixed in the next update of the dependencies

How was this version derived?

From the examples in client go. If you check the required section we have a valid commit https://github.com/kubernetes/ingress-nginx/blob/master/go.mod#L72

It fails validation in Go 1.13:

Sure, but that is a change that a not released version go is introducing. Before 1.12.6 this was ok.

Please check #4386

k8s.io/cloud-provider v0.0.0-20190711113108-0d51509e0ef5 // indirect
k8s.io/code-generator v0.0.0-20190620073620-d55040311883
k8s.io/component-base v0.0.0-20190626045757-ca439aa083f5
k8s.io/klog v0.3.1
k8s.io/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect
k8s.io/klog v0.3.3
k8s.io/kubernetes v0.0.0
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
sigs.k8s.io/controller-runtime v0.1.10
sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
sigs.k8s.io/testing_frameworks v0.1.1 // indirect
)

replace (
github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.1

k8s.io/api => k8s.io/api v0.0.0-20190626000116-b178a738ed00
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go => k8s.io/client-go v0.0.0-20190612125919-78d2af7
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190620073620-d55040311883
k8s.io/api => k8s.io/api v0.0.0-20190703205437-39734b2a72fe
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76
k8s.io/kubernetes => k8s.io/kubernetes v1.14.3
)
248 changes: 77 additions & 171 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 6 additions & 18 deletions vendor/cloud.google.com/go/compute/metadata/metadata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/.travis.yml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md
View file
Open in desktop

This file was deleted.

201 changes: 0 additions & 201 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/LICENSE
View file
Open in desktop

This file was deleted.

Loading