mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Revert "Merge pull request #9165 from smarterclayton/graceful"
This reverts commit4f856b595d, reversing changes made tod78525a83b. Conflicts: pkg/kubelet/status_manager.go
This commit is contained in:
		@@ -151,7 +151,6 @@ func TestRoundTripTypes(t *testing.T) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestEncode_Ptr(t *testing.T) {
 | 
			
		||||
	grace := int64(30)
 | 
			
		||||
	pod := &api.Pod{
 | 
			
		||||
		ObjectMeta: api.ObjectMeta{
 | 
			
		||||
			Labels: map[string]string{"name": "foo"},
 | 
			
		||||
@@ -159,8 +158,6 @@ func TestEncode_Ptr(t *testing.T) {
 | 
			
		||||
		Spec: api.PodSpec{
 | 
			
		||||
			RestartPolicy: api.RestartPolicyAlways,
 | 
			
		||||
			DNSPolicy:     api.DNSClusterFirst,
 | 
			
		||||
 | 
			
		||||
			TerminationGracePeriodSeconds: &grace,
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
	obj := runtime.Object(pod)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user