Allow users to define vm naming logic #369
Conversation
erkanerol
force-pushed
the
vm-naming-with-template
branch
from
d4dfafe to
d70600d
Compare
|
@arunmk I added an immutability check to the webhook. This is ready for review. |
controllers/vcdmachine_controller.go
Outdated
| @@ -441,7 +449,10 @@ func (r *VCDMachineReconciler) reconcileNormal(ctx context.Context, cluster *clu | |||
| cloudInitInput.HTTPProxy = vcdCluster.Spec.ProxyConfigSpec.HTTPProxy | |||
| cloudInitInput.HTTPSProxy = vcdCluster.Spec.ProxyConfigSpec.HTTPSProxy | |||
| cloudInitInput.NoProxy = vcdCluster.Spec.ProxyConfigSpec.NoProxy | |||
| cloudInitInput.MachineName = machine.Name | |||
| cloudInitInput.MachineName = vmName | |||
| if err != nil { | |||
There was a problem hiding this comment.
It is not sure what error is being checked here. Can you please make sure this is not added by mistake?
There was a problem hiding this comment.
@erkanerol could you please handle this? we should be able to merge immediately after it
There was a problem hiding this comment.
It is leftover after a refactoring. Just deleted the check. Thanks for catching this.
erkanerol
force-pushed
the
vm-naming-with-template
branch
from
326e6ba to
20b05b8
Compare
Now, VMs are named as machine.Name. In some cases, we need to name VMs with a custom logic. This PR adds a new field into VCDMachine CR so that users can define templates to name VMs by using Go templates and Sprig functions. ".machine" and ".vcdMachine" will refer to Machine and VCDMachine CRs in the templates.
erkanerol
force-pushed
the
vm-naming-with-template
branch
from
34db163 to
7603f5a
Compare
|
@arunmk @Anirudh9794 I rebased the PR. FYI. |
|
|
||
| // VmNamingTemplate is go template to generate VM names based on Machine and VCDMachine CRs. | ||
| // Functions of Sprig library are supported. See https://github.com/Masterminds/sprig | ||
| // Immutable field. machine.Name is used as VM name when this field is empty. | ||
| // +optional | ||
| VmNamingTemplate string `json:"vmNamingTemplate"` | ||
| VmNamingTemplate string `json:"vmNamingTemplate,omitempty"` |
There was a problem hiding this comment.
Users should be able to create VCDMachine CRs without providing empty values for these fields. Missing omitempty tags lead to errors in CAPI controllers while creating VCDMachine by using VCDMachineTemplate.
|
I'll merge this since it has 2 approvals. |
Description
Now, VMs are named as
machine.Name. In some cases, we need to name VMs with a custom logic.This PR adds a new field into VCDMachine CR so that users can define templates to name VMs by using Go templates and Sprig functions.
.machineand.vcdMachinewill refer to Machine and VCDMachine CRs in the templates.Example
Important Points
This field must be immutable. Otherwise, users can change it and the controller will not be able to know existing VMs.
Immutability is enforced by the new validating webhook for VCDMachine.
Checklist
API Changes
Are there API changes?
If yes, please fill in the below
./examples/capi-quickstart.yaml?./infrastructure-vcd/v1.0.0/?This change is