diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-27 04:50:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 04:50:01 -0400 |
| commit | 053b09660ffbe2df2104186c67e39be70764ff63 (patch) | |
| tree | b9d8d32e146eb1ca1a3385e61b24d276dabc1cf0 /pkg/specgen/generate/oci.go | |
| parent | 5ac00a7287e4a9e6292f4a6ca5dfa9a02e5ca907 (diff) | |
| parent | 4f8ece76fff31d31570af56e0ec4a4092e015b33 (diff) | |
| download | podman-053b09660ffbe2df2104186c67e39be70764ff63.tar.gz podman-053b09660ffbe2df2104186c67e39be70764ff63.tar.bz2 podman-053b09660ffbe2df2104186c67e39be70764ff63.zip | |
Merge pull request #13997 from Luap99/gocritic
enable gocritic linter
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 95bcea8f0..b77c00f50 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -298,7 +298,8 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt g.AddAnnotation(key, val) } - if compatibleOptions.InfraResources == nil && s.ResourceLimits != nil { + switch { + case compatibleOptions.InfraResources == nil && s.ResourceLimits != nil: out, err := json.Marshal(s.ResourceLimits) if err != nil { return nil, err @@ -307,7 +308,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt if err != nil { return nil, err } - } else if s.ResourceLimits != nil { // if we have predefined resource limits we need to make sure we keep the infra and container limits + case s.ResourceLimits != nil: // if we have predefined resource limits we need to make sure we keep the infra and container limits originalResources, err := json.Marshal(s.ResourceLimits) if err != nil { return nil, err @@ -325,7 +326,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt return nil, err } g.Config.Linux.Resources = s.ResourceLimits - } else { + default: g.Config.Linux.Resources = compatibleOptions.InfraResources } // Devices |