kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 ea70ac3ab1 0cac984aab
commit fdd45d6502
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -152,7 +152,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
"Rev": "e83c0a1c26c8"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -540,19 +540,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "54aa84730ddd"
"Rev": "8dc28b782f8e"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "d8530e6c952f"
"Rev": "c1bd2c2a276f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "31e286ee1926"
"Rev": "3c831c893e8a"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "c948a8160666"
"Rev": "6c60a4d2ed11"
},
{
"ImportPath": "k8s.io/gengo",

12
go.mod
View File

@ -5,15 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13
require (
k8s.io/apimachinery v0.0.0-20200616090325-1a0ee4aea6d1
k8s.io/component-base v0.0.0-20200616093425-c948a8160666
k8s.io/apimachinery v0.0.0-20200617050244-c1bd2c2a276f
k8s.io/component-base v0.0.0-20200617051220-6c60a4d2ed11
)
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-20200616091054-54aa84730ddd
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200613000956-d8530e6c952f
k8s.io/client-go => k8s.io/client-go v0.0.0-20200616091903-31e286ee1926
k8s.io/component-base => k8s.io/component-base v0.0.0-20200616093425-c948a8160666
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/component-base => k8s.io/component-base v0.0.0-20200617051220-6c60a4d2ed11
)

10
go.sum
View File

@ -52,7 +52,7 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8/go.mod h1:pmLOTb3x90VhIKxsA9yeQG5yfOkkKnkk1h+Ql8NDYDw=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@ -300,10 +300,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-20200616091054-54aa84730ddd/go.mod h1:a/lpavzw366wC55yZ6aL8yMQpqgKljBwY8WePGt/NqQ=
k8s.io/apimachinery v0.0.0-20200613000956-d8530e6c952f/go.mod h1:diAekxQB6O2LunkgrS6bHwK4dfE2K8KIxK3GeFjrgBU=
k8s.io/client-go v0.0.0-20200616091903-31e286ee1926/go.mod h1:8wWYRaKm+AEZ4COzhp0WWvrHZZ6xjnsKXy75XMfvYno=
k8s.io/component-base v0.0.0-20200616093425-c948a8160666/go.mod h1:tilVdGHHI7TVBUKWjrMHI+DLxxpBIWY5RifTKr0P72o=
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/component-base v0.0.0-20200617051220-6c60a4d2ed11/go.mod h1:SIJ3hZh19C0QhquEIfpd0PWNnQPXJvrH9ClSZPF25sI=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=