summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-11 05:36:49 -0400
committerGitHub <noreply@github.com>2020-09-11 05:36:49 -0400
commit2a637948e72faf714b6497bcd57ab0f58485b096 (patch)
tree0e2a0921466c3325a9aa63250ee2a1bc32cfc30c
parent26fb8d2cdea8b16e7163bfd0daa5843aad0fdc9d (diff)
parentaaf18e0cbe758d75fd5c9ddbcda6e34fc00d6304 (diff)
downloadpodman-2a637948e72faf714b6497bcd57ab0f58485b096.tar.gz
podman-2a637948e72faf714b6497bcd57ab0f58485b096.tar.bz2
podman-2a637948e72faf714b6497bcd57ab0f58485b096.zip
Merge pull request #7587 from ParkerVR/kube-underscores
Allowed underscores to remain in name for YAML (Kube generate)
-rw-r--r--libpod/kube.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/kube.go b/libpod/kube.go
index 5f2c9e0fd..864bc78c7 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -191,7 +191,7 @@ func addContainersAndVolumesToPodObject(containers []v1.Container, volumes []v1.
labels["app"] = removeUnderscores(podName)
om := v12.ObjectMeta{
// The name of the pod is container_name-libpod
- Name: removeUnderscores(podName),
+ Name: podName,
Labels: labels,
// CreationTimestamp seems to be required, so adding it; in doing so, the timestamp
// will reflect time this is run (not container create time) because the conversion