diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-13 19:42:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 19:42:14 +0200 |
| commit | 9f1452cbb51bbca221c307e6da60af51a65489cd (patch) | |
| tree | 60fa64cb7f168d3ba4badcdf1b9c3b3c2d4229cb | |
| parent | a235f43ac05ad30aeb6f85ba79755d5529d49e1b (diff) | |
| parent | 4631f5b283b95abb30b91a858517609d3fb2022c (diff) | |
| download | podman-9f1452cbb51bbca221c307e6da60af51a65489cd.tar.gz podman-9f1452cbb51bbca221c307e6da60af51a65489cd.tar.bz2 podman-9f1452cbb51bbca221c307e6da60af51a65489cd.zip | |
Merge pull request #11944 from cdoern/kubeEmit
Kube Gen run as user/group issues
| -rw-r--r-- | libpod/kube.go | 4 | ||||
| -rw-r--r-- | test/e2e/generate_kube_test.go | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libpod/kube.go b/libpod/kube.go index eb7743886..43acd856d 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -485,6 +485,10 @@ func containerToV1Container(ctx context.Context, c *Container) (v1.Container, [] kubeContainer.Command = nil } + if imgData.User == c.User() { + kubeSec.RunAsGroup, kubeSec.RunAsUser = nil, nil + } + kubeContainer.WorkingDir = c.WorkingDir() kubeContainer.Ports = ports // This should not be applicable diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 3e6f1e8c4..e51805c83 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -942,7 +942,7 @@ USER test1` pod := new(v1.Pod) err = yaml.Unmarshal(kube.Out.Contents(), pod) Expect(err).To(BeNil()) - Expect(*pod.Spec.Containers[0].SecurityContext.RunAsUser).To(Equal(int64(10001))) + Expect(pod.Spec.Containers[0].SecurityContext.RunAsUser).To(BeNil()) }) It("podman generate kube on named volume", func() { |