Merge pull request #45658 from zhangxiaoyu-zidif/add-strong-to-parsepodfulname

Automatic merge from submit-queue (batch tested with PRs 41331, 45591, 45600, 45176, 45658) ParsePodFullName():code robustness **What this PR does / why we need it**: ParsePodFullName():code robustness if pod name or namespace name is null, the function can handle it. Meanwhile update unit test **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #45658 from zhangxiaoyu-zidif/add-strong-to-parsepodfulname
51d6429a · Kubernetes Submit Queue · GitHub · cb26eb60 · 65080ea1 · 51d6429a
Commit 51d6429a authored May 15, 2017 by Kubernetes Submit Queue Committed by GitHub May 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

runtime.go pkg/kubelet/container/runtime.go +1 -1

mirror_client_test.go pkg/kubelet/pod/mirror_client_test.go +1 -1

No files found.
--- a/pkg/kubelet/container/runtime.go
+++ b/pkg/kubelet/container/runtime.go
@@ -608,7 +608,7 @@ func BuildPodFullName(name, namespace string) string {
 // Parse the pod full name.
 func ParsePodFullName(podFullName string) (string, string, error) {
 	parts := strings.Split(podFullName, "_")
-	if len(parts) != 2 {
+	if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
 		return "", "", fmt.Errorf("failed to parse the pod full name %q", podFullName)
 	}
 	return parts[0], parts[1], nil

--- a/pkg/kubelet/pod/mirror_client_test.go
+++ b/pkg/kubelet/pod/mirror_client_test.go
@@ -32,7 +32,7 @@ func TestParsePodFullName(t *testing.T) {
 		"bar.org_foo.com": {Name: "bar.org", Namespace: "foo.com"},
 		"bar-bar_foo":     {Name: "bar-bar", Namespace: "foo"},
 	}
-	failedCases := []string{"barfoo", "bar_foo_foo", ""}
+	failedCases := []string{"barfoo", "bar_foo_foo", "", "bar_", "_foo"}

 	for podFullName, expected := range successfulCases {
 		name, namespace, err := kubecontainer.ParsePodFullName(podFullName)