summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-10 19:10:59 +0100
committerGitHub <noreply@github.com>2020-11-10 19:10:59 +0100
commitce2ac7d2d2413074f9855acbaa7be0b4d5d726e4 (patch)
tree687c943d5ed8e7548f6c7f3888b701f99a33cde1 /pkg
parentda01191aa3526e3a77d9a055e23c318c26720785 (diff)
parentb7b5b6f8e3072530f4c3fc07e5960e54c90729b5 (diff)
downloadpodman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.tar.gz
podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.tar.bz2
podman-ce2ac7d2d2413074f9855acbaa7be0b4d5d726e4.zip
Merge pull request #8251 from baude/networkaliases
network aliases for container creation
Diffstat (limited to 'pkg')
-rw-r--r--pkg/domain/entities/types.go1
-rw-r--r--pkg/specgen/generate/container_create.go4
-rw-r--r--pkg/specgen/specgen.go3
3 files changed, 8 insertions, 0 deletions
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go
index d8ad2d891..12135c2b1 100644
--- a/pkg/domain/entities/types.go
+++ b/pkg/domain/entities/types.go
@@ -32,6 +32,7 @@ type VolumeDeleteReport struct{ Report }
// pods and containers
type NetOptions struct {
AddHosts []string
+ Aliases []string
CNINetworks []string
UseImageResolvConf bool
DNSOptions []string
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 53dc35df1..c049e64cf 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -133,6 +133,10 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
}
options = append(options, libpod.WithExitCommand(exitCommandArgs))
+ if len(s.Aliases) > 0 {
+ options = append(options, libpod.WithNetworkAliases(s.Aliases))
+ }
+
runtimeSpec, err := SpecGenToOCI(ctx, s, rt, rtc, newImage, finalMounts, pod, command)
if err != nil {
return nil, err
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index d68f55402..0a9a16ea7 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -328,6 +328,9 @@ type ContainerCgroupConfig struct {
// ContainerNetworkConfig contains information on a container's network
// configuration.
type ContainerNetworkConfig struct {
+ // Aliases are a list of network-scoped aliases for container
+ // Optional
+ Aliases map[string][]string `json:"aliases"`
// NetNS is the configuration to use for the container's network
// namespace.
// Mandatory.