diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-05 09:20:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 09:20:16 -0400 |
| commit | a278195af3423f882c1f5bb218792f7c2ce10a3c (patch) | |
| tree | 192e52054de2abf0c92d83ecdbc71d498c2ec947 /pkg/specgen/generate/kube | |
| parent | 8eefca5a257121b177562742c972e39e1686140d (diff) | |
| parent | 0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21 (diff) | |
| download | podman-a278195af3423f882c1f5bb218792f7c2ce10a3c.tar.gz podman-a278195af3423f882c1f5bb218792f7c2ce10a3c.tar.bz2 podman-a278195af3423f882c1f5bb218792f7c2ce10a3c.zip | |
Merge pull request #10147 from vrothberg/new-image-package
migrate Podman to containers/common/libimage
Diffstat (limited to 'pkg/specgen/generate/kube')
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 1347ed1e0..73c1c31ba 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -7,9 +7,9 @@ import ( "net" "strings" + "github.com/containers/common/libimage" "github.com/containers/common/pkg/parse" "github.com/containers/common/pkg/secrets" - "github.com/containers/podman/v3/libpod/image" ann "github.com/containers/podman/v3/pkg/annotations" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/util" @@ -79,7 +79,7 @@ type CtrSpecGenOptions struct { // Container as read from the pod yaml Container v1.Container // Image available to use (pulled or found local) - Image *image.Image + Image *libimage.Image // Volumes for all containers Volumes map[string]*KubeVolume // PodID of the parent pod @@ -165,7 +165,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener // TODO: We don't understand why specgen does not take of this, but // integration tests clearly pointed out that it was required. - imageData, err := opts.Image.Inspect(ctx) + imageData, err := opts.Image.Inspect(ctx, false) if err != nil { return nil, err } |