aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-29 13:26:03 -0400
committerGitHub <noreply@github.com>2021-09-29 13:26:03 -0400
commit4b9cd9201b97c4ef4c6ef50d53f35757f1ddb187 (patch)
treec8e69e7090cb658564474fa295ea0c0a28d2521e /pkg
parenta22a9a5218774ba809a60a650f10ff300551faa5 (diff)
parentccff77025c4ef6907c91c42cf84e1c92b65716ba (diff)
downloadpodman-4b9cd9201b97c4ef4c6ef50d53f35757f1ddb187.tar.gz
podman-4b9cd9201b97c4ef4c6ef50d53f35757f1ddb187.tar.bz2
podman-4b9cd9201b97c4ef4c6ef50d53f35757f1ddb187.zip
Merge pull request #11781 from vrothberg/spec
podman run - avoid calls to JSONDeepCopy
Diffstat (limited to 'pkg')
-rw-r--r--pkg/domain/infra/abi/secrets.go2
-rw-r--r--pkg/specgen/generate/container.go2
-rw-r--r--pkg/specgen/generate/container_create.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go
index 2bf8eaae3..34c230e75 100644
--- a/pkg/domain/infra/abi/secrets.go
+++ b/pkg/domain/infra/abi/secrets.go
@@ -21,7 +21,7 @@ func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader
// set defaults from config for the case they are not set by an upper layer
// (-> i.e. tests that talk directly to the api)
- cfg, err := ic.Libpod.GetConfig()
+ cfg, err := ic.Libpod.GetConfigNoCopy()
if err != nil {
return nil, err
}
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index ae26807a9..71b882510 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -54,7 +54,7 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
}
}
- rtc, err := r.GetConfig()
+ rtc, err := r.GetConfigNoCopy()
if err != nil {
return nil, err
}
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index b6263332e..6100e7a5b 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -23,7 +23,7 @@ import (
// Returns the created, container and any warnings resulting from creating the
// container, or an error.
func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGenerator) (*spec.Spec, *specgen.SpecGenerator, []libpod.CtrCreateOption, error) {
- rtc, err := rt.GetConfig()
+ rtc, err := rt.GetConfigNoCopy()
if err != nil {
return nil, nil, nil, err
}