Skip to content

Commit 6f060a2

Browse files
Merge pull request #96778 from caesarxuchao/cherrypick-95981-119
Cherrypick #95981 to 1.19, Enables HTTP/2 health check Kubernetes-commit: 352ce39b5ed5c1f18c06bbc9bd1570c3bafdca90
1 parent eb7665e commit 6f060a2

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Godeps/Godeps.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ require (
2626
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
2727
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
2828
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
29-
k8s.io/api v0.0.0
30-
k8s.io/apimachinery v0.0.0
29+
k8s.io/api v0.0.0-20201130085935-d9813e0d77df
30+
k8s.io/apimachinery v0.0.0-20201130085653-2f881bd9ad1b
3131
k8s.io/klog/v2 v2.2.0
3232
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
3333
sigs.k8s.io/yaml v1.2.0
3434
)
3535

3636
replace (
37-
k8s.io/api => ../api
38-
k8s.io/apimachinery => ../apimachinery
39-
k8s.io/client-go => ../client-go
37+
k8s.io/api => k8s.io/api v0.0.0-20201130085935-d9813e0d77df
38+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201130085653-2f881bd9ad1b
4039
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
334334
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
335335
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
336336
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
337+
k8s.io/api v0.0.0-20201130085935-d9813e0d77df/go.mod h1:fjmAgUa/Kgc5FPSkkkaetAcIpcZvNkOb3bZ6IqWsHaw=
338+
k8s.io/apimachinery v0.0.0-20201130085653-2f881bd9ad1b/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q=
337339
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
338340
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
339341
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=

0 commit comments

Comments
 (0)