diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-03 19:20:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-03 19:20:45 +0100 |
| commit | a93fa5e0c95deb9c7ea8a1df3fa2e5b89efb89df (patch) | |
| tree | ec2962093c30236467477075683ae41289892b46 | |
| parent | a50502dd3d8ef5c80d686824ba2023927825fd2c (diff) | |
| parent | 4e63f9192dcdd4ee77732c320b237e9421072a73 (diff) | |
| download | podman-a93fa5e0c95deb9c7ea8a1df3fa2e5b89efb89df.tar.gz podman-a93fa5e0c95deb9c7ea8a1df3fa2e5b89efb89df.tar.bz2 podman-a93fa5e0c95deb9c7ea8a1df3fa2e5b89efb89df.zip | |
Merge pull request #12466 from dispensable/respect_pod_yaml_spec_hostname_when_play
Hostname in `spec.hostname` should be passed to infra ctr init opt
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 1 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index ab52fad64..4c024a3d8 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -316,6 +316,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY if podOpt.Infra { infraImage := util.DefaultContainerConfig().Engine.InfraImage infraOptions := entities.NewInfraContainerCreateOptions() + infraOptions.Hostname = podSpec.PodSpecGen.PodBasicConfig.Hostname podSpec.PodSpecGen.InfraImage = infraImage podSpec.PodSpecGen.NoInfra = false podSpec.PodSpecGen.InfraContainerSpec = specgen.NewSpecGenerator(infraImage, false) diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 96ad2954c..36010704f 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1795,6 +1795,11 @@ var _ = Describe("Podman play kube", func() { inspect.WaitWithDefaultTimeout() Expect(inspect).Should(Exit(0)) Expect(inspect.OutputToString()).To(Equal(hostname)) + + hostnameInCtr := podmanTest.Podman([]string{"exec", getCtrNameInPod(pod), "hostname"}) + hostnameInCtr.WaitWithDefaultTimeout() + Expect(hostnameInCtr).Should(Exit(0)) + Expect(hostnameInCtr.OutputToString()).To(Equal(hostname)) }) It("podman play kube test HostAliases", func() { |