diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index a3f3931d5..4ea4e47ce 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -668,19 +668,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "02047b7ecbbf" + "Rev": "67a68481e276" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "5e92a6b08554" + "Rev": "9894919f2c6e" }, { "ImportPath": "k8s.io/client-go", - "Rev": "cf11d9b71ab7" + "Rev": "2cf22cd48886" }, { "ImportPath": "k8s.io/component-base", - "Rev": "0307e6fabed6" + "Rev": "12d9255b32a9" }, { "ImportPath": "k8s.io/gengo", @@ -708,7 +708,7 @@ }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v3", - "Rev": "v3.0.0" + "Rev": "43c19bbb7fba" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/go.mod b/go.mod index 9a5048b17..43a1d5603 100644 --- a/go.mod +++ b/go.mod @@ -41,21 +41,21 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0-20200709130931-02047b7ecbbf - k8s.io/apimachinery v0.0.0-20200709170343-5e92a6b08554 - k8s.io/client-go v0.0.0-20200709170953-cf11d9b71ab7 - k8s.io/component-base v0.0.0-20200709132518-0307e6fabed6 + k8s.io/api v0.0.0-20200711010759-67a68481e276 + k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e + k8s.io/client-go v0.0.0-20200711011221-2cf22cd48886 + k8s.io/component-base v0.0.0-20200711012104-12d9255b32a9 k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 - sigs.k8s.io/structured-merge-diff/v3 v3.0.0 + sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20200709130931-02047b7ecbbf - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200709170343-5e92a6b08554 - k8s.io/client-go => k8s.io/client-go v0.0.0-20200709170953-cf11d9b71ab7 - k8s.io/component-base => k8s.io/component-base v0.0.0-20200709132518-0307e6fabed6 + k8s.io/api => k8s.io/api v0.0.0-20200711010759-67a68481e276 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e + k8s.io/client-go => k8s.io/client-go v0.0.0-20200711011221-2cf22cd48886 + k8s.io/component-base => k8s.io/component-base v0.0.0-20200711012104-12d9255b32a9 ) diff --git a/go.sum b/go.sum index b44b74ac8..981ce54d3 100644 --- a/go.sum +++ b/go.sum @@ -508,12 +508,11 @@ 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-20200709130931-02047b7ecbbf/go.mod h1:lt1s4IKF4+kDlOlxxSmcNyf8j64o27uSvvnZ8BcI0FQ= -k8s.io/apimachinery v0.0.0-20200709170343-5e92a6b08554/go.mod h1:EjWiYOPi+BZennZ5pGa3JLkQ+znhEOodGy/+umjiLDU= -k8s.io/client-go v0.0.0-20200709170953-cf11d9b71ab7/go.mod h1:FtCso/qJj5wuFWDAKCISjGDjJHrTHf7nwTkERLsat8k= -k8s.io/component-base v0.0.0-20200709132518-0307e6fabed6/go.mod h1:lQ/9An+y9iOlhPTG5kYt9ZeucKAGeUudZClkA7Wanh4= +k8s.io/api v0.0.0-20200711010759-67a68481e276/go.mod h1:x0ZnvSZqabCH9lfDzYQVDUpIhJCLTnfTXruGmRCMI+A= +k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e/go.mod h1:o7dnTWWI581t2mphuLR3towX6xooze3sUXgNRWLd3Cw= +k8s.io/client-go v0.0.0-20200711011221-2cf22cd48886/go.mod h1:mJ5QM6XxIYuYeeaY6zDQpe7goQeLuOInhDAjeE7JxJg= +k8s.io/component-base v0.0.0-20200711012104-12d9255b32a9/go.mod h1:DO9ObuxbN1G14m1g+JofnlNRSyL7V0wAzmgU54Lmfx8= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= @@ -525,8 +524,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 h1:rusRLrDhjBp6aYtl9sGEvQJr6faoHoDLd0YcUBTZguI= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba h1:AAbnc5KQuTWKuh2QSnyghKIOTFzB0Jayv7/OFDn3Cy4= +sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba/go.mod h1:V06abazjHneE37ZdSY/UUwPVgcJMKI/jU5XGUjgIKoc= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/pkg/endpoints/handlers/fieldmanager/structuredmerge.go b/pkg/endpoints/handlers/fieldmanager/structuredmerge.go index 3ec16a838..c9488e391 100644 --- a/pkg/endpoints/handlers/fieldmanager/structuredmerge.go +++ b/pkg/endpoints/handlers/fieldmanager/structuredmerge.go @@ -55,7 +55,7 @@ func NewStructuredMergeManager(models openapiproto.Models, objectConverter runti groupVersion: gv, hubVersion: hub, updater: merge.Updater{ - Converter: internal.NewVersionConverter(typeConverter, objectConverter, hub), + Converter: internal.NewVersionConverter(typeConverter, objectConverter, hub), // This is the converter provided to SMD from k8s }, }, nil }