From dbc9bd7948f79453e8c0afcf99395f72d602a893 Mon Sep 17 00:00:00 2001 From: Bartlomiej Plotka Date: Fri, 24 Apr 2020 08:50:55 +0100 Subject: [PATCH] Updared mod as suggested by Julien Signed-off-by: Bartlomiej Plotka --- go.mod | 9 ++------- go.sum | 1 + vendor/modules.txt | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 037d0bbaf..0b5a585db 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/golang/protobuf v1.4.0 // indirect github.com/golang/snappy v0.0.1 github.com/google/pprof v0.0.0-20200417002340-c6e0a841f49a - github.com/googleapis/gnostic v0.4.1 // indirect + github.com/googleapis/gnostic v0.4.0 // indirect github.com/gophercloud/gophercloud v0.10.0 github.com/grpc-ecosystem/grpc-gateway v1.14.4 github.com/hashicorp/consul/api v1.4.0 @@ -86,9 +86,4 @@ require ( k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect ) -replace ( - // TODO(bwplotka): Remove once client-go will move to renamed openapiv2 package - // (https://github.com/kubernetes/test-infra/issues/16116). - github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0 - k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0 -) +replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0 diff --git a/go.sum b/go.sum index 954d67df3..7941bbe62 100644 --- a/go.sum +++ b/go.sum @@ -379,6 +379,7 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.0 h1:BXDUo8p/DaxC+4FJY/SSx3gvnx9C1VdHNgaUkiEL5mk= github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= diff --git a/vendor/modules.txt b/vendor/modules.txt index d77984fe3..3c1b80e30 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -181,7 +181,7 @@ github.com/google/gofuzz github.com/google/pprof/profile # github.com/googleapis/gax-go/v2 v2.0.5 github.com/googleapis/gax-go/v2 -# github.com/googleapis/gnostic v0.4.1 => github.com/googleapis/gnostic v0.4.0 +# github.com/googleapis/gnostic v0.4.0 github.com/googleapis/gnostic/OpenAPIv2 github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions