Merge pull request #2360 from dchen1107/cleanup

Change the default Pull policy to PullIfNotPresent.

Merge pull request #2360 from dchen1107/cleanup
ec51ec3e · Daniel Smith · 8c358f0c · 81107c3e · ec51ec3e
Commit ec51ec3e authored Nov 13, 2014 by Daniel Smith
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

helpers.go pkg/api/helpers.go +4 -4

No files found.
--- a/pkg/api/helpers.go
+++ b/pkg/api/helpers.go
@@ -21,10 +21,6 @@ import (
 )

 func IsPullAlways(p PullPolicy) bool {
-	// Default to pull always
-	if len(p) == 0 {
-		return true
-	}
 	return pullPoliciesEqual(p, PullAlways)
 }

@@ -33,6 +29,10 @@ func IsPullNever(p PullPolicy) bool {
 }

 func IsPullIfNotPresent(p PullPolicy) bool {
+	// Default to pull if not present
+	if len(p) == 0 {
+		return true
+	}
 	return pullPoliciesEqual(p, PullIfNotPresent)
 }