mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-04-01 12:32:40 +08:00
Merge remote-tracking branch 'origin/master' into release-1.19
Kubernetes-commit: 313e6e71a0631d58c7f9e710035df38855f2bcdb
This commit is contained in:
parent
752549ec20
commit
7939dc1a07
6
Godeps/Godeps.json
generated
6
Godeps/Godeps.json
generated
@ -444,7 +444,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/api",
|
"ImportPath": "k8s.io/api",
|
||||||
"Rev": "83df1b82c014"
|
"Rev": "e83062b676e4"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery",
|
"ImportPath": "k8s.io/apimachinery",
|
||||||
@ -452,7 +452,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/client-go",
|
"ImportPath": "k8s.io/client-go",
|
||||||
"Rev": "7f42acdcbb14"
|
"Rev": "470e5168e52f"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/code-generator",
|
"ImportPath": "k8s.io/code-generator",
|
||||||
@ -472,7 +472,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/utils",
|
"ImportPath": "k8s.io/utils",
|
||||||
"Rev": "0bdb4ca86cbc"
|
"Rev": "d5654de09c73"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "rsc.io/binaryregexp",
|
"ImportPath": "rsc.io/binaryregexp",
|
||||||
|
17
go.mod
17
go.mod
@ -5,17 +5,16 @@ module k8s.io/sample-controller
|
|||||||
go 1.15
|
go 1.15
|
||||||
|
|
||||||
require (
|
require (
|
||||||
k8s.io/api v0.0.0
|
k8s.io/api v0.0.0-20200731080027-e83062b676e4
|
||||||
k8s.io/apimachinery v0.0.0
|
k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
|
||||||
k8s.io/client-go v0.0.0
|
k8s.io/client-go v0.0.0-20200802124002-470e5168e52f
|
||||||
k8s.io/code-generator v0.0.0
|
k8s.io/code-generator v0.0.0-20200727091120-649de32797ee
|
||||||
k8s.io/klog/v2 v2.2.0
|
k8s.io/klog/v2 v2.2.0
|
||||||
)
|
)
|
||||||
|
|
||||||
replace (
|
replace (
|
||||||
k8s.io/api => ../api
|
k8s.io/api => k8s.io/api v0.0.0-20200731080027-e83062b676e4
|
||||||
k8s.io/apimachinery => ../apimachinery
|
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
|
||||||
k8s.io/client-go => ../client-go
|
k8s.io/client-go => k8s.io/client-go v0.0.0-20200802124002-470e5168e52f
|
||||||
k8s.io/code-generator => ../code-generator
|
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200727091120-649de32797ee
|
||||||
k8s.io/sample-controller => ../sample-controller
|
|
||||||
)
|
)
|
||||||
|
4
go.sum
4
go.sum
@ -353,6 +353,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-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.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||||
|
k8s.io/api v0.0.0-20200731080027-e83062b676e4/go.mod h1:6QwFoKNoXWMinlZZwHtDnpsr0l80pKtzo2w7kUsGqZE=
|
||||||
|
k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
|
||||||
|
k8s.io/client-go v0.0.0-20200802124002-470e5168e52f/go.mod h1:wyxcXldG//CRZ7WAgFmkssS+/7SMtrN2eJiHNTch6VQ=
|
||||||
|
k8s.io/code-generator v0.0.0-20200727091120-649de32797ee/go.mod h1:l+Q5vASED8GWxNspCbHMV4q9mcQ6DhLzqwoZhvWz7wU=
|
||||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
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 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
|
||||||
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||||
|
Loading…
x
Reference in New Issue
Block a user