Merge pull request #101179 from apelisse/cherrypick-smd-version
Pin sigs.k8s.io/structured-merged-diff/v3 at v3.0.1
Kubernetes-commit: a5d842bef97260d07eb54cc6e0ad57b64f6cd51b
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0cda59a..54bb46c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -224,7 +224,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
- "Rev": "937f6a48eb33"
+ "Rev": "44f1264f7b6b"
},
{
"ImportPath": "k8s.io/gengo",
@@ -240,7 +240,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
- "Rev": "v3.0.0"
+ "Rev": "v3.0.1"
},
{
"ImportPath": "sigs.k8s.io/yaml",
diff --git a/go.mod b/go.mod
index 69c2e78..a89a0c1 100644
--- a/go.mod
+++ b/go.mod
@@ -7,13 +7,12 @@
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.4.0
- k8s.io/apimachinery v0.0.0
+ k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b
)
replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/text => golang.org/x/text v0.3.2
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
- k8s.io/api => ../api
- k8s.io/apimachinery => ../apimachinery
+ k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100737-44f1264f7b6b
)
diff --git a/go.sum b/go.sum
index 99f3577..1d00b93 100644
--- a/go.sum
+++ b/go.sum
@@ -96,6 +96,7 @@
gopkg.in/yaml.v2 v2.2.2/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-20210518100737-44f1264f7b6b/go.mod h1:70HIRzSveORLKbatTlXzI2B2UUhbWzbq8Vqyf+HbdUQ=
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=
