github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62253 from nak3/drop-atmark-first

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Create container name after dropped ":" and "@" both separately

When image has ":" after "@", kubectl create deployment fails due to
invalid container name.

This patch changes to create the container name after drooping ":" and
"@" both separately.

Fixes https://github.com/kubernetes/kubernetes/issues/62252

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-08 21:58:03 -07:00 committed by GitHub
commit 5648200571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/deployment.go
View File

@ -78,7 +78,8 @@ func buildPodSpec(images []string) v1.PodSpec {
// Remove any tag or hash // Remove any tag or hash
if strings.Contains(name, ":") { if strings.Contains(name, ":") {
name = strings.Split(name, ":")[0] name = strings.Split(name, ":")[0]
} else if strings.Contains(name, "@") { }
if strings.Contains(name, "@") {
name = strings.Split(name, "@")[0] name = strings.Split(name, "@")[0]
} }
podSpec.Containers = append(podSpec.Containers, v1.Container{Name: name, Image: imageString}) podSpec.Containers = append(podSpec.Containers, v1.Container{Name: name, Image: imageString})

3
pkg/kubectl/deployment_test.go
View File

@ -37,7 +37,7 @@ func TestDeploymentBasicGenerate(t *testing.T) {
{ {
name: "deployment name and images ok", name: "deployment name and images ok",
deploymentName: "images-name-ok", deploymentName: "images-name-ok",
images: []string{"nn/image1", "registry/nn/image2", "nn/image3:tag", "nn/image4@digest"}, images: []string{"nn/image1", "registry/nn/image2", "nn/image3:tag", "nn/image4@digest", "nn/image5@sha256:digest"},
expected: &extensionsv1beta1.Deployment{ expected: &extensionsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "images-name-ok", Name: "images-name-ok",
@ -58,6 +58,7 @@ func TestDeploymentBasicGenerate(t *testing.T) {
{Name: "image2", Image: "registry/nn/image2"}, {Name: "image2", Image: "registry/nn/image2"},
{Name: "image3", Image: "nn/image3:tag"}, {Name: "image3", Image: "nn/image3:tag"},
{Name: "image4", Image: "nn/image4@digest"}, {Name: "image4", Image: "nn/image4@digest"},
{Name: "image5", Image: "nn/image5@sha256:digest"},
}, },
}, },
}, },