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/oci.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/oci.go')
-rw-r--r-- | pkg/specgen/generate/oci.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 961cea933..95bcea8f0 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -32,7 +32,7 @@ func setProcOpts(s *specgen.SpecGenerator, g *generate.Generator) { } } -func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error { +func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) { var ( isRootless = rootless.IsRootless() nofileSet = false @@ -41,7 +41,7 @@ func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error { if s.Rlimits == nil { g.Config.Process.Rlimits = nil - return nil + return } for _, u := range s.Rlimits { @@ -91,12 +91,10 @@ func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error { } g.AddProcessRlimits("RLIMIT_NPROC", max, current) } - - return nil } // Produce the final command for the container. -func makeCommand(ctx context.Context, s *specgen.SpecGenerator, imageData *libimage.ImageData, rtc *config.Config) ([]string, error) { +func makeCommand(s *specgen.SpecGenerator, imageData *libimage.ImageData, rtc *config.Config) ([]string, error) { finalCommand := []string{} entrypoint := s.Entrypoint @@ -388,9 +386,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt g.AddProcessEnv(name, val) } - if err := addRlimits(s, &g); err != nil { - return nil, err - } + addRlimits(s, &g) // NAMESPACES if err := specConfigureNamespaces(s, &g, rt, pod); err != nil { |