summaryrefslogtreecommitdiff
path: root/pkg/util
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-09-12 06:17:09 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-09-12 07:02:04 -0400
commit81f99c3ecd85bb67a18f2aa14b8dd8f2344fefa8 (patch)
tree8f53ff26fc524ef13c6f5ac9feab11c619b3b5c5 /pkg/util
parent834c41da7d01acd861cb12912345a61d23ce9079 (diff)
downloadpodman-81f99c3ecd85bb67a18f2aa14b8dd8f2344fefa8.tar.gz
podman-81f99c3ecd85bb67a18f2aa14b8dd8f2344fefa8.tar.bz2
podman-81f99c3ecd85bb67a18f2aa14b8dd8f2344fefa8.zip
pull types allow initial caps
validate pulltype will allow initial caps form cli or yaml file passed to i play kube. Use code related with pullpolicy from containers/common. Signed-off-by: Qi Wang <qiwan@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/util')
-rw-r--r--pkg/util/utils.go24
1 files changed, 6 insertions, 18 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 82282a549..7612d3012 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -537,33 +537,21 @@ func OpenExclusiveFile(path string) (*os.File, error) {
return os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666)
}
-// PullType whether to pull new image
-type PullType int
+type PullType = config.PullPolicy
-const (
+var (
// PullImageAlways always try to pull new image when create or run
- PullImageAlways PullType = iota
+ PullImageAlways = config.PullImageAlways
// PullImageMissing pulls image if it is not locally
- PullImageMissing
+ PullImageMissing = config.PullImageMissing
// PullImageNever will never pull new image
- PullImageNever
+ PullImageNever = config.PullImageNever
)
// ValidatePullType check if the pullType from CLI is valid and returns the valid enum type
// if the value from CLI is invalid returns the error
func ValidatePullType(pullType string) (PullType, error) {
- switch pullType {
- case "always":
- return PullImageAlways, nil
- case "missing", "IfNotPresent":
- return PullImageMissing, nil
- case "never":
- return PullImageNever, nil
- case "":
- return PullImageMissing, nil
- default:
- return PullImageMissing, errors.Errorf("invalid pull type %q", pullType)
- }
+ return config.ValidatePullPolicy(pullType)
}
// ExitCode reads the error message when failing to executing container process