From ad700125f384d361990663f3b9682f90a03baba4 Mon Sep 17 00:00:00 2001 From: Gurjinder Singh Date: Fri, 5 Feb 2021 02:33:43 -0500 Subject: [PATCH] Adding Virtual Private Cloud (VPC) added (deprecated use vpc) in private networking Hello, This is my first professional go edit and submit, please test and approve. just added an extra string tag vpc. DigitalOcean Docs links https://www.digitalocean.com/docs/networking/vpc/ https://developers.digitalocean.com/documentation/v2/#droplets https://developers.digitalocean.com/documentation/v2/#vpcs Thank you --- drivers/digitalocean/digitalocean.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go index 8b8d89d2c2..d2f1ed0bcc 100644 --- a/drivers/digitalocean/digitalocean.go +++ b/drivers/digitalocean/digitalocean.go @@ -37,6 +37,7 @@ type Driver struct { UserDataFile string Monitoring bool Tags string + VPC string } const ( @@ -104,7 +105,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag { mcnflag.BoolFlag{ EnvVar: "DIGITALOCEAN_PRIVATE_NETWORKING", Name: "digitalocean-private-networking", - Usage: "enable private networking for droplet", + Usage: "enable private networking for droplet (deprecated use vpc)", }, mcnflag.BoolFlag{ EnvVar: "DIGITALOCEAN_BACKUPS", @@ -126,6 +127,11 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag { Name: "digitalocean-tags", Usage: "comma-separated list of tags to apply to the Droplet", }, + mcnflag.StringFlag{ + EnvVar: "DIGITALOCEAN_VPC", + Name: "digitalocean-vpc", + Usage: "virtual private cloud network", + }, } } @@ -165,6 +171,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { d.SSHKey = flags.String("digitalocean-ssh-key-path") d.Monitoring = flags.Bool("digitalocean-monitoring") d.Tags = flags.String("digitalocean-tags") + d.VPC = flags.String("digitalocean-vpc") d.SetSwarmConfigFromFlags(flags) @@ -241,6 +248,7 @@ func (d *Driver) Create() error { SSHKeys: []godo.DropletCreateSSHKey{{ID: d.SSHKeyID}}, Monitoring: d.Monitoring, Tags: d.getTags(), + VPC: d.vpc, } newDroplet, _, err := client.Droplets.Create(context.TODO(), createRequest)