diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-01 15:31:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-01 15:31:37 -0500 |
commit | 71c3bdba0e3d0301047137da00fc3582deed2379 (patch) | |
tree | b775747b3bc0e757ccdbaa31642eb9aedf52b92d /pkg/domain/infra/abi | |
parent | ef9a734d6eded02051573fea34e110319b7b42e0 (diff) | |
parent | 2ceab119478502fd06703036bc79953ed6f37f74 (diff) | |
download | podman-71c3bdba0e3d0301047137da00fc3582deed2379.tar.gz podman-71c3bdba0e3d0301047137da00fc3582deed2379.tar.bz2 podman-71c3bdba0e3d0301047137da00fc3582deed2379.zip |
Merge pull request #13085 from ydayagi/main
play kube envVar.valueFrom.fieldRef
Diffstat (limited to 'pkg/domain/infra/abi')
-rw-r--r-- | pkg/domain/infra/abi/play.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 86a60e92d..cad8c4609 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -365,6 +365,11 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY if err != nil { return nil, err } + + for k, v := range podSpec.PodSpecGen.Labels { // add podYAML labels + labels[k] = v + } + specgenOpts := kube.CtrSpecGenOptions{ Annotations: annotations, Container: initCtr, @@ -405,7 +410,12 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY return nil, err } + for k, v := range podSpec.PodSpecGen.Labels { // add podYAML labels + labels[k] = v + } + specgenOpts := kube.CtrSpecGenOptions{ + Annotations: annotations, Container: container, Image: pulledImage, Volumes: volumes, |