Add vpcId and subnetId params for EC2 provider. Resolves #91

Signed-off-by: Shane Witbeck <shane@digitalsanctum.com>

Author: thesurlydev

chart/inlets-operator/README.md

@@ -135,6 +135,8 @@ Parameter | Description | Default
 `provider`              | Your infrastructure provider - 'digitalocean', 'ec2', 'scaleway', 'packet', or 'gce'                       | `""`
 `region`                | The region to provision hosts into                                              | `""`
 `zone`                  | The zone where the exit node is to be provisioned (Used when Google Compute Engine is used as provider) | `us-central1-a`
+`vpcId`                 | The VPC ID to create the exit-server in (EC2) | `""`
+`subnetId`              | The Subnet ID where the exit-server should be placed (EC2) | `""`
 `accessKeyFile`         | Read the access key for your infrastructure provider from a file (recommended)  | `/var/secrets/inlets/inlets-access-key`
 `projectId`             | The project ID if using Google Compute Engine or Packet.com  as the provider    | `""`
 `annotatedOnly`         | Only create a tunnel for annotated services.                                    | `false`

chart/inlets-operator/templates/deployment.yaml

@@ -35,6 +35,12 @@ spec:
         - "-access-key-file={{.Values.accessKeyFile}}"
         - "-license={{.Values.inletsProLicense}}"
         - "-project-id={{.Values.projectID}}"
+        {{- if .Values.vpcId }}
+        - "-vpc-id={{.Values.vpcId}}"
+        {{- end }}
+        {{- if .Values.subnetId }}
+        - "-subnet-id={{.Values.subnetId}}"
+        {{- end }}
         {{- if .Values.organizationID }}
         - "-organization-id={{.Values.organizationID}}"
         {{- end }}

chart/inlets-operator/values.yaml

@@ -26,6 +26,12 @@ accessKeyFile: "/var/secrets/inlets/inlets-access-key"
 # that requires an access key and secret key, such as EC2.
 secretKeyFile: ""
 
+# The VPC ID to create the exit-server in (EC2)
+vpcId: ""
+
+# The Subnet ID where the exit-server should be placed (EC2)
+subnetId: ""
+
 annotatedOnly: false
 
 image: "inlets/inlets-operator:0.9.0"

controller.go

@@ -580,14 +580,24 @@ func getHostConfig(c *Controller, tunnel *inletsv1alpha1.Tunnel) provision.Basic
 			inletsPort = inletsPROControlPort
 		}
 
+		var additional = map[string]string{
+			"inlets-port": strconv.Itoa(inletsPort),
+		}
+
+		if len(c.infraConfig.VpcID) > 0 {
+			additional["vpc-id"] = c.infraConfig.VpcID
+		}
+
+		if len(c.infraConfig.SubnetID) > 0 {
+			additional["subnet-id"] = c.infraConfig.SubnetID
+		}
+
 		host = provision.BasicHost{
-			Name:     tunnel.Name,
-			OS:       "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20191114",
-			Plan:     "t3.micro",
-			UserData: base64.StdEncoding.EncodeToString([]byte(userData)),
-			Additional: map[string]string{
-				"inlets-port": strconv.Itoa(inletsPort),
-			},
+			Name:       tunnel.Name,
+			OS:         "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20191114",
+			Plan:       "t3.micro",
+			UserData:   base64.StdEncoding.EncodeToString([]byte(userData)),
+			Additional: additional,
 		}
 	case "civo":
 		host = provision.BasicHost{

docs/inlets-operator-0.8.8.tgz

@@ -39,6 +39,8 @@ type InfraConfig struct {
 	AccessKey         string
 	SecretKey         string
 	OrganizationID    string
+	VpcID             string
+	SubnetID          string
 	AccessKeyFile     string
 	SecretKeyFile     string
 	ProjectID         string
@@ -89,6 +91,8 @@ func main() {
 	flag.StringVar(&infra.SecretKey, "secret-key", "", "The secret key if using Scaleway or EC2 as the provider")
 	flag.StringVar(&infra.SecretKeyFile, "secret-key-file", "", "Read the access key for your infrastructure provider from a file (recommended)")
 	flag.StringVar(&infra.OrganizationID, "organization-id", "", "The organization id if using Scaleway as the provider")
+	flag.StringVar(&infra.VpcID, "vpc-id", "", "The VPC ID to create the exit-server in (EC2)")
+	flag.StringVar(&infra.SubnetID, "subnet-id", "", "The Subnet ID where the exit-server should be placed (EC2)")
 	flag.StringVar(&infra.ProjectID, "project-id", "", "The project ID if using Packet.com, or Google Compute Engine as the provider")
 	flag.StringVar(&infra.ProConfig.License, "license", "", "Supply a license for use with inlets-pro")
 	flag.StringVar(&infra.ProConfig.LicenseFile, "license-file", "", "Supply a file to read for the inlets-pro license")