github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2026-05-17 04:52:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99040 from apelisse/update-smd-1.19

Browse Source 
Update sigs.k8s.io/structured-merge-diff to v4.0.3

Kubernetes-commit: 3303966843e96f6c6a85d3492ab79f1499989eda
This commit is contained in:
Kubernetes Publisher
2021-03-25 01:57:29 -07:00
parent e4b190ddaf
commit 53d96299a2
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@@ -440,11 +440,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2d800ca79443"
"Rev": "83a267c7608c"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "4440c6847dae"
"Rev": "6d69a3e60ee7"
},
{
"ImportPath": "k8s.io/gengo",
@@ -468,7 +468,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.1"
"Rev": "v4.0.3"
},
{
"ImportPath": "sigs.k8s.io/yaml",

9
go.mod
View File

@@ -26,15 +26,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
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-20210325111313-83a267c7608c
k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7
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-20210325111313-83a267c7608c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7
)

2
go.sum
View File

@@ -324,6 +324,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-20210325111313-83a267c7608c/go.mod h1:1DpU1b3N0Yzraj30FrBPrxCDWfvjktX1dY26K1fpHLQ=
k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7/go.mod h1:VEnBy6MjLOiOk/toGgJUL7R55GwMclsrEL3UnsHfn5Y=
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=