github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-02-15 00:07:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93813 from liggitt/json-patch-4.8.0-1.16

Browse Source 
[1.16] Update to json-patch 4.8.0

Kubernetes-commit: d2adc15fc357632eeb65c75288fb46a910ca05eb
This commit is contained in:
Kubernetes Publisher
2020-08-11 18:51:45 -07:00
parent 8e17539f67
commit 7993bd2c48
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Godeps/Godeps.json generated
View File

@@ -80,7 +80,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
"Rev": "162e5629780b"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@@ -182,6 +182,10 @@
"ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5"
},
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.7"
@@ -242,6 +246,10 @@
"ImportPath": "github.com/peterbourgon/diskv",
"Rev": "v2.0.1"
},
{
"ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.1"
},
{
"ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0"
@@ -372,15 +380,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "34b661834646"
"Rev": "0f665c80805a"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "17ad11ffb845"
"Rev": "79e0efc2a654"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b063729e49a6"
"Rev": "e1f134a72784"
},
{
"ImportPath": "k8s.io/code-generator",

17
go.mod
View File

@@ -5,18 +5,17 @@ module k8s.io/sample-controller
go 1.12
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-20200812051914-0f665c80805a
k8s.io/apimachinery v0.0.0-20200812051535-79e0efc2a654
k8s.io/client-go v0.0.0-20200812052405-e1f134a72784
k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
k8s.io/klog v1.0.0
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20200812051914-0f665c80805a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200812051535-79e0efc2a654
k8s.io/client-go => k8s.io/client-go v0.0.0-20200812052405-e1f134a72784
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
)

4
go.sum
View File

@@ -225,6 +225,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200812051914-0f665c80805a/go.mod h1:4N2tIwMMV8YqSl9UhAPLbZ2GXJEL0XJnhsJhsn46+Nw=
k8s.io/apimachinery v0.0.0-20200812051535-79e0efc2a654/go.mod h1:AS4lY4M1yKOeMWs98YuccQt7vwqO5ErTPxAXu1jewu0=
k8s.io/client-go v0.0.0-20200812052405-e1f134a72784/go.mod h1:tJI6CNe2DF4XAX4f6owsNAq1OHHoKA2CQQJe/tj3pJA=
k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff/go.mod h1:J2H4yLa80/c3JcoMtjfRQ/cqZNWeJnNhrCtedYrPJ+k=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=