github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 19:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3660 from dchen1107/image

Browse Source 
Using switch in validatePullPolicyWithDefault
This commit is contained in:
Tim Hockin 2015-01-21 12:54:12 -08:00
commit c729f345f0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/validation/validation.go
View File

@ -266,8 +266,9 @@ func validateLifecycle(lifecycle *api.Lifecycle) errs.ValidationErrorList {
func validatePullPolicyWithDefault(ctr *api.Container) errs.ValidationErrorList { func validatePullPolicyWithDefault(ctr *api.Container) errs.ValidationErrorList {
allErrors := errs.ValidationErrorList{} allErrors := errs.ValidationErrorList{}
switch ctr.ImagePullPolicy {
case "":
// TODO(dchen1107): Move ParseImageName code to pkg/util // TODO(dchen1107): Move ParseImageName code to pkg/util
if len(ctr.ImagePullPolicy) == 0 {
parts := strings.Split(ctr.Image, ":") parts := strings.Split(ctr.Image, ":")
// Check image tag // Check image tag
if parts[len(parts)-1] == "latest" { if parts[len(parts)-1] == "latest" {
@ -275,10 +276,9 @@ func validatePullPolicyWithDefault(ctr *api.Container) errs.ValidationErrorList
} else { } else {
ctr.ImagePullPolicy = api.PullIfNotPresent ctr.ImagePullPolicy = api.PullIfNotPresent
} }
} case api.PullAlways, api.PullIfNotPresent, api.PullNever:
if ctr.ImagePullPolicy != api.PullAlways && break
ctr.ImagePullPolicy != api.PullIfNotPresent && default:
ctr.ImagePullPolicy != api.PullNever {
allErrors = append(allErrors, errs.NewFieldNotSupported("", ctr.ImagePullPolicy)) allErrors = append(allErrors, errs.NewFieldNotSupported("", ctr.ImagePullPolicy))
} }