diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 11:37:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 11:37:45 -0400 |
| commit | e92b3830339cc9c8240d4553ccd23b3ec5578e4b (patch) | |
| tree | eb32501e758aed50f09d7a5bd23bde99e555ce61 /libpod/container.go | |
| parent | d88ed478cb6e422ee21a7ab9c99ece2d45bdfcab (diff) | |
| parent | af49810a6e08ed084294ce03e1c8a5efb8d1a705 (diff) | |
| download | podman-e92b3830339cc9c8240d4553ccd23b3ec5578e4b.tar.gz podman-e92b3830339cc9c8240d4553ccd23b3ec5578e4b.tar.bz2 podman-e92b3830339cc9c8240d4553ccd23b3ec5578e4b.zip | |
Merge pull request #11629 from Luap99/CNI-1.0
Bump CNI to v1.0.1
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container.go b/libpod/container.go index 7d602326e..5c56ff036 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -8,7 +8,7 @@ import ( "os" "time" - cnitypes "github.com/containernetworking/cni/pkg/types/current" + types040 "github.com/containernetworking/cni/pkg/types/040" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" "github.com/containers/podman/v3/libpod/define" @@ -176,7 +176,7 @@ type ContainerState struct { // active. // These are DEPRECATED and will be removed in a future release. // This field is only used for backwarts compatibility. - NetworkStatusOld []*cnitypes.Result `json:"networkResults,omitempty"` + NetworkStatusOld []*types040.Result `json:"networkResults,omitempty"` // NetworkStatus contains the network Status for all networks // the container is attached to. Only populated if we created a network // namespace for the container, and the network namespace is currently |