Add custom tags to machines #158
Conversation
|
internal/service/vmservice/vm.go
Outdated
| tags = append(tags, tag) | ||
| } | ||
| } | ||
| if len(tags) > length { |
There was a problem hiding this comment.
this check does not account for removal of tags. is this intended?
There was a problem hiding this comment.
Yes, so we don't delete existing tags.
The IP tag i mean.
Which means tags are also immutable as per the machine.
There was a problem hiding this comment.
then you need to add this to the webhook or a CRD kubebuilder annotation
| @@ -131,3 +144,14 @@ func validateNetworkDeviceMTU(device *infrav1.NetworkDevice) error { | |||
|
|
|||
| return nil | |||
| } | |||
|
|
|||
| func validateTags(tags []string) error { | |||
| re := regexp.MustCompile(`^[a-zA-Z0-9-_]*$`) | |||
There was a problem hiding this comment.
Should be + not * to prevent empty string. Also, have you tried +kubebuilder:validation:Pattern?
External PRTest runs on external PRs require manual approval. Note: This PR changes the following non-go, non-docs files: |
External PRTest runs on external PRs require manual approval. Note: This PR changes the following non-go, non-docs files: |
| @@ -427,6 +430,27 @@ func TestReconcileVirtualMachineConfig_ApplyConfig(t *testing.T) { | |||
| require.EqualValues(t, task.UPID, *machineScope.ProxmoxMachine.Status.TaskRef) | |||
| } | |||
|
|
|||
| func TestReconcileVirtualMachineConfigTags(t *testing.T) { | |||
There was a problem hiding this comment.
Can you add a test case for multiple tags and for zero/empty tags?
There was a problem hiding this comment.
all the cases are included,
There was a problem hiding this comment.
I have added an empty case in the function
api/v1alpha1/proxmoxmachine_types.go
Outdated
| // +immutable | ||
| // +listType=set | ||
| // +kubebuilder:validation:MinItems=1 | ||
| // +kubebuilder:validation:items:Pattern=`^[a-zA-Z0-9-_+]+$` |
There was a problem hiding this comment.
Might need some more refinement.
https://github.com/proxmox/pve-common/blob/master/src/PVE/JSONSchema.pm#L706
our $PVE_TAG_RE = qr/[a-z0-9_][a-z0-9_\-\+\.]*/i;
i.e.
// +kubebuilder:validation:items:Pattern=`^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$`
to be true to upstream :)
External PRTest runs on external PRs require manual approval. Note: This PR changes the following non-go, non-docs files: |
|
Ready |
|
External PRTest runs on external PRs require manual approval. |
External PRTest runs on external PRs require manual approval. |
This PR add Custom Tags to VM while preserving the current tags.