Skip to content

Commit fa9ba9b

Browse files
authored
Merge pull request moby#3687 from cryeo/remove-kubepod-context-validation
remove context name validation from kubepod connhelper
2 parents eb7080c + 6a88d9a commit fa9ba9b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

client/connhelper/kubepod/kubepod.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ func SpecFromURL(u *url.URL) (*Spec, error) {
5151
Pod: u.Hostname(),
5252
Container: q.Get("container"),
5353
}
54-
if sp.Context != "" && !validKubeIdentifier(sp.Context) {
55-
return nil, errors.Errorf("unsupported context name: %q", sp.Context)
56-
}
5754
if sp.Namespace != "" && !validKubeIdentifier(sp.Namespace) {
5855
return nil, errors.Errorf("unsupported namespace name: %q", sp.Namespace)
5956
}

client/connhelper/kubepod/kubepod_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,13 @@ func TestSpecFromURL(t *testing.T) {
1515
"kube-pod://podname?container=containername&namespace=nsname&context=ctxname": {
1616
Context: "ctxname", Namespace: "nsname", Pod: "podname", Container: "containername",
1717
},
18+
"kube-pod://podname?container=containername&namespace=nsname&context=user@cluster": {
19+
Context: "user@cluster", Namespace: "nsname", Pod: "podname", Container: "containername",
20+
},
1821
"kube-pod://": nil,
1922
"kube-pod://unsupported_pod_name": nil,
23+
"kube-pod://podname?container=unsupported_container_name&namespace=nsname&context=ctxname": nil,
24+
"kube-pod://podname?container=containername&namespace=unsupported_ns_name&context=ctxname": nil,
2025
}
2126
for s, expected := range cases {
2227
u, err := url.Parse(s)

0 commit comments

Comments
 (0)