Merge pull request #61 from NocDerEchte/pve-vm-tags

Add support for additional VM tags

Author: keyaray

README.md

@@ -109,6 +109,7 @@ You can use [sample Ubuntu Server template](deploy/templates/ubuntu-server) for
 | `--pve-processor-cores`   | `PVE_PROCESSOR_CORES`   | *unset*                            | If set, number of processor cores to configure for the machine.                                                      |
 | `--pve-memory`            | `PVE_MEMORY`            | *unset* <sup>1</sup>               | If set, amount of memory in MiB to configure for the machine.                                                        |
 | `--pve-memory-balloon`    | `PVE_MEMORY_BALLOON`    | *unset* <sup>1</sup>               | If set, minimum amount of memory in MiB to configure for the machine.<br> If set to `0`, disables memory ballooning. |
+| `--pve-tags`              | `PVE_TAGS`              | *unset*                            | If set, Comma-separated list of tags to assign to the VM (eg. `foo,bar,foobar`).                                     |
 
 <sup>1</sup> - If only one of `--pve-memory` or `--pve-memory-balloon` is specified, the other one will automatically be defaulted to the same value except if `--pve-memory-balloon` is set to `0`.
 

cmd/docker-machine-driver-pve/driver/config.go

@@ -27,6 +27,7 @@ const (
 	flagMemory           = "pve-memory"
 	flagMemoryBalloon    = "pve-memory-balloon"
 	flagFullClone        = "pve-full-clone"
+	flagTags             = "pve-tags"
 )
 
 // Default values for flags.
@@ -76,6 +77,9 @@ type config struct {
 
 	// Forces full copy of all disks, even if underlying storage supports linked clones.
 	FullClone bool
+
+	// Tags to apply to the machine.
+	Tags []string
 }
 
 // GetCreateFlags implements drivers.Driver.
@@ -156,6 +160,11 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			EnvVar: flagEnvVarFromFlagName(flagFullClone),
 			Usage:  "Forces full copy of all disks, even if underlying storage supports linked clones.",
 		},
+		mcnflag.StringFlag{
+			Name:   flagTags,
+			EnvVar: flagEnvVarFromFlagName(flagTags),
+			Usage:  "Comma-separated list of tags to assign to the VM",
+		},
 	}
 }
 
@@ -258,6 +267,8 @@ func (d *Driver) SetConfigFromFlags(opts drivers.DriverOptions) error {
 
 	d.FullClone = opts.Bool(flagFullClone)
 
+	d.Tags = strings.Split(opts.String(flagTags), ",")
+
 	return nil
 }
 

cmd/docker-machine-driver-pve/driver/driver.go

@@ -154,14 +154,19 @@ func (d *Driver) initialize() error {
 		return fmt.Errorf("failed to retrieve newly created Proxmox VE virtual machine ID='%d': %w", *d.PVEMachineID, err)
 	}
 
-	tagTask, err := machine.AddTag(context.TODO(), pveMachineTag)
+	d.Tags = append(d.Tags, pveMachineTag)
+
+	tagTask, err := machine.Config(context.TODO(), proxmox.VirtualMachineOption{
+		Name:  "tags",
+		Value: d.Tags,
+	})
 
 	if err == nil {
 		err = d.waitForPVETaskToSucceed(context.TODO(), tagTask)
 	}
 
 	if err != nil {
-		return fmt.Errorf("failed to add tag '%s' to Proxmox VE virtual machine ID='%d': %w", pveMachineTag, *d.PVEMachineID, err)
+		return fmt.Errorf("failed to add tags '%s' to Proxmox VE virtual machine ID='%d': %w", d.Tags, *d.PVEMachineID, err)
 	}
 
 	log.Info("Configuring machine hardware...")

pkg/pve-node-driver/l10n/en-us.yaml

@@ -58,6 +58,10 @@ cluster:
         minimumMemory:
           label: Minimum memory (balloon target)
           tooltip: When set to 0, disables ballooning. When left empty, value from "Memory" is assigned as ballooning target.
+      vmTags:
+        header: VM Tags
+        label: Tags
+        tooltip: Comma-separated list of tags to assign to the VM
       ssh:
         header: SSH Connection
         username:

pkg/pve-node-driver/machine-config/pve.vue

@@ -60,6 +60,7 @@ export default {
         memory: this.value.memory ? parseInt(this.value.memory) : "",
         memoryBalloon: this.value.memoryBalloon ? parseInt(this.value.memoryBalloon) : "",
         fullClone: this.value.fullClone ?? false,
+        tags: this.value.tags ?? '',
       },
     }
   },
@@ -616,6 +617,23 @@ export default {
     </div>
 
     <portal :to="`advanced-${uuid}`">
+      <h3>
+        <t k="cluster.machineConfig.pve.vmTags.header" />
+      </h3>
+      <div class="row mb-20">
+        <div class="col span-12">
+          <!-- VM Tags -->
+          <LabeledInput
+            type="text"
+            :mode="mode"
+            v-model:value="currentValue.tags"
+            label-key="cluster.machineConfig.pve.vmTags.label"
+            tooltip-key="cluster.machineConfig.pve.vmTags.tooltip"
+            placeholder="tag1,tag2"
+          />
+        </div>
+      </div>
+
       <h3>
         <t k="cluster.machineConfig.pve.memoryBalloon.header" />
       </h3>