Simplify PullPolicy handling

pkg/config/config_test.go

@@ -811,4 +811,77 @@ env=["foo=bar"]`
  gomega.Expect(config.Containers.BaseHostsFile).To(gomega.Equal("/etc/hosts2"))
  gomega.Expect(config.Containers.EnableLabeledUsers).To(gomega.BeTrue())
  })
+
+ It("ParsePullPolicy", func() {
+ for _, test := range []struct {
+ value string
+ policy PullPolicy
+ fail bool
+ }{
+ {
+ value: "always",
+ policy: PullPolicyAlways,
+ },
+ {
+ value: "alWays",
+ policy: PullPolicyAlways,
+ },
+ {
+ value: "ALWAYS",
+ policy: PullPolicyAlways,
+ },
+ {
+ value: "never",
+ policy: PullPolicyNever,
+ },
+ {
+ value: "NEVER",
+ policy: PullPolicyNever,
+ },
+ {
+ value: "newer",
+ policy: PullPolicyNewer,
+ },
+ {
+ value: "ifnewer",
+ policy: PullPolicyNewer,
+ },
+ {
+ value: "NEWER",
+ policy: PullPolicyNewer,
+ },
+ {
+ value: "",
+ policy: PullPolicyMissing,
+ },
+ {
+ value: "missing",
+ policy: PullPolicyMissing,
+ },
+ {
+ value: "MISSING",
+ policy: PullPolicyMissing,
+ },
+ {
+ value: "IFMISSING",
+ policy: PullPolicyMissing,
+ },
+ {
+ value: "ifnotpresent",
+ policy: PullPolicyMissing,
+ },
+ {
+ value: "bogus",
+ fail: true,
+ },
+ } {
+ p, err := ParsePullPolicy(test.value)
+ if test.fail {
+ gomega.Expect(err.Error()).To(gomega.Equal(fmt.Sprintf("unsupported pull policy %q", test.value)))
+ } else {
+ gomega.Expect(err).ToNot(gomega.HaveOccurred())
+ gomega.Expect(p).To(gomega.Equal(test.policy))
+ }
+ }
+ })
 })

pkg/config/pull_policy.go

@@ -2,6 +2,7 @@ package config
 
 import (
  "fmt"
+ "strings"
 )
 
 // PullPolicy determines how and which images are being pulled from a container
@@ -73,14 +74,14 @@ func (p PullPolicy) Validate() error {
 // * "newer" <-> PullPolicyNewer (also "ifnewer")
 // * "never" <-> PullPolicyNever
 func ParsePullPolicy(s string) (PullPolicy, error) {
- switch s {
- case "always", "Always":
+ switch strings.ToLower(s) {
+ case "always":
  return PullPolicyAlways, nil
- case "missing", "Missing", "ifnotpresent", "IfNotPresent", "":
+ case "missing", "ifmissing", "ifnotpresent", "":
  return PullPolicyMissing, nil
- case "newer", "Newer", "ifnewer", "IfNewer":
+ case "newer", "ifnewer":
  return PullPolicyNewer, nil
- case "never", "Never":
+ case "never":
  return PullPolicyNever, nil
  default:
  return PullPolicyUnsupported, fmt.Errorf("unsupported pull policy %q", s)