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.

Sign up for GitHub

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

Jump to bottom

🐛 Add watches for infras and control plane in topology controller #5221

Merged
merged 1 commit into from
Sep 15, 2021
Merged

🐛 Add watches for infras and control plane in topology controller #5221

merged 1 commit into from
Sep 15, 2021

Conversation

enxebre
Copy link
Member

@enxebre enxebre commented Sep 8, 2021

What this PR does / why we need it:
Fixes #5194

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 8, 2021
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 8, 2021
@enxebre enxebre changed the title Add watches for infras and control plane in topology controller 🐛 Add watches for infras and control plane in topology controller Sep 8, 2021
@enxebre
Copy link
Member Author

enxebre commented Sep 8, 2021

Aside from this PR but I realised as I was going through the code: why are we setting controllerutil.SetControllerReference in external references instead of just setting an ownerRef with controller=false? I’d expect the controller ref to be the “local” controller for that external CR.

JoelSpeed
JoelSpeed reviewed Sep 8, 2021
View reviewed changes
controllers/topology/controller.go Outdated
if s.Current.InfrastructureCluster != nil {
if err := r.externalTracker.Watch(ctrl.LoggerFrom(ctx), s.Current.InfrastructureCluster,
&handler.EnqueueRequestForOwner{OwnerType: &clusterv1.Cluster{}}); err != nil {
return ctrl.Result{}, err
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we wrap this and the other error with additional information so that we are consistent with other error returns in this function?

@enxebre
Copy link
Member Author

enxebre commented Sep 8, 2021

/test pull-cluster-api-test-main-mink8s

@sbueringer
Copy link
Member

sbueringer commented Sep 9, 2021 •
edited
Loading

/lgtm
Regarding your question: I have no idea.

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2021
@ykakarap ykakarap mentioned this pull request Sep 15, 2021
Merged
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 15, 2021
fabriziopandini
fabriziopandini reviewed Sep 15, 2021
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Sep 15, 2021
@k8s-ci-robot k8s-ci-robot merged commit 04e1ddf into kubernetes-sigs:master Sep 15, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone Sep 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoelSpeed JoelSpeed JoelSpeed left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

@ykakarap ykakarap Awaiting requested review from ykakarap

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v0.4
Development

Successfully merging this pull request may close these issues.

Managed topology should add dynamic watches for InfrastructureCluster and ControlPlane kind
5 participants
@enxebre @sbueringer @fabriziopandini @k8s-ci-robot @JoelSpeed