From 77d744302e1fd0755b31e07769dae23395c7055c Mon Sep 17 00:00:00 2001 From: Mohamed chiheb Ben jemaa Date: Sun, 13 Jun 2021 17:25:55 +0100 Subject: [PATCH] Update github.com/googleapis/gnostic to v0.5.5 and updating transitive dependencies go-cmp, protobuf,, to adapt the latest gnostic release which cosists of [Update protos for Go protoc plugin compatibility] Kubernetes-commit: c691386fef727a5494e3ab02b99196d8f6418241 --- go.mod | 11 ++++++----- go.sum | 7 ++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 8ef7e932c..b75a207c1 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/google/go-cmp v0.5.5 github.com/google/gofuzz v1.1.0 github.com/google/uuid v1.1.2 - github.com/googleapis/gnostic v0.5.1 + github.com/googleapis/gnostic v0.5.5 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 github.com/imdario/mergo v0.3.5 github.com/peterbourgon/diskv v2.0.1+incompatible @@ -30,8 +30,8 @@ require ( golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba google.golang.org/protobuf v1.26.0 - k8s.io/api v0.0.0-20210616055848-508b64175e92 - k8s.io/apimachinery v0.0.0-20210616194849-30802a09abe3 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 k8s.io/klog/v2 v2.9.0 k8s.io/utils v0.0.0-20210521133846-da695404a2bc sigs.k8s.io/structured-merge-diff/v4 v4.1.1 @@ -39,6 +39,7 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210616055848-508b64175e92 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210616194849-30802a09abe3 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index 4382a996a..643ff3ebf 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,9 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= @@ -438,10 +439,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20210616055848-508b64175e92 h1:YVxzcVwsAdZjpFomGymFThWzhgSv74zUScoBpBEoaY4= -k8s.io/api v0.0.0-20210616055848-508b64175e92/go.mod h1:aUKXHSvqLKBcepIGetFkZZS3TRYC06cDgh0bj4Wdm98= -k8s.io/apimachinery v0.0.0-20210616194849-30802a09abe3 h1:/I8Rs2lTu7eSY5pMiLx9F0XcJH8X3Gmk7vRMf5oT+lg= -k8s.io/apimachinery v0.0.0-20210616194849-30802a09abe3/go.mod h1:/5uIpUWARbptpKp8Acx8ZLRb88HuZlINrEfejwRJc9c= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=