kubernetes
/
kubelet
mirror of https://github.com/kubernetes/kubelet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #122890 from HirazawaUi/fix-pod-grace-period 

[kubelet]: Fix the bug where pod grace period will be overwritten

Kubernetes-commit: d6bb550b1079af165a1bba9485b8c026735de17f
This commit is contained in:
Kubernetes Publisher 2024-09-24 00:45:59 +01:00
parent 2c1b324c64 536faf8bc4
commit 563d12b784
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/v1beta1/types.go
View File

@ -527,9 +527,6 @@ type KubeletConfiguration struct {
// evictionMaxPodGracePeriod is the maximum allowed grace period (in seconds) to use
// when terminating pods in response to a soft eviction threshold being met. This value
// effectively caps the Pod's terminationGracePeriodSeconds value during soft evictions.
// Note: Due to issue #64530, the behavior has a bug where this value currently just
// overrides the grace period during soft eviction, which can increase the grace
// period from what is set on the Pod. This bug will be fixed in a future release.
// Default: 0
// +optional
EvictionMaxPodGracePeriod int32 `json:"evictionMaxPodGracePeriod,omitempty"`

2
go.mod
View File

@ -13,7 +13,7 @@ require (
google.golang.org/grpc v1.65.0
k8s.io/api v0.0.0-20240920202009-71385f038c10
k8s.io/apimachinery v0.0.0-20240920201701-c98a9e22228d
k8s.io/apiserver v0.0.0-20240923043547-de96004cf632
k8s.io/apiserver v0.0.0-20240923123642-763c8220a648
k8s.io/client-go v0.0.0-20240922202559-fcb1b6051673
k8s.io/component-base v0.0.0-20240923042704-5e237c64b1be
k8s.io/cri-api v0.0.0-20240912051528-010fdf8d785a

4
go.sum
View File

@ -156,8 +156,8 @@ k8s.io/api v0.0.0-20240920202009-71385f038c10 h1:shjQe98Co9zBlDzQkxb5IJEWtReSl7q
k8s.io/api v0.0.0-20240920202009-71385f038c10/go.mod h1:KCEt6+W/Yn1Vc48pYXeLf0mGK52kJhvt+rcaUVsIaKQ=
k8s.io/apimachinery v0.0.0-20240920201701-c98a9e22228d h1:yDB+e3ReCJtthGtcZXMJAYPsekzI7oIS6U6hSDgFVRA=
k8s.io/apimachinery v0.0.0-20240920201701-c98a9e22228d/go.mod h1:5rKPDwwN9qm//xASFCZ83nyYEanHxxhc7pZ8AC4lukY=
k8s.io/apiserver v0.0.0-20240923043547-de96004cf632 h1:WZ6ezI6jgKX9HvddLSiIWL+SMCboPe/duPhZ08aKy9Y=
k8s.io/apiserver v0.0.0-20240923043547-de96004cf632/go.mod h1:9A2BTOZg1gI5v7u4Jj83JVI1O07TzlDdvKTvQabSjgg=
k8s.io/apiserver v0.0.0-20240923123642-763c8220a648 h1:Y9U3mFSS0V6Ll8rufN2sNmzOQuaBRw0DpN7Hjs0stLQ=
k8s.io/apiserver v0.0.0-20240923123642-763c8220a648/go.mod h1:9A2BTOZg1gI5v7u4Jj83JVI1O07TzlDdvKTvQabSjgg=
k8s.io/client-go v0.0.0-20240922202559-fcb1b6051673 h1:HbmVM5qrkQFSb+Isx8xOECazw5L6VDenjnUAgMPSmNQ=
k8s.io/client-go v0.0.0-20240922202559-fcb1b6051673/go.mod h1:slPGP9kLjwKXgatD4iciMlNjnCmtXQ1ZHl7l/mS5Ux0=
k8s.io/component-base v0.0.0-20240923042704-5e237c64b1be h1:FVbhqwC7jzmEJj2WO1uDz8p53hPawsv6qgCmraQA71Y=