Merge pull request #94150 from liggitt/json-patch-1.16
[1.16] Update to json-patch 4.9.0
Kubernetes-commit: 35a8da66d5516aad90d1302396f06a83dc7f42c0
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 6dc3c18..e1485bc 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -36,7 +36,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
- "Rev": "162e5629780b"
+ "Rev": "v4.9.0"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@@ -103,10 +103,6 @@
"Rev": "v1.0.0"
},
{
- "ImportPath": "github.com/jessevdk/go-flags",
- "Rev": "v1.4.0"
- },
- {
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.7"
},
@@ -228,7 +224,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
- "Rev": "79e0efc2a654"
+ "Rev": "f7929272bda3"
},
{
"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 9cf3343..a61807c 100644
--- a/go.mod
+++ b/go.mod
@@ -7,11 +7,10 @@
require (
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
github.com/stretchr/testify v1.3.0
- k8s.io/apimachinery v0.0.0
+ k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
- k8s.io/api => ../api
- k8s.io/apimachinery => ../apimachinery
+ k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
)
diff --git a/go.sum b/go.sum
index 606beb4..c6749b9 100644
--- a/go.sum
+++ b/go.sum
@@ -99,6 +99,7 @@
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3/go.mod h1:xAtIC8Gj83Pn2OCs2g57wZpZembRhJhiXIlQIqanwas=
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 v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
