diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-18 12:19:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 12:19:57 +0100 |
| commit | e4e92d6104cc5d60b2e771d2d8fbab61e96748a9 (patch) | |
| tree | c5227aac15526a287ea5de2f30b0550ad60da3b2 /libpod | |
| parent | a6f7afd41729edbe0d8cbf21bab5b475c6a13f9e (diff) | |
| parent | 76a38fc3f236f9197ab0761d5cc11cb37cee5e41 (diff) | |
| download | podman-e4e92d6104cc5d60b2e771d2d8fbab61e96748a9.tar.gz podman-e4e92d6104cc5d60b2e771d2d8fbab61e96748a9.tar.bz2 podman-e4e92d6104cc5d60b2e771d2d8fbab61e96748a9.zip | |
Merge pull request #8386 from zhangguanzhang/pod-inspect-mac
Fix podman pod inspect show wrong StaticMAC
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/define/pod_inspect.go | 2 | ||||
| -rw-r--r-- | libpod/pod_api.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go index a4115eb92..2fa91166f 100644 --- a/libpod/define/pod_inspect.go +++ b/libpod/define/pod_inspect.go @@ -67,7 +67,7 @@ type InspectPodInfraConfig struct { StaticIP net.IP // StaticMAC is a static MAC address that will be assigned to the infra // container and then used by the pod. - StaticMAC net.HardwareAddr + StaticMAC string // NoManageResolvConf indicates that the pod will not manage resolv.conf // and instead each container will handle their own. NoManageResolvConf bool diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 87ac5c07a..845948dd3 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -535,7 +535,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { infraConfig = new(define.InspectPodInfraConfig) infraConfig.HostNetwork = p.config.InfraContainer.HostNetwork infraConfig.StaticIP = p.config.InfraContainer.StaticIP - infraConfig.StaticMAC = p.config.InfraContainer.StaticMAC + infraConfig.StaticMAC = p.config.InfraContainer.StaticMAC.String() infraConfig.NoManageResolvConf = p.config.InfraContainer.UseImageResolvConf infraConfig.NoManageHosts = p.config.InfraContainer.UseImageHosts |