Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 restore - set tenants on the new object graph constructed from files in the backup directory #5588

Merged

Conversation

varshavaradarajan
Copy link
Contributor

What this PR does / why we need it:
While restore is pretty much works like move, the difference is the the object graph being constructed in move shows the uidToNode objects with the tenants set correctly (as does the backup command). However, with restore, since a new object graph is created, the tenant is not being set at on the restored object after reading the object from the backup directory. This leads restore to only restore the cluster object. I think the restore function is missing the o.setTenants call

Since the Test_objectMover_restore test uses getObjectGraph instead of creating a new graph like the actual restore does, I'm not sure if I need to add a test here.

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 #5587

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 4, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @varshavaradarajan!

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
Copy link
Contributor

Hi @varshavaradarajan. 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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 4, 2021
…in the backup directory

* fix the restore test to not discover objects in the source cluster
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 4, 2021
@fabriziopandini
Copy link
Member

@ykakarap PTAL

@vincepri
Copy link
Member

vincepri commented Nov 4, 2021

/ok-to-test

@k8s-ci-robot 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 Nov 4, 2021
@fabriziopandini
Copy link
Member

Also @jpmcb @stmcginnis

@enxebre
Copy link
Member

enxebre commented Nov 5, 2021

/milestone v1.1
This seems a legit bugfix, @fabriziopandini do we want to backport to 1.0?

@k8s-ci-robot
Copy link
Contributor

@enxebre: You must be a member of the kubernetes-sigs/cluster-api-maintainers GitHub team to set the milestone. If you believe you should be able to issue the /milestone command, please contact your Cluster API Maintainers and have them propose you as an additional delegate for this responsibility.

In response to this:

/milestone v1.1
This seems a legit bugfix, @fabriziopandini do we want to backport to 1.0?

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.

@ykakarap
Copy link
Contributor

ykakarap commented Nov 8, 2021

/lgtm

We should also consider adding some e2e tests to make sure that these bugs are caught early.

do we want to backport to 1.0?

I think we should. FYI, Release 0.4 also seems to have the same bug.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 8, 2021
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@k8s-ci-robot
Copy link
Contributor

[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:

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 k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2021
@k8s-ci-robot k8s-ci-robot merged commit 7a248b4 into kubernetes-sigs:main Nov 8, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Nov 8, 2021
@varshavaradarajan
Copy link
Contributor Author

hey, is this going to be backported to Release 0.4 and 1.0?

@varshavaradarajan varshavaradarajan deleted the restore-tenants branch November 8, 2021 16:56
@ykakarap
Copy link
Contributor

I think it should be. @fabriziopandini thoughts?

@fabriziopandini
Copy link
Member

/cherry-pick release-1.0

@k8s-infra-cherrypick-robot

@fabriziopandini: new pull request created: #5626

In response to this:

/cherry-pick release-1.0

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

clusterctl restore does not set tenants correctly
7 participants