github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Refactor to clean up names.

Browse Source
This commit is contained in:
Brendan Burns
2014-09-16 15:18:33 -07:00
parent 506f51b186
commit dc5a4a8c3f
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ func validateContainers(containers []api.Container, volumes util.StringSet) errs
for i := range containers {
cErrs := errs.ErrorList{}
ctr := &containers[i] // so we can set default values
capabilities := capabilities.GetCapabilities()
capabilities := capabilities.Get()
if len(ctr.Name) == 0 {
cErrs = append(cErrs, errs.NewFieldRequired("name", ctr.Name))
} else if !util.IsDNSLabel(ctr.Name) {

4
pkg/api/validation/validation_test.go
View File

@@ -180,7 +180,7 @@ func TestValidateVolumeMounts(t *testing.T) {
func TestValidateContainers(t *testing.T) {
volumes := util.StringSet{}
capabilities.SetCapabilitiesForTests(capabilities.Capabilities{
capabilities.SetForTests(capabilities.Capabilities{
AllowPrivileged: true,
})
@@ -203,7 +203,7 @@ func TestValidateContainers(t *testing.T) {
t.Errorf("expected success: %v", errs)
}
capabilities.SetCapabilitiesForTests(capabilities.Capabilities{
capabilities.SetForTests(capabilities.Capabilities{
AllowPrivileged: false,
})
errorCases := map[string][]api.Container{