github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127347 from yuyabee/automated-cherry-pick-of-#127333-upstream-release-1.31

Browse Source 
Automated cherry pick of #127333: Add activeDeadlineSeconds to kubeadm upgrade-health-check job
This commit is contained in:
Kubernetes Prow Robot 2024-09-24 02:01:59 +01:00 committed by GitHub
commit c75e833026
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/phases/upgrade/health.go
View File

@ -98,6 +98,7 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration)
fieldSelector = "spec.unschedulable=false" fieldSelector = "spec.unschedulable=false"
ns = metav1.NamespaceSystem ns = metav1.NamespaceSystem
timeout = 15 * time.Second timeout = 15 * time.Second
timeoutMargin = 5 * time.Second
) )
var ( var (
err, lastError error err, lastError error
@ -132,6 +133,9 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration)
return nil return nil
} }
// Adding a margin of error to the polling timeout.
timeoutWithMargin := timeout.Seconds() + timeoutMargin.Seconds()
// Prepare Job // Prepare Job
job := &batchv1.Job{ job := &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -140,7 +144,8 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration)
}, },
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
BackoffLimit: ptr.To[int32](0), BackoffLimit: ptr.To[int32](0),
TTLSecondsAfterFinished: ptr.To[int32](int32(timeout.Seconds()) + 5), // Make sure it's more than 'timeout'. TTLSecondsAfterFinished: ptr.To[int32](int32(timeoutWithMargin)),
ActiveDeadlineSeconds: ptr.To[int64](int64(timeoutWithMargin)),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: v1.PodSpec{
RestartPolicy: v1.RestartPolicyNever, RestartPolicy: v1.RestartPolicyNever,