Merge pull request #96778 from caesarxuchao/cherrypick-95981-119

Cherrypick #95981 to 1.19, Enables HTTP/2 health check

Kubernetes-commit: 352ce39b5ed5c1f18c06bbc9bd1570c3bafdca90
This commit is contained in:
Kubernetes Publisher 2020-11-30 00:17:11 -08:00
parent 246b3fe0c3
commit 4ac0182708
3 changed files with 18 additions and 15 deletions

12
Godeps/Godeps.json generated
View File

@ -364,7 +364,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "ab3426394381"
"Rev": "69a78807bb2b"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -376,7 +376,7 @@
},
{
"ImportPath": "golang.org/x/sys",
"Rev": "ed371f2e16b4"
"Rev": "5cba982894dd"
},
{
"ImportPath": "golang.org/x/text",
@ -444,19 +444,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "21b59c1ded36"
"Rev": "d9813e0d77df"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "b63a0c883fbf"
"Rev": "2f881bd9ad1b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "3e55cca68bbc"
"Rev": "6f060a2946c6"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "1c3794b15e35"
"Rev": "29e28b150e42"
},
{
"ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
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-20201130085935-d9813e0d77df
k8s.io/apimachinery v0.0.0-20201130085653-2f881bd9ad1b
k8s.io/client-go v0.0.0-20201130090347-6f060a2946c6
k8s.io/code-generator v0.0.0-20201130085404-29e28b150e42
k8s.io/klog/v2 v2.2.0
)
replace (
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-20201130085935-d9813e0d77df
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201130085653-2f881bd9ad1b
k8s.io/client-go => k8s.io/client-go v0.0.0-20201130090347-6f060a2946c6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201130085404-29e28b150e42
)

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-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-20201130085935-d9813e0d77df/go.mod h1:fjmAgUa/Kgc5FPSkkkaetAcIpcZvNkOb3bZ6IqWsHaw=
k8s.io/apimachinery v0.0.0-20201130085653-2f881bd9ad1b/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q=
k8s.io/client-go v0.0.0-20201130090347-6f060a2946c6/go.mod h1:2oFw95+sniG7yfTSXi0qIkgpNvWLixBiO+GQGLmvgUE=
k8s.io/code-generator v0.0.0-20201130085404-29e28b150e42/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
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=