diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-06 20:34:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 20:34:13 +0200 |
| commit | 8b5df5b5d97facad5bb84fe4597bf7f0059c09fa (patch) | |
| tree | 66296d6b47bc9627053bd0b3dadb07059cf711c6 /cmd/podman/common/specgen.go | |
| parent | 22bf906e8cc440cb3c33b9eed620ae91f447b269 (diff) | |
| parent | f269be3a314a0903bb74a20de0e93b4f274531e6 (diff) | |
| download | podman-8b5df5b5d97facad5bb84fe4597bf7f0059c09fa.tar.gz podman-8b5df5b5d97facad5bb84fe4597bf7f0059c09fa.tar.bz2 podman-8b5df5b5d97facad5bb84fe4597bf7f0059c09fa.zip | |
Merge pull request #6092 from vrothberg/v2-kube
add {generate,play} kube
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 3681804ea..3e9772576 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -534,10 +534,13 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string case "label": // TODO selinux opts and label opts are the same thing s.ContainerSecurityConfig.SelinuxOpts = append(s.ContainerSecurityConfig.SelinuxOpts, con[1]) + s.Annotations[define.InspectAnnotationLabel] = con[1] case "apparmor": s.ContainerSecurityConfig.ApparmorProfile = con[1] + s.Annotations[define.InspectAnnotationApparmor] = con[1] case "seccomp": s.SeccompProfilePath = con[1] + s.Annotations[define.InspectAnnotationSeccomp] = con[1] default: return fmt.Errorf("invalid --security-opt 2: %q", opt) } |