diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c84ca1fb..57c8e0f7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -348,15 +348,15 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "e4148040f8d3" + "Rev": "5c56b6577da0" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "8323021940bb" + "Rev": "b75c29caafab" }, { "ImportPath": "k8s.io/client-go", - "Rev": "95caa2d638fa" + "Rev": "aad7e5b6d4c2" }, { "ImportPath": "k8s.io/code-generator", @@ -380,7 +380,7 @@ }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v3", - "Rev": "5e70324e7c1c" + "Rev": "v3.0.0" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/go.mod b/go.mod index 087d0570..dad6d05a 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ module k8s.io/sample-controller go 1.13 require ( - k8s.io/api v0.0.0-20200306170923-e4148040f8d3 - k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb - k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa + k8s.io/api v0.0.0-20200308145338-5c56b6577da0 + k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab + k8s.io/client-go v0.0.0-20200308145338-aad7e5b6d4c2 k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b k8s.io/klog v1.0.0 ) @@ -15,8 +15,8 @@ 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-20200306170923-e4148040f8d3 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb - k8s.io/client-go => k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa + k8s.io/api => k8s.io/api v0.0.0-20200308145338-5c56b6577da0 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200308145338-b75c29caafab + k8s.io/client-go => k8s.io/client-go v0.0.0-20200308145338-aad7e5b6d4c2 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b ) diff --git a/go.sum b/go.sum index df2c7f75..a16d4e77 100644 --- a/go.sum +++ b/go.sum @@ -195,9 +195,9 @@ 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-20200306170923-e4148040f8d3/go.mod h1:waB+1VhfJAYS8AHstyEPqGb0qJ1gJ28CwWQ/aZcx3oY= -k8s.io/apimachinery v0.0.0-20200306170923-8323021940bb/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/client-go v0.0.0-20200306170923-95caa2d638fa/go.mod h1:+19yC0ykvQ+1t3SVgWjAvIUQIOUgpBZztuk0L+I9dTc= +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/client-go v0.0.0-20200308145338-aad7e5b6d4c2/go.mod h1:F2herHu8BfMXvY35r1XKB1RgJELr4b8eR75KhRNxp80= k8s.io/code-generator v0.0.0-20200306170923-c3277d42784b/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= @@ -211,8 +211,8 @@ k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab h1:I3f2hcBrepGRXI1z4sukzAb8w1R4eqbsHrAsx06LGYM= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= 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-20200207200219-5e70324e7c1c h1:xQP7F7Lntt2dtYmg12WPQHObOrAyPHlMWP1JVSa79GM= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c/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/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=