github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-04-01 20:42:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.19

Browse Source 
Kubernetes-commit: d01fde696783fa58430253dfc3bc375d677c4ba3
This commit is contained in:
Kubernetes Publisher 2020-07-27 08:49:57 +00:00
parent cc010dc1b7
commit f1b3566f10
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Godeps/Godeps.json generated
View File

@ -330,13 +330,17 @@
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
"Rev": "v1.4.0" "Rev": "v1.4.0"
}, },
{
"ImportPath": "github.com/yuin/goldmark",
"Rev": "v1.1.27"
},
{ {
"ImportPath": "go.opencensus.io", "ImportPath": "go.opencensus.io",
"Rev": "v0.22.2" "Rev": "v0.22.2"
}, },
{ {
"ImportPath": "golang.org/x/crypto", "ImportPath": "golang.org/x/crypto",
"Rev": "bac4c82f6975" "Rev": "75b288015ac9"
}, },
{ {
"ImportPath": "golang.org/x/exp", "ImportPath": "golang.org/x/exp",
@ -356,11 +360,11 @@
}, },
{ {
"ImportPath": "golang.org/x/mod", "ImportPath": "golang.org/x/mod",
"Rev": "c90efee705ee" "Rev": "v0.3.0"
}, },
{ {
"ImportPath": "golang.org/x/net", "ImportPath": "golang.org/x/net",
"Rev": "d3edc9973b7e" "Rev": "ab3426394381"
}, },
{ {
"ImportPath": "golang.org/x/oauth2", "ImportPath": "golang.org/x/oauth2",
@ -384,7 +388,7 @@
}, },
{ {
"ImportPath": "golang.org/x/tools", "ImportPath": "golang.org/x/tools",
"Rev": "c00d67ef29d0" "Rev": "c1934b75d054"
}, },
{ {
"ImportPath": "golang.org/x/xerrors", "ImportPath": "golang.org/x/xerrors",
@ -440,19 +444,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "0bfda2331c3c" "Rev": "83df1b82c014"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "a6609cbba4fc" "Rev": "7efdc26a675c"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "970cddeeea0f" "Rev": "7f42acdcbb14"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "a9daf79fc577" "Rev": "649de32797ee"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -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-20200727091507-83df1b82c014
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-20200727091751-7f42acdcbb14
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-20200727091507-83df1b82c014
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-20200727091751-7f42acdcbb14
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
View File

@ -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-20200727091507-83df1b82c014/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-20200727091751-7f42acdcbb14/go.mod h1:oCXN+cFsMM7NXTRHhV//bvRZkVsL8uSBpd2EGxUYH4o=
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=