github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-05-12 09:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100376 from liggitt/http2-1.18

Browse Source 
Cherrypick #95981 to 1.18, Enables HTTP/2 health check

Kubernetes-commit: e680574e6e218b29fca89aac9d83ad82341c8ac4
This commit is contained in:
Kubernetes Publisher 2021-03-24 17:13:28 -07:00
parent d46e3cc3d4
commit 9f63b49adc
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -280,7 +280,7 @@
}, },
{ {
"ImportPath": "golang.org/x/net", "ImportPath": "golang.org/x/net",
"Rev": "13f9640d40b9" "Rev": "69a78807bb2b"
}, },
{ {
"ImportPath": "golang.org/x/oauth2", "ImportPath": "golang.org/x/oauth2",
@ -292,7 +292,7 @@
}, },
{ {
"ImportPath": "golang.org/x/sys", "ImportPath": "golang.org/x/sys",
"Rev": "fde4db37ae7a" "Rev": "5cba982894dd"
}, },
{ {
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
@ -352,19 +352,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "4352ece35dc9" "Rev": "828bab7a24bb"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "1a4218b8b919" "Rev": "c68ad1a85ac1"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "82b9b1a14664" "Rev": "b994da18bceb"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "f186a36abf5c" "Rev": "a1aab0144d81"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

17
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.13 go 1.13
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20210325111203-828bab7a24bb
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210325110411-c68ad1a85ac1
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20210325112331-b994da18bceb
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20210325105715-a1aab0144d81
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
) )
@ -16,9 +16,8 @@ replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/text => golang.org/x/text v0.3.2 golang.org/x/text => golang.org/x/text v0.3.2
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // 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 => ../api k8s.io/api => k8s.io/api v0.0.0-20210325111203-828bab7a24bb
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210325110411-c68ad1a85ac1
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210325112331-b994da18bceb
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210325105715-a1aab0144d81
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -199,6 +199,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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-20210325111203-828bab7a24bb/go.mod h1:uYSLymrzJHkqb5jYtY7FAzE0zHd9lc0WXILU6/WZZ6g=
k8s.io/apimachinery v0.0.0-20210325110411-c68ad1a85ac1/go.mod h1:yJ/Jdaeiy9qWqHLXWFFj2TAXB6MLFl5+XRz8GQasgow=
k8s.io/client-go v0.0.0-20210325112331-b994da18bceb/go.mod h1:6pNu4OjC/w75TAj/ly7hIGCOuIvuLkqsjHOuoXQ/vyk=
k8s.io/code-generator v0.0.0-20210325105715-a1aab0144d81/go.mod h1:DOoLn8bPxZ5JXiMbamZ4xUkXHP5pqlgWOu+EQ51hsoY=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=