github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Update cluster name validation to allow only DNS labels

Browse Source
This commit is contained in:
nikhiljindal 2016-08-18 18:19:19 -07:00
parent 57ad590d8d
commit 473c1d5653
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/apis/federation/validation/validation.go
View File

@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/pkg/util/validation/field" "k8s.io/kubernetes/pkg/util/validation/field"
) )
var ValidateClusterName = validation.NameIsDNSSubdomain var ValidateClusterName = validation.NameIsDNS1035Label
func ValidateClusterSpec(spec *federation.ClusterSpec, fieldPath *field.Path) field.ErrorList { func ValidateClusterSpec(spec *federation.ClusterSpec, fieldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}

11
federation/apis/federation/validation/validation_test.go
View File

@ -61,6 +61,17 @@ func TestValidateCluster(t *testing.T) {
}, },
}, },
}, },
"invalid cluster name (is a subdomain)": {
ObjectMeta: api.ObjectMeta{Name: "mycluster.mycompany"},
Spec: federation.ClusterSpec{
ServerAddressByClientCIDRs: []federation.ServerAddressByClientCIDR{
{
ClientCIDR: "0.0.0.0/0",
ServerAddress: "localhost:8888",
},
},
},
},
} }
for testName, errorCase := range errorCases { for testName, errorCase := range errorCases {
errs := ValidateCluster(&errorCase) errs := ValidateCluster(&errorCase)