✨ add VM naming strategy for VMs in govmomi mode #3286

viveksyngh · 2024-12-08T16:20:05Z

Add VM naming stragey for vsphere vms and VMs in govami mode

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

k8s-ci-robot · 2024-12-08T16:20:14Z

Welcome @viveksyngh!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-vsphere 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-vsphere has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2024-12-08T16:20:15Z

Hi @viveksyngh. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

neolit123

please give a ping once this is no longer a draft and is ready for review.

/cc

neolit123 · 2024-12-11T07:27:39Z

make sure you add a test.

apis/v1beta1/vspheremachine_types.go

neolit123 · 2024-12-16T08:29:04Z

internal/webhooks/vspheremachinetemplate.go

 	return nil, AggregateObjErrors(newTyped.GroupVersionKind().GroupKind(), newTyped.Name, allErrs)
 }

 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
 func (webhook *VSphereMachineTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
+
+func validateVSphereVMNamingTemplate(_ context.Context, vsphereMachineTemplate *infrav1.VSphereMachineTemplate) field.ErrorList {


is this following some code that core CAPI already has or is this done from scratch as a use case for CAPV?
if the former, could you link to that code for reviewer's reference?

This is based on this MR which was added to support this in supervisor mode #3099

In supervisor mode, the object is called VirtualMachine which drives the creation of vSphere VMs while in govami mode this object is called VSphereVM.

looks like a lot comes from that PR.
why not also name it VirtualMachineNamingStrategy here? that seems more consistent despite the diff backend objects.

I can do that if we prefer that. I just to wanted to call it what it is being used for.

that would be my preference. not sure what other reviewers will comment on this.

👍 to keep it as VSphereVM, because that's the object which gets created from a VSphereMachine.

neolit123 · 2024-12-16T08:30:38Z

pkg/services/vimmachine.go

+	maxNameLength = 63
+)
+
+// Note: Inlining these functions from sprig to avoid introducing a dependency.


sprig is a typo?

Its related to https://masterminds.github.io/sprig/

you can't just copy code from another project without attribution. also CNCF has special handling of MIT and some other licenses. see https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md#cncf-allowlist-license-policy

please add the entire dependency and let the go compiler optimize.

Note: we don't want to simply import the whole sprig library and use the function from there to prevent the transitive dependencies. Instead we should better outline the license part here and propably move the inlined functions to a separate package.

given it will be a fork the project can copy only the bits that it needs. a readme or just a code comment clarifing purpose and origin of the forked bits would suffice. original license file and license header too.

in the k/k third-party dir there are cases like that.

Took a look at the CAPI go.mod file. We already have a direct dependency to sprig there. I think it's okay to have the same in CAPV. So I would just take the direct dependency and we're good.

(there's not much point to avoiding the dependency in CAPV if we have it in CAPI)

This is already in the main and we are using it. https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/pkg/services/vmoperator/vmopmachine.go#L298

I could not reuse it because they were ware private and not exported. Depending what we decide, I can make the change.

This is already in the main and we are using it. https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/pkg/services/vmoperator/vmopmachine.go#L298

I could not reuse it because they were ware private and not exported. Depending what we decide, I can make the change.

all copied code from a different license without attribution must be removed.
import the library and use its exported functions.
if what you need from the library is not exported, go with the minimal fork approach.

I have update the MR where I imported the function sprig library and use only those functions which are required.

Please take a look.

test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vm-namingstrategy.yaml

viveksyngh · 2024-12-16T09:10:56Z

This MR is more or less similar code from this MR which added the functionality in the supervisor mode. #3099

I can make the requested changes but I have tried to align this as much as possible with supervisor mode changes.

neolit123 · 2024-12-16T12:35:14Z

/ok-to-test

neolit123 · 2024-12-16T12:35:37Z

This MR is more or less similar code from this MR which added the functionality in the supervisor mode. #3099

I can make the requested changes but I have tried to align this as much as possible with supervisor mode changes.

#3286 (comment)

- Add VM naming stragey for vsphere vms and VMs in govami mode

- Rename the type to VSphereVMNamingStrategy and update docs, function name etc

chrischdi

Last findings, happy to get this merged once that's fixed.

Thanks for working on it and sorry for taking so long :-) 🎉

chrischdi · 2025-01-22T18:17:14Z

pkg/util/template.go

+
+	tpl, err := nameTpl.Parse(*nameTemplate)
+	if err != nil {
+		return "", errors.Wrapf(err, "failed to generate name: failed to parse template %q", *nameTemplate)


Suggested change

return "", errors.Wrapf(err, "failed to generate name: failed to parse template %q", *nameTemplate)

return "", errors.Wrapf(err, "unable to parse template %q", *nameTemplate)

(the failed to generate name for VSphereVM / VirtualMachine comes at above error wraping)

chrischdi · 2025-01-22T18:17:35Z

pkg/util/template.go

+
+	var buf bytes.Buffer
+	if err := tpl.Execute(&buf, data); err != nil {
+		return "", errors.Wrap(err, "failed to generate name")


Suggested change

return "", errors.Wrap(err, "failed to generate name")

return "", err

chrischdi · 2025-01-22T18:18:34Z

pkg/util/template_test.go

+	"k8s.io/utils/ptr"
+)
+
+func Test_GenerateVSphereVMName(t *testing.T) {


Suggested change

func Test_GenerateVSphereVMName(t *testing.T) {

func Test_GenerateMachineNameFromTemplate(t *testing.T) {

chrischdi · 2025-01-22T18:19:00Z

pkg/util/template.go

+
+// GenerateNameFromMachineNameTemplate generate a name from machine name and a naming strategy template.
+// the template supports only `trimSuffix` and `trunc` functions.
+func GenerateNameFromMachineNameTemplate(machineName string, nameTemplate *string) (string, error) {


Suggested change

func GenerateNameFromMachineNameTemplate(machineName string, nameTemplate *string) (string, error) {

func GenerateMachineNameFromTemplate(machineName string, nameTemplate *string) (string, error) {

chrischdi · 2025-01-22T18:19:17Z

pkg/util/template_test.go

+			got, err := GenerateNameFromMachineNameTemplate(tt.machineName, tt.template)
+
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GenerateVSphereVMName error = %v, wantErr %v", err, tt.wantErr)


Suggested change

t.Errorf("GenerateVSphereVMName error = %v, wantErr %v", err, tt.wantErr)

t.Errorf("GenerateMachineNameFromTemplate error = %v, wantErr %v", err, tt.wantErr)

chrischdi · 2025-01-22T18:21:07Z

pkg/util/template_test.go

+		wantErr     bool
+	}{
+		{
+			name:        "default template",


Suggested change

name: "default template",

name: "return machineName if template is nil",

Add a slim sprig package to avoid additional dependencies and move the common logic to util package

chrischdi

/lgtm

/assign @sbueringer for a final round

k8s-ci-robot · 2025-01-27T13:45:00Z

LGTM label has been added.

Git tree hash: ff52f7202abf13b802ad93309b20bd03fc9cef12

chrischdi · 2025-01-27T13:45:05Z

/test help

k8s-ci-robot · 2025-01-27T13:45:09Z

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main

/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

/test pull-cluster-api-provider-vsphere-test-main

/test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-vsphere-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-vsphere-apidiff-main

pull-cluster-api-provider-vsphere-test-main

pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test help

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

chrischdi · 2025-01-27T13:45:29Z

For checking ci

/hold

chrischdi · 2025-01-27T13:45:35Z

/test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

chrischdi · 2025-01-27T13:47:04Z

Let's see how it behaves at team-cluster-api#57

chrischdi · 2025-01-27T14:30:44Z

/retest

to see if its a flake or an issue

chrischdi · 2025-01-27T15:24:06Z

/test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Dec 8, 2024

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 8, 2024

k8s-ci-robot requested review from MaxRink and srm09 December 8, 2024 16:20

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Dec 8, 2024

viveksyngh force-pushed the vm-naming-strategy branch from c0c07cd to 7ca274d Compare December 8, 2024 16:25

viveksyngh changed the title ~~feat: add VM naming strategy for VMs in govami mode~~ ✨ add VM naming strategy for VMs in govami mode Dec 8, 2024

viveksyngh force-pushed the vm-naming-strategy branch from 7ca274d to 0deb41a Compare December 8, 2024 16:59

chrischdi changed the title ~~✨ add VM naming strategy for VMs in govami mode~~ ✨ add VM naming strategy for VMs in govmomi mode Dec 9, 2024

viveksyngh force-pushed the vm-naming-strategy branch from 026364a to 782c264 Compare December 11, 2024 05:35

neolit123 reviewed Dec 11, 2024

View reviewed changes

k8s-ci-robot requested a review from neolit123 December 11, 2024 07:26

viveksyngh force-pushed the vm-naming-strategy branch from 275cf76 to bd815fd Compare December 11, 2024 08:44

viveksyngh marked this pull request as ready for review December 16, 2024 04:31

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 16, 2024

k8s-ci-robot requested review from chrischdi and zhanggbj December 16, 2024 04:31

neolit123 reviewed Dec 16, 2024

View reviewed changes

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 16, 2024

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 9, 2025

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 21, 2025

viveksyngh added 7 commits January 21, 2025 23:16

✨ add VM naming strategy for VMs in govami mode

f349c66

- Add VM naming stragey for vsphere vms and VMs in govami mode

rename the type to VSphereVMNamingStrategy

058e755

- Rename the type to VSphereVMNamingStrategy and update docs, function name etc

add support for a random function

c8ae0cc

remove random function support

240ae31

add webhook validation and tests

c1a394b

fix lint issues

0f94dc0

add sprig package as depedency

15dcc9a

viveksyngh force-pushed the vm-naming-strategy branch from 01677ca to b39b4d6 Compare January 21, 2025 17:51

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 21, 2025

viveksyngh force-pushed the vm-naming-strategy branch 2 times, most recently from 3079d2d to ed589aa Compare January 22, 2025 03:53

chrischdi reviewed Jan 22, 2025

View reviewed changes

add slim sprig package

d847731

Add a slim sprig package to avoid additional dependencies and move the common logic to util package

viveksyngh force-pushed the vm-naming-strategy branch from ed589aa to d847731 Compare January 23, 2025 15:18

chrischdi reviewed Jan 27, 2025

View reviewed changes

k8s-ci-robot assigned chrischdi Jan 27, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 27, 2025

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 27, 2025

chrischdi mentioned this pull request Jan 27, 2025

✨ add VM naming strategy for VMs in govmomi mode team-cluster-api/cluster-api-provider-vsphere#57

Open

	return "", errors.Wrapf(err, "failed to generate name: failed to parse template %q", *nameTemplate)
	return "", errors.Wrapf(err, "unable to parse template %q", *nameTemplate)

	return "", errors.Wrap(err, "failed to generate name")
	return "", err

	func Test_GenerateVSphereVMName(t *testing.T) {
	func Test_GenerateMachineNameFromTemplate(t *testing.T) {

	func GenerateNameFromMachineNameTemplate(machineName string, nameTemplate *string) (string, error) {
	func GenerateMachineNameFromTemplate(machineName string, nameTemplate *string) (string, error) {

	t.Errorf("GenerateVSphereVMName error = %v, wantErr %v", err, tt.wantErr)
	t.Errorf("GenerateMachineNameFromTemplate error = %v, wantErr %v", err, tt.wantErr)

	name: "default template",
	name: "return machineName if template is nil",

✨ add VM naming strategy for VMs in govmomi mode #3286

Are you sure you want to change the base?

✨ add VM naming strategy for VMs in govmomi mode #3286

Conversation

viveksyngh commented Dec 8, 2024

k8s-ci-robot commented Dec 8, 2024

k8s-ci-robot commented Dec 8, 2024

neolit123 left a comment

Choose a reason for hiding this comment

neolit123 commented Dec 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neolit123 Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neolit123 Jan 10, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neolit123 Jan 10, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

viveksyngh commented Dec 16, 2024

neolit123 commented Dec 16, 2024

neolit123 commented Dec 16, 2024

chrischdi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chrischdi left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Jan 27, 2025

chrischdi commented Jan 27, 2025

k8s-ci-robot commented Jan 27, 2025

chrischdi commented Jan 27, 2025

chrischdi commented Jan 27, 2025

chrischdi commented Jan 27, 2025

chrischdi commented Jan 27, 2025

chrischdi commented Jan 27, 2025

neolit123 Jan 9, 2025 •

edited

Loading

neolit123 Jan 10, 2025 •

edited

Loading

neolit123 Jan 10, 2025 •

edited

Loading