Merge pull request kubernetes#4948 from GoogleCloudPlatform/revert-48…

…83-fix_tcpsocket_validation Revert "TCPSocket could not be used as it was not checked in validation"
satnam6502 · Mar 2, 2015 · 148ce12 · 148ce12
2 parents c7cbc5c + 4937008
commit 148ce12
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 56 deletions.
diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go
@@ -469,14 +469,6 @@ func validateTCPSocketAction(tcp *api.TCPSocketAction) errs.ValidationErrorList
 	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 {
 	numHandlers := 0
 	allErrors := errs.ValidationErrorList{}

diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go
@@ -496,32 +496,6 @@ func TestValidateContainers(t *testing.T) {
 				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.": {
 			{
 				Name:  "life-123",
@@ -532,28 +506,6 @@ func TestValidateContainers(t *testing.T) {
 				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": {
 			{Name: "abc", Image: "image", Privileged: true},
 		},