diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-25 13:43:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 13:43:57 -0400 |
| commit | 09ef4f2e226c0bd769c93817fa5a4df1a9bb9f8b (patch) | |
| tree | 1d8b6afb20e8b48f9193d4897162c3a1d24dbd4a /pkg/specgen/generate/pod_create.go | |
| parent | 23d2bf518884df59f7177099d07b11b1ca344a2f (diff) | |
| parent | c7b16645aff27fff0b87bb2a98298693bbf20894 (diff) | |
| download | podman-09ef4f2e226c0bd769c93817fa5a4df1a9bb9f8b.tar.gz podman-09ef4f2e226c0bd769c93817fa5a4df1a9bb9f8b.tar.bz2 podman-09ef4f2e226c0bd769c93817fa5a4df1a9bb9f8b.zip | |
Merge pull request #13978 from Luap99/unparam
enable unparam linter
Diffstat (limited to 'pkg/specgen/generate/pod_create.go')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index ba823f3a8..a3408b402 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -119,7 +119,7 @@ func MakePod(p *entities.PodSpec, rt *libpod.Runtime) (*libpod.Pod, error) { } } - options, err := createPodOptions(&p.PodSpecGen, rt, p.PodSpecGen.InfraContainerSpec) + options, err := createPodOptions(&p.PodSpecGen) if err != nil { return nil, err } @@ -161,11 +161,11 @@ func MakePod(p *entities.PodSpec, rt *libpod.Runtime) (*libpod.Pod, error) { return pod, nil } -func createPodOptions(p *specgen.PodSpecGenerator, rt *libpod.Runtime, infraSpec *specgen.SpecGenerator) ([]libpod.PodCreateOption, error) { +func createPodOptions(p *specgen.PodSpecGenerator) ([]libpod.PodCreateOption, error) { var ( options []libpod.PodCreateOption ) - if !p.NoInfra { //&& infraSpec != nil { + if !p.NoInfra { options = append(options, libpod.WithInfraContainer()) if p.ShareParent == nil || (p.ShareParent != nil && *p.ShareParent) { options = append(options, libpod.WithPodParent()) |