diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go index 75ceff3a7cf..5dff4d7c02b 100644 --- a/pkg/api/helpers.go +++ b/pkg/api/helpers.go @@ -18,7 +18,6 @@ package api import ( "reflect" - "strings" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" @@ -60,27 +59,4 @@ var Semantic = conversion.EqualitiesOrDie( } return a.Amount.Cmp(b.Amount) == 0 }, - pullPoliciesEqual, ) - -// TODO: Address these per #1502 - -func IsPullAlways(p PullPolicy) bool { - return pullPoliciesEqual(p, PullAlways) -} - -func IsPullNever(p PullPolicy) bool { - return pullPoliciesEqual(p, PullNever) -} - -func IsPullIfNotPresent(p PullPolicy) bool { - // Default to pull if not present - if len(p) == 0 { - return true - } - return pullPoliciesEqual(p, PullIfNotPresent) -} - -func pullPoliciesEqual(p1, p2 PullPolicy) bool { - return strings.ToLower(string(p1)) == strings.ToLower(string(p2)) -} diff --git a/pkg/api/helpers_test.go b/pkg/api/helpers_test.go index 5d15ced93c0..c8cde624c31 100644 --- a/pkg/api/helpers_test.go +++ b/pkg/api/helpers_test.go @@ -59,8 +59,6 @@ func TestSemantic(t *testing.T) { true, }, {resource.MustParse("2m"), resource.MustParse("1m"), false}, - {PullPolicy("NEVER"), PullPolicy("neveR"), true}, - {PullPolicy("NEVER"), PullPolicy("neveRi"), false}, } for index, item := range table {