github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Kubelet kills a pod that exceeds ActiveDeadlineSeconds

Browse Source
This commit is contained in:
derekwaynecarr
2015-05-09 01:01:43 -04:00
parent 46bd6f298a
commit 8216332611
19 changed files with 1775 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/conversion.go
View File

@@ -141,6 +141,10 @@ func init() {
out.TerminationGracePeriodSeconds = new(int64)
*out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds
}
if in.ActiveDeadlineSeconds != nil {
out.ActiveDeadlineSeconds = new(int64)
*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
}
out.DNSPolicy = in.DNSPolicy
out.Version = "v1beta2"
return nil
@@ -159,6 +163,10 @@ func init() {
out.TerminationGracePeriodSeconds = new(int64)
*out.TerminationGracePeriodSeconds = *in.TerminationGracePeriodSeconds
}
if in.ActiveDeadlineSeconds != nil {
out.ActiveDeadlineSeconds = new(int64)
*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
}
out.DNSPolicy = in.DNSPolicy
return nil
},