github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73877 from droslean/nits 

apis:core:validation: remove unused, changes to idiomatic go
pull/564/head
Kubernetes Prow Robot 2019-02-11 10:31:06 -08:00 committed by GitHub
parent 6912bbb153 c7e103fd44
commit f7c4389b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/apis/core/validation/validation.go
View File

@ -2082,13 +2082,6 @@ func validateObjectFieldSelector(fs *core.ObjectFieldSelector, expressions *sets
return allErrs return allErrs
} }
func fsResourceIsEphemeralStorage(resource string) bool {
if resource == "limits.ephemeral-storage" || resource == "requests.ephemeral-storage" {
return true
}
return false
}
func validateContainerResourceFieldSelector(fs *core.ResourceFieldSelector, expressions *sets.String, fldPath *field.Path, volume bool) field.ErrorList { func validateContainerResourceFieldSelector(fs *core.ResourceFieldSelector, expressions *sets.String, fldPath *field.Path, volume bool) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
@ -4014,7 +4007,7 @@ func ValidateReadOnlyPersistentDisks(volumes []core.Volume, fldPath *field.Path)
vol := &volumes[i] vol := &volumes[i]
idxPath := fldPath.Index(i) idxPath := fldPath.Index(i)
if vol.GCEPersistentDisk != nil { if vol.GCEPersistentDisk != nil {
if vol.GCEPersistentDisk.ReadOnly == false { if !vol.GCEPersistentDisk.ReadOnly {
allErrs = append(allErrs, field.Invalid(idxPath.Child("gcePersistentDisk", "readOnly"), false, "must be true for replicated pods > 1; GCE PD can only be mounted on multiple machines if it is read-only")) allErrs = append(allErrs, field.Invalid(idxPath.Child("gcePersistentDisk", "readOnly"), false, "must be true for replicated pods > 1; GCE PD can only be mounted on multiple machines if it is read-only"))
} }
} }
@ -4360,15 +4353,6 @@ func validateContainerResourceName(value string, fldPath *field.Path) field.Erro
return allErrs return allErrs
} }
// isLocalStorageResource checks whether the resource is local ephemeral storage
func isLocalStorageResource(name string) bool {
if name == string(core.ResourceEphemeralStorage) || name == string(core.ResourceRequestsEphemeralStorage) ||
name == string(core.ResourceLimitsEphemeralStorage) {
return true
}
return false
}
// Validate resource names that can go in a resource quota // Validate resource names that can go in a resource quota
// Refer to docs/design/resources.md for more details. // Refer to docs/design/resources.md for more details.
func ValidateResourceQuotaResourceName(value string, fldPath *field.Path) field.ErrorList { func ValidateResourceQuotaResourceName(value string, fldPath *field.Path) field.ErrorList {
@ -4975,10 +4959,7 @@ func ValidateNamespace(namespace *core.Namespace) field.ErrorList {
// Validate finalizer names // Validate finalizer names
func validateFinalizerName(stringValue string, fldPath *field.Path) field.ErrorList { func validateFinalizerName(stringValue string, fldPath *field.Path) field.ErrorList {
allErrs := apimachineryvalidation.ValidateFinalizerName(stringValue, fldPath) allErrs := apimachineryvalidation.ValidateFinalizerName(stringValue, fldPath)
for _, err := range validateKubeFinalizerName(stringValue, fldPath) { allErrs = append(allErrs, validateKubeFinalizerName(stringValue, fldPath)...)
allErrs = append(allErrs, err)
}
return allErrs return allErrs
} }