github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3069 from justincormack/aws-meta

Browse Source 
Add support for aws metadata and security groups in linuxkit run
This commit is contained in:
Rolf Neugebauer 2018-06-14 08:17:11 +01:00 committed by GitHub
commit 3a3b487907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cmd/linuxkit/run_aws.go
View File

@ -4,6 +4,7 @@ import (
"encoding/base64" "encoding/base64"
"flag" "flag"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -40,6 +41,10 @@ func runAWS(args []string) {
diskSizeFlag := flags.Int("disk-size", 0, "Size of system disk in GB") diskSizeFlag := flags.Int("disk-size", 0, "Size of system disk in GB")
diskTypeFlag := flags.String("disk-type", defaultAWSDiskType, "AWS Disk Type") diskTypeFlag := flags.String("disk-type", defaultAWSDiskType, "AWS Disk Type")
zoneFlag := flags.String("zone", defaultAWSZone, "AWS Availability Zone") zoneFlag := flags.String("zone", defaultAWSZone, "AWS Availability Zone")
sgFlag := flags.String("security-group", "", "Security Group ID")
data := flags.String("data", "", "String of metadata to pass to VM; error to specify both -data and -data-file")
dataPath := flags.String("data-file", "", "Path to file containing metadata to pass to VM; error to specify both -data and -data-file")
if err := flags.Parse(args); err != nil { if err := flags.Parse(args); err != nil {
log.Fatal("Unable to parse args") log.Fatal("Unable to parse args")
@ -53,6 +58,20 @@ func runAWS(args []string) {
} }
name := remArgs[0] name := remArgs[0]
if *data != "" && *dataPath != "" {
log.Fatal("Cannot specify both -data and -data-file")
}
if *dataPath != "" {
dataB, err := ioutil.ReadFile(*dataPath)
if err != nil {
log.Fatalf("Unable to read metadata file: %v", err)
}
*data = string(dataB)
}
// data must be base64 encoded
*data = base64.StdEncoding.EncodeToString([]byte(*data))
machine := getStringValue(awsMachineVar, *machineFlag, defaultAWSMachine) machine := getStringValue(awsMachineVar, *machineFlag, defaultAWSMachine)
diskSize := getIntValue(awsDiskSizeVar, *diskSizeFlag, defaultAWSDiskSize) diskSize := getIntValue(awsDiskSizeVar, *diskSizeFlag, defaultAWSDiskSize)
diskType := getStringValue(awsDiskTypeVar, *diskTypeFlag, defaultAWSDiskType) diskType := getStringValue(awsDiskTypeVar, *diskTypeFlag, defaultAWSDiskType)
@ -91,6 +110,8 @@ func runAWS(args []string) {
Placement: &ec2.Placement{ Placement: &ec2.Placement{
AvailabilityZone: aws.String(zone), AvailabilityZone: aws.String(zone),
}, },
SecurityGroupIds: []*string{sgFlag},
UserData: data,
} }
runResult, err := compute.RunInstances(params) runResult, err := compute.RunInstances(params)
if err != nil { if err != nil {