Merge pull request #92069 from tapih/update-json-patch

Update github.com/evanphx/json-patch to e83c0a1c26c884f8ec4fb743f6db9…

Kubernetes-commit: 81f84d3a1764e883441ff155a3c0fdc724a1b304
This commit is contained in:
Kubernetes Publisher 2020-06-16 19:23:22 -07:00
parent 2e5bf63e77
commit 18821151a3
3 changed files with 20 additions and 13 deletions

12
Godeps/Godeps.json generated
View File

@ -128,7 +128,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
"Rev": "e83c0a1c26c8"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -298,6 +298,10 @@
"ImportPath": "github.com/peterbourgon/diskv",
"Rev": "v2.0.1"
},
{
"ImportPath": "github.com/pkg/errors",
"Rev": "v0.9.1"
},
{
"ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0"
@ -436,15 +440,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "96dd8b8608bc"
"Rev": "8dc28b782f8e"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1a0ee4aea6d1"
"Rev": "c1bd2c2a276f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "0adb702ae49b"
"Rev": "3c831c893e8a"
},
{
"ImportPath": "k8s.io/code-generator",

17
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.13
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20200617050422-8dc28b782f8e
k8s.io/apimachinery v0.0.0-20200617050244-c1bd2c2a276f
k8s.io/client-go v0.0.0-20200617050643-3c831c893e8a
k8s.io/code-generator v0.0.0-20200616085743-b88f4eb8c2e2
k8s.io/klog/v2 v2.1.0
)
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 => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20200617050422-8dc28b782f8e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200617050244-c1bd2c2a276f
k8s.io/client-go => k8s.io/client-go v0.0.0-20200617050643-3c831c893e8a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200616085743-b88f4eb8c2e2
)

4
go.sum
View File

@ -297,6 +297,10 @@ 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-20200617050422-8dc28b782f8e/go.mod h1:kD7EG+Wyq5Fu0MAEBkXyQVnnjyj/ChS5/vewKVRDaYI=
k8s.io/apimachinery v0.0.0-20200617050244-c1bd2c2a276f/go.mod h1:OO1oUmqmYEvK9/2GigG7tpElec1NAKGniAPppy1PJGA=
k8s.io/client-go v0.0.0-20200617050643-3c831c893e8a/go.mod h1:2QsvbX+hSBkSjVpimrdvrpStagCTqdSQxNnzGIxk1YY=
k8s.io/code-generator v0.0.0-20200616085743-b88f4eb8c2e2/go.mod h1:6NiFnMML+4VaG+kHKew+dc+SBC3Q+5NTNQIHdJJbG3w=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=