-
Notifications
You must be signed in to change notification settings - Fork 611
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create support for managed instances in netlib
- Loading branch information
Showing
6 changed files
with
179 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
package platform | ||
|
||
import ( | ||
"context" | ||
goErr "errors" | ||
"fmt" | ||
|
||
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/ec2" | ||
netlibdata "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/data" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/appmesh" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/networkinterface" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/serviceconnect" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/status" | ||
"github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/tasknetworkconfig" | ||
|
||
"github.com/aws/aws-sdk-go/aws" | ||
"github.com/pkg/errors" | ||
) | ||
|
||
const ( | ||
MacResource = "mac" | ||
SubNetCidrBlock = "network/interfaces/macs/%s/subnet-ipv4-cidr-block" | ||
PrivateIPv4Resource = "local-ipv4" | ||
InstanceIDResource = "instance-id" | ||
) | ||
|
||
type managedLinux struct { | ||
common | ||
client ec2.HttpClient | ||
} | ||
|
||
// BuildTaskNetworkConfiguration translates network data in task payload sent by ACS | ||
// into the task network configuration data structure internal to the agent. | ||
func (m *managedLinux) BuildTaskNetworkConfiguration( | ||
taskID string, | ||
taskPayload *ecsacs.Task, | ||
) (*tasknetworkconfig.TaskNetworkConfig, error) { | ||
mode := aws.StringValue(taskPayload.NetworkMode) | ||
var netNSs []*tasknetworkconfig.NetworkNamespace | ||
var err error | ||
switch mode { | ||
case ecs.NetworkModeAwsvpc: | ||
netNSs, err = m.common.buildAWSVPCNetworkNamespaces(taskID, taskPayload, false, nil) | ||
if err != nil { | ||
return nil, errors.Wrap(err, "failed to translate network configuration") | ||
} | ||
case ecs.NetworkModeHost: | ||
netNSs, err = m.buildDefaultNetworkNamespace(taskID) | ||
if err != nil { | ||
return nil, errors.Wrap(err, "failed to create network namespace with host eni") | ||
} | ||
default: | ||
return nil, errors.New("invalid network mode: " + mode) | ||
} | ||
return &tasknetworkconfig.TaskNetworkConfig{ | ||
NetworkNamespaces: netNSs, | ||
NetworkMode: mode, | ||
}, nil | ||
} | ||
|
||
func (m *managedLinux) CreateDNSConfig(taskID string, | ||
netNS *tasknetworkconfig.NetworkNamespace) error { | ||
return m.common.createDNSConfig(taskID, false, netNS) | ||
} | ||
|
||
func (m *managedLinux) ConfigureInterface( | ||
ctx context.Context, | ||
netNSPath string, | ||
iface *networkinterface.NetworkInterface, | ||
netDAO netlibdata.NetworkDataClient, | ||
) error { | ||
return m.common.configureInterface(ctx, netNSPath, iface, netDAO) | ||
} | ||
|
||
func (m *managedLinux) ConfigureAppMesh(ctx context.Context, | ||
netNSPath string, | ||
cfg *appmesh.AppMesh) error { | ||
return m.common.configureAppMesh(ctx, netNSPath, cfg) | ||
} | ||
|
||
func (m *managedLinux) ConfigureServiceConnect( | ||
ctx context.Context, | ||
netNSPath string, | ||
primaryIf *networkinterface.NetworkInterface, | ||
scConfig *serviceconnect.ServiceConnectConfig, | ||
) error { | ||
return m.common.configureServiceConnect(ctx, netNSPath, primaryIf, scConfig) | ||
} | ||
|
||
// buildDefaultNetworkNamespace generate a default network namespace for host mode where we do not need to create new namespaces | ||
func (m *managedLinux) buildDefaultNetworkNamespace(taskID string) ([]*tasknetworkconfig.NetworkNamespace, error) { | ||
privateIpv4, err1 := m.client.GetMetadata(PrivateIPv4Resource) | ||
macAddress, err2 := m.client.GetMetadata(MacResource) | ||
ec2ID, err3 := m.client.GetMetadata(InstanceIDResource) | ||
subNet, err4 := m.client.GetMetadata(fmt.Sprintf(SubNetCidrBlock, macAddress)) | ||
macToNames, err5 := m.common.interfacesMACToName() | ||
if err := goErr.Join(err1, err2, err3, err4, err5); err != nil { | ||
return nil, err | ||
} | ||
|
||
hostENI := &ecsacs.ElasticNetworkInterface{ | ||
AttachmentArn: aws.String("arn"), | ||
Ec2Id: aws.String(ec2ID), | ||
Ipv4Addresses: []*ecsacs.IPv4AddressAssignment{ | ||
{ | ||
Primary: aws.Bool(true), | ||
PrivateAddress: aws.String(privateIpv4), | ||
}, | ||
}, | ||
SubnetGatewayIpv4Address: aws.String(subNet), | ||
MacAddress: aws.String(macAddress), | ||
DomainNameServers: []*string{}, | ||
DomainName: []*string{}, | ||
PrivateDnsName: aws.String("default"), | ||
InterfaceAssociationProtocol: aws.String("default"), | ||
Index: aws.Int64(64), | ||
} | ||
|
||
netNSName := networkinterface.NetNSName(taskID, "default") | ||
netInt, _ := networkinterface.New(hostENI, "default", nil, macToNames) | ||
netInt.Default = true | ||
netInt.DesiredStatus = status.NetworkReady | ||
netInt.KnownStatus = status.NetworkReady | ||
defaultNameSpace, err := tasknetworkconfig.NewNetworkNamespace(netNSName, "", 0, nil, netInt) | ||
if err != nil { | ||
return nil, err | ||
} | ||
defaultNameSpace.KnownState = status.NetworkReady | ||
defaultNameSpace.DesiredState = status.NetworkReady | ||
return []*tasknetworkconfig.NetworkNamespace{defaultNameSpace}, nil | ||
} | ||
|
||
// HandleHostMode is a no op since we are allowing Host Mode for managed instances | ||
func (m *managedLinux) HandleHostMode() error { | ||
return nil | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.