summaryrefslogtreecommitdiff
path: root/pkg/specgen/podspecgen.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-05 15:21:37 +0200
committerGitHub <noreply@github.com>2020-05-05 15:21:37 +0200
commitc313eec620becf710af925c02b7e5dfd80bd9ba6 (patch)
tree7ebf9d1878abb16ba3ce25f927abc82df4804d8b /pkg/specgen/podspecgen.go
parente1be837a4ff149e00ff6af9e71cf9ea625e33e6f (diff)
parent7ac3d906b5c080803f7898d3307af87bb57ad436 (diff)
downloadpodman-c313eec620becf710af925c02b7e5dfd80bd9ba6.tar.gz
podman-c313eec620becf710af925c02b7e5dfd80bd9ba6.tar.bz2
podman-c313eec620becf710af925c02b7e5dfd80bd9ba6.zip
Merge pull request #6079 from mheon/add_expose
Rework port parsing to support --expose and -P
Diffstat (limited to 'pkg/specgen/podspecgen.go')
-rw-r--r--pkg/specgen/podspecgen.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go
index 3f830014d..682f3f215 100644
--- a/pkg/specgen/podspecgen.go
+++ b/pkg/specgen/podspecgen.go
@@ -2,8 +2,6 @@ package specgen
import (
"net"
-
- "github.com/cri-o/ocicni/pkg/ocicni"
)
// PodBasicConfig contains basic configuration options for pods.
@@ -79,7 +77,7 @@ type PodNetworkConfig struct {
// container, this will forward the ports to the entire pod.
// Only available if NetNS is set to Bridge or Slirp.
// Optional.
- PortMappings []ocicni.PortMapping `json:"portmappings,omitempty"`
+ PortMappings []PortMapping `json:"portmappings,omitempty"`
// CNINetworks is a list of CNI networks that the infra container will
// join. As, by default, containers share their network with the infra
// container, these networks will effectively be joined by the