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

Merge pull request #4948 from GoogleCloudPlatform/revert-4883-fix_tcpsocket_validation 

Revert "TCPSocket could not be used as it was not checked in validation"
pull/6/head
Zach Loafman 2015-03-02 11:15:17 -08:00
parent c7cbc5c991 4937008ae0
commit 148ce12b84
2 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,14 +469,6 @@ func validateTCPSocketAction(tcp *api.TCPSocketAction) errs.ValidationErrorList
return allErrors return allErrors
} }
func validateTCPSocketAction(tcp *api.TCPSocketAction) errs.ValidationErrorList {
allErrors := errs.ValidationErrorList{}
if len(tcp.Port.StrVal) == 0 && tcp.Port.IntVal == 0 {
allErrors = append(allErrors, errs.NewFieldRequired("port", tcp.Port))
}
return allErrors
}
func validateHandler(handler *api.Handler) errs.ValidationErrorList { func validateHandler(handler *api.Handler) errs.ValidationErrorList {
numHandlers := 0 numHandlers := 0
allErrors := errs.ValidationErrorList{} allErrors := errs.ValidationErrorList{}

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

@ -496,32 +496,6 @@ func TestValidateContainers(t *testing.T) {
ImagePullPolicy: "IfNotPresent", ImagePullPolicy: "IfNotPresent",
}, },
}, },
"invalid lifecycle, no tcp socket port.": {
{
Name: "life-123",
Image: "image",
Lifecycle: &api.Lifecycle{
PreStop: &api.Handler{
TCPSocket: &api.TCPSocketAction{},
},
},
ImagePullPolicy: "IfNotPresent",
},
},
"invalid lifecycle, zero tcp socket port.": {
{
Name: "life-123",
Image: "image",
Lifecycle: &api.Lifecycle{
PreStop: &api.Handler{
TCPSocket: &api.TCPSocketAction{
Port: util.IntOrString{IntVal: 0},
},
},
},
ImagePullPolicy: "IfNotPresent",
},
},
"invalid lifecycle, no action.": { "invalid lifecycle, no action.": {
{ {
Name: "life-123", Name: "life-123",
@ -532,28 +506,6 @@ func TestValidateContainers(t *testing.T) {
ImagePullPolicy: "IfNotPresent", ImagePullPolicy: "IfNotPresent",
}, },
}, },
"invalid liveness probe, no tcp socket port.": {
{
Name: "life-123",
Image: "image",
LivenessProbe: &api.Probe{
Handler: api.Handler{
TCPSocket: &api.TCPSocketAction{},
},
},
ImagePullPolicy: "IfNotPresent",
},
},
"invalid liveness probe, no action.": {
{
Name: "life-123",
Image: "image",
LivenessProbe: &api.Probe{
Handler: api.Handler{},
},
ImagePullPolicy: "IfNotPresent",
},
},
"privilege disabled": { "privilege disabled": {
{Name: "abc", Image: "image", Privileged: true}, {Name: "abc", Image: "image", Privileged: true},
}, },