Merge pull request kubernetes#17984 from liggitt/automated-cherry-pick-of-#17973-upstream-release-1.0

brendandburns · brendandburns · commit 362a6c057a78 · 2015-12-04T20:15:40.000-08:00
Automated cherry pick of kubernetes#17973
diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go
@@ -956,6 +956,12 @@ func ValidatePodSpec(spec *api.PodSpec) errs.ValidationErrorList {
 		}
 	}
 
+	if len(spec.NodeName) > 0 {
+		if ok, msg := ValidateNodeName(spec.NodeName, false); !ok {
+			allErrs = append(allErrs, errs.NewFieldInvalid("nodeName", spec.NodeName, msg))
+		}
+	}
+
 	if spec.ActiveDeadlineSeconds != nil {
 		if *spec.ActiveDeadlineSeconds <= 0 {
 			allErrs = append(allErrs, errs.NewFieldInvalid("activeDeadlineSeconds", spec.ActiveDeadlineSeconds, "activeDeadlineSeconds must be a positive integer greater than 0"))
diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go
@@ -1129,6 +1129,13 @@ func TestValidatePodSpec(t *testing.T) {
 			DNSPolicy:             api.DNSClusterFirst,
 			ActiveDeadlineSeconds: &activeDeadlineSeconds,
 		},
+		"bad nodeName": {
+			NodeName:      "node name",
+			Volumes:       []api.Volume{{Name: "vol", VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}}},
+			Containers:    []api.Container{{Name: "ctr", Image: "image", ImagePullPolicy: "IfNotPresent"}},
+			RestartPolicy: api.RestartPolicyAlways,
+			DNSPolicy:     api.DNSClusterFirst,
+		},
 	}
 	for k, v := range failureCases {
 		if errs := ValidatePodSpec(&v); len(errs) == 0 {
diff --git a/pkg/client/kubelet.go b/pkg/client/kubelet.go
@@ -18,11 +18,13 @@ package client
 
 import (
 	"errors"
+	"fmt"
 	"net"
 	"net/http"
 	"net/url"
 	"strconv"
 
+	"k8s.io/kubernetes/pkg/api/validation"
 	"k8s.io/kubernetes/pkg/probe"
 	httprobe "k8s.io/kubernetes/pkg/probe/http"
 )
@@ -87,6 +89,9 @@ func NewKubeletClient(config *KubeletConfig) (KubeletClient, error) {
 }
 
 func (c *HTTPKubeletClient) GetConnectionInfo(host string) (string, uint, http.RoundTripper, error) {
+	if ok, msg := validation.ValidateNodeName(host, false); !ok {
+		return "", 0, nil, fmt.Errorf("invalid node name: %s", msg)
+	}
 	scheme := "http"
 	if c.Config.EnableHttps {
 		scheme = "https"
diff --git a/pkg/client/kubelet_test.go b/pkg/client/kubelet_test.go
@@ -164,4 +164,27 @@ func TestNewKubeletClientTLSValid(t *testing.T) {
 	if client == nil {
 		t.Error("client should not be nil")
 	}
+
+	{
+		scheme, port, transport, err := client.GetConnectionInfo("foo")
+		if err != nil {
+			t.Errorf("Error getting info: %v", err)
+		}
+		if scheme != "https" {
+			t.Errorf("Expected https, got %s", scheme)
+		}
+		if port != 9000 {
+			t.Errorf("Expected 9000, got %d", port)
+		}
+		if transport == nil {
+			t.Errorf("Expected transport, got nil")
+		}
+	}
+
+	{
+		_, _, _, err := client.GetConnectionInfo("foo bar")
+		if err == nil {
+			t.Errorf("Expected error getting connection info for invalid node name, got none")
+		}
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -956,6 +956,12 @@ func ValidatePodSpec(spec *api.PodSpec) errs.ValidationErrorList {`
`956`	`956`	`}`
`957`	`957`	`}`
`958`	`958`
	`959`	`+ if len(spec.NodeName) > 0 {`
	`960`	`+ if ok, msg := ValidateNodeName(spec.NodeName, false); !ok {`
	`961`	`+ allErrs = append(allErrs, errs.NewFieldInvalid("nodeName", spec.NodeName, msg))`
	`962`	`+ }`
	`963`	`+ }`
	`964`	`+`
`959`	`965`	`if spec.ActiveDeadlineSeconds != nil {`
`960`	`966`	`if *spec.ActiveDeadlineSeconds <= 0 {`
`961`	`967`	`allErrs = append(allErrs, errs.NewFieldInvalid("activeDeadlineSeconds", spec.ActiveDeadlineSeconds, "activeDeadlineSeconds must be a positive integer greater than 0"))`