✨ Add annotation support to util.CloneTemplate to pass them down from templates to machines #4568

schrej · 2021-05-04T11:40:53Z

What this PR does / why we need it:
This PR adds support for annotations to the util.CloneTemplate and util.GenerateTemplate functions. This is used to pass down annotations from MachineDeployments/MachineSets to the infrastructure machine resources.

It also extends the tests of the MachineSet controller to verify that labels and annotations are passed down correctly.

Which issue(s) this PR fixes:
Fixes #4543

k8s-ci-robot · 2021-05-04T11:40:55Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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/test-infra repository. I understand the commands that are listed here.

k8s-ci-robot · 2021-05-04T11:41:00Z

Welcome @schrej!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. 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 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 · 2021-05-04T11:41:01Z

Hi @schrej. 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/test-infra repository.

This allows to pass down annotations from MachineDeployments and MachineSets to the provider specific machine resources. Also changed the MachineSet controller to pass on annotations.

vincepri · 2021-05-04T15:45:02Z

/ok-to-test

enxebre · 2021-05-05T11:22:24Z

controllers/external/util_test.go

@@ -175,7 +180,12 @@ func TestCloneTemplateResourceFound(t *testing.T) {
 		ClusterName: testClusterName,
 		OwnerRef:    owner.DeepCopy(),
 		Labels: map[string]string{
-			"test-label-1": "value-1",


why are we dropping this label?

It is covered by the precedence label below, which is a little more clearer with regards to whether precedence is correct, but also verifies that labels are applied in general. That's why I decided to drop it, as it doesn't seem necessary to have two labels. I can re-add it if you disagree.

controllers/machineset_controller_test.go

Ensure annotations and labels of MachineTemplate are applied to InfrastructureMachines.

schrej · 2021-05-12T16:58:06Z

/retest

schrej · 2021-05-12T17:05:07Z

That test doesn't seem related, so maybe once again
/retest

vincepri

/retest
/lgtm
/assign @fabriziopandini @CecileRobertMichon

schrej · 2021-05-12T21:07:17Z

I'll have another look on friday, maybe it's related after all

vincepri · 2021-05-12T21:37:20Z

/lgtm cancel

schrej · 2021-05-14T08:37:13Z

Tests are passing locally, I also can't really see a relation. In addition the tests passed on prow before, the only thing I changed was extending tests, and those are passing.
/retest

vincepri

/approve
/lgtm

k8s-ci-robot · 2021-05-14T16:59:45Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 4, 2021

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label May 4, 2021

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 May 4, 2021

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 4, 2021

k8s-ci-robot requested review from fabriziopandini and justinsb May 4, 2021 11:41

Add annotation support to util.CloneTemplate

f9db369

This allows to pass down annotations from MachineDeployments and MachineSets to the provider specific machine resources. Also changed the MachineSet controller to pass on annotations.

schrej force-pushed the feature/4543 branch from 17486c4 to f9db369 Compare May 4, 2021 12:02

k8s-ci-robot added 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 May 4, 2021

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 May 4, 2021

enxebre reviewed May 5, 2021

View reviewed changes

schrej marked this pull request as ready for review May 6, 2021 15:56

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 May 6, 2021

sbueringer reviewed May 11, 2021

View reviewed changes

controllers/machineset_controller_test.go Outdated Show resolved Hide resolved

Extend MachineSet controller tests

cdae7ac

Ensure annotations and labels of MachineTemplate are applied to InfrastructureMachines.

schrej force-pushed the feature/4543 branch from c1a6680 to cdae7ac Compare May 12, 2021 16:46

vincepri approved these changes May 12, 2021

View reviewed changes

k8s-ci-robot assigned CecileRobertMichon, fabriziopandini and vincepri May 12, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 12, 2021

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 12, 2021

vincepri approved these changes May 14, 2021

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 14, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2021

k8s-ci-robot merged commit def0fa8 into kubernetes-sigs:master May 14, 2021

k8s-ci-robot added this to the v0.4 milestone May 14, 2021

schrej deleted the feature/4543 branch June 25, 2021 10:03

schrej mentioned this pull request Jan 4, 2022

REQUEST: New membership for schrej kubernetes/org#3160

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Add annotation support to util.CloneTemplate to pass them down from templates to machines #4568

✨ Add annotation support to util.CloneTemplate to pass them down from templates to machines #4568

schrej commented May 4, 2021 •

edited

Loading

k8s-ci-robot commented May 4, 2021

k8s-ci-robot commented May 4, 2021

k8s-ci-robot commented May 4, 2021

vincepri commented May 4, 2021

enxebre May 5, 2021

schrej May 5, 2021

schrej commented May 12, 2021

schrej commented May 12, 2021

vincepri left a comment

schrej commented May 12, 2021

vincepri commented May 12, 2021

schrej commented May 14, 2021

vincepri left a comment

k8s-ci-robot commented May 14, 2021

✨ Add annotation support to util.CloneTemplate to pass them down from templates to machines #4568

✨ Add annotation support to util.CloneTemplate to pass them down from templates to machines #4568

Conversation

schrej commented May 4, 2021 • edited Loading

k8s-ci-robot commented May 4, 2021

k8s-ci-robot commented May 4, 2021

k8s-ci-robot commented May 4, 2021

vincepri commented May 4, 2021

enxebre May 5, 2021

Choose a reason for hiding this comment

schrej May 5, 2021

Choose a reason for hiding this comment

schrej commented May 12, 2021

schrej commented May 12, 2021

vincepri left a comment

Choose a reason for hiding this comment

schrej commented May 12, 2021

vincepri commented May 12, 2021

schrej commented May 14, 2021

vincepri left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented May 14, 2021

schrej commented May 4, 2021 •

edited

Loading