Skip to content

Commit

Permalink
Merge pull request #99375 from ehashman/probe-kep-2238
Browse files Browse the repository at this point in the history
Add Probe-level terminationGracePeriodSeconds

Kubernetes-commit: faa5c8ccd4cb34c95d67b24bb35354a205ceee15
  • Loading branch information
k8s-publishing-bot committed Mar 12, 2021
1 parent 2407de6 commit 5f0702f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
k8s.io/api v0.0.0-20210311104205-937dc44c61ed
k8s.io/api v0.0.0-20210312105418-ec4ebef5b234
k8s.io/apimachinery v0.0.0-20210311104009-ae8b5f5092d3
k8s.io/klog/v2 v2.5.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
Expand All @@ -36,6 +36,6 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20210311104205-937dc44c61ed
k8s.io/api => k8s.io/api v0.0.0-20210312105418-ec4ebef5b234
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210311104009-ae8b5f5092d3
)
2 changes: 1 addition & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
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-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210311104205-937dc44c61ed/go.mod h1:fBm3nnQpHs9bXI2wLxPEGrgE+lhrp177vcMQZ1Zb8oM=
k8s.io/api v0.0.0-20210312105418-ec4ebef5b234/go.mod h1:fBm3nnQpHs9bXI2wLxPEGrgE+lhrp177vcMQZ1Zb8oM=
k8s.io/apimachinery v0.0.0-20210311104009-ae8b5f5092d3/go.mod h1:T3Fbijal+WETuz3BPSk16GRvUbbkYt4EQFBM0fChi9E=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
Expand Down

0 comments on commit 5f0702f

Please sign in to comment.