Merge pull request #5477 from dchen1107/clean

Convert RestartPolicy to string for v1beta3.
2015-03-16 10:23:52 -07:00
parent 2a8528704a 34e9c82c70
commit e37fd2a84d
29 changed files with 184 additions and 258 deletions
--- a/test/e2e/pods.go
+++ b/test/e2e/pods.go
@@ -336,9 +336,7 @@ var _ = Describe("Pods", func() {
 						Command: []string{"sh", "-c", "env; sleep 600"},
 					},
 				},
-				RestartPolicy: api.RestartPolicy{
-					Never: &api.RestartPolicyNever{},
-				},
+				RestartPolicy: api.RestartPolicyNever,
 			},
 		}
 		defer c.Pods(api.NamespaceDefault).Delete(clientPod.Name)
--- a/test/e2e/secrets.go
+++ b/test/e2e/secrets.go
@@ -104,9 +104,7 @@ var _ = Describe("Secrets", func() {
 						},
 					},
 				},
-				RestartPolicy: api.RestartPolicy{
-					Never: &api.RestartPolicyNever{},
-				},
+				RestartPolicy: api.RestartPolicyNever,
 			},
 		}