github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more to README, tweaked pod, added service, fixed validation

Browse Source
This commit is contained in:
markturansky
2015-04-18 07:16:07 -04:00
parent b634f17ca7
commit 2cf4e6564b
7 changed files with 72 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,6 +319,11 @@ func validateSource(source *api.VolumeSource) errs.ValidationErrorList {
numVolumes++
allErrs = append(allErrs, validateGlusterfs(source.Glusterfs).Prefix("glusterfs")...)
}
if source.PersistentVolumeClaimVolumeSource != nil {
numVolumes++
allErrs = append(allErrs, validatePersistentClaimVolumeSource(source.PersistentVolumeClaimVolumeSource).Prefix("glusterfs")...)
}
if numVolumes != 1 {
allErrs = append(allErrs, errs.NewFieldInvalid("", source, "exactly 1 volume type is required"))
}
@@ -394,6 +399,14 @@ func validateSecretVolumeSource(secretSource *api.SecretVolumeSource) errs.Valid
return allErrs
}
func validatePersistentClaimVolumeSource(claim *api.PersistentVolumeClaimVolumeSource) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{}
if claim.ClaimName == "" {
allErrs = append(allErrs, errs.NewFieldRequired("claimName"))
}
return allErrs
}
func validateNFS(nfs *api.NFSVolumeSource) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{}
if nfs.Server == "" {