Modify the pod name suffix '_pod' to '-pod'

Signed-off-by: aonoa <1991849113@qq.com>
containers · Apr 25, 2022 · 94d043b · 94d043b
1 parent ba63562
commit 94d043b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libpod/kube.go b/libpod/kube.go
@@ -525,9 +525,9 @@ func simplePodWithV1Containers(ctx context.Context, ctrs []*Container) (*v1.Pod,
 	}
 	podName := strings.ReplaceAll(ctrs[0].Name(), "_", "")
 	// Check if the pod name and container name will end up conflicting
-	// Append _pod if so
+	// Append -pod if so
 	if util.StringInSlice(podName, ctrNames) {
-		podName = podName + "_pod"
+		podName = podName + "-pod"
 	}
 
 	return newPodObject(

diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
@@ -71,7 +71,7 @@ var _ = Describe("Podman generate kube", func() {
 		Expect(pod.Spec.DNSConfig).To(BeNil())
 		Expect(pod.Spec.Containers[0].WorkingDir).To(Equal(""))
 		Expect(pod.Spec.Containers[0].Env).To(BeNil())
-		Expect(pod.Name).To(Equal("top_pod"))
+		Expect(pod.Name).To(Equal("top-pod"))
 
 		numContainers := 0
 		for range pod.Spec.Containers {