diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-10 14:36:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 14:36:53 -0500 |
| commit | 7ba81ead38d0c4fb2e583224257a0497789552fc (patch) | |
| tree | f7e546f59992980f64b75857a2e5aa0b4751a62b /pkg/specgen | |
| parent | a5e327941423983529b771a03691dc2fe2390e0f (diff) | |
| parent | feaa1a134a4fd0a7d25bab485708a201321bfb56 (diff) | |
| download | podman-7ba81ead38d0c4fb2e583224257a0497789552fc.tar.gz podman-7ba81ead38d0c4fb2e583224257a0497789552fc.tar.bz2 podman-7ba81ead38d0c4fb2e583224257a0497789552fc.zip | |
Merge pull request #13445 from rhatdan/annotation
Add podman play kube --annotation
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 5e6671231..e0331b0a6 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -277,7 +277,13 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener } annotations := make(map[string]string) + if opts.Annotations != nil { + annotations = opts.Annotations + } if opts.PodInfraID != "" { + if annotations == nil { + + } annotations[ann.SandboxID] = opts.PodInfraID annotations[ann.ContainerType] = ann.ContainerTypeContainer } |