From fe51308355d97149da202ecf85b86978c7c76584 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 5 Mar 2020 13:09:50 -0800 Subject: [PATCH] Bump sigs.k8s.io/structured-merge-diff to v3 Kubernetes-commit: df41fd932bef1686b30a1abee477c5009ebabe80 --- go.mod | 9 +++++---- go.sum | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1afd0f676..3d416aae2 100644 --- a/go.mod +++ b/go.mod @@ -28,8 +28,8 @@ require ( golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.0.0-20200308145338-5c56b6577da0 - k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab sigs.k8s.io/yaml v1.2.0 @@ -38,6 +38,7 @@ require ( replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.0.0-20200308145338-5c56b6577da0 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index 17d2d2fe4..2cae4fa71 100644 --- a/go.sum +++ b/go.sum @@ -182,8 +182,6 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20200308145338-5c56b6577da0/go.mod h1:dQFmApLGF1AzHBoCa9z1a7ftM/1nZEAoknHzuttq6eY= -k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=