diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d78bffe1..77d1765d 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -444,11 +444,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "a982eb560ae9" + "Rev": "4934d0c67eba" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "da970ee67a06" + "Rev": "2c6e837afb20" }, { "ImportPath": "k8s.io/gengo", @@ -460,7 +460,7 @@ }, { "ImportPath": "k8s.io/kube-openapi", - "Rev": "656914f816f9" + "Rev": "6aeccd4b50c6" }, { "ImportPath": "k8s.io/utils", @@ -471,8 +471,8 @@ "Rev": "v0.2.0" }, { - "ImportPath": "sigs.k8s.io/structured-merge-diff/v3", - "Rev": "43c19bbb7fba" + "ImportPath": "sigs.k8s.io/structured-merge-diff/v4", + "Rev": "v4.0.1" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/go.mod b/go.mod index 1959644e..c062daf2 100644 --- a/go.mod +++ b/go.mod @@ -26,15 +26,14 @@ require ( golang.org/x/net v0.0.0-20200707034311-ab3426394381 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20200813011650-4934d0c67eba + k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20 k8s.io/klog/v2 v2.2.0 k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20200813011650-4934d0c67eba + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20 ) diff --git a/go.sum b/go.sum index d591510b..d8a583b5 100644 --- a/go.sum +++ b/go.sum @@ -335,6 +335,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= +k8s.io/api v0.0.0-20200813011650-4934d0c67eba/go.mod h1:QJ0oQNNZl/Xp5kUlzey804E6C+Vj1FnxAx5MuW0GkTI= +k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20/go.mod h1:1z+ESypfBDWAQXahXbqiOO581DaYTRgdaHAi60KXR1s= 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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=