🐛fix(controller): support WaitForSync in custom TypedSyncingSource

[tareksha]

The code that calls WaitForSync(ctx) checks for the original SyncingSource. This does not work for custom typed controllers where TypedSyncingSource is passed with a type parameter other than reconcile.Request .

this fix should be backported to v0.20 and v0.19

[k8s-ci-robot]

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

Details

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.

[alvaroaleman]

Oh wow, good catch. Mind adding a tiny test that validates that WaitForSync gets called for a TypedSyncingSource?

[tareksha]

added

[alvaroaleman]

/ok-to-test

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: tareksha / name: Tarek Sharafi (c4ede82, 3929238)

[alvaroaleman]

Thanks!
/cherrypick release-0.20

[k8s-ci-robot]

LGTM label has been added.

Details

Git tree hash: f5d3b69cb9e3224d603a42a547efc0c8eaa95d7d

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, tareksha

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [alvaroaleman]

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

[alvaroaleman]

/cherrypick release-0.20

[k8s-infra-cherrypick-robot]

@alvaroaleman: new pull request created: #3086

Details

In response to this:

/cherrypick release-0.20

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.

[tareksha]

hi @alvaroaleman we need the fix in v0.19 too

[sbueringer]

/cherrypick release-0.19

[k8s-infra-cherrypick-robot]

@sbueringer: #3084 failed to apply on top of branch "release-0.19":

Applying: 🐛fix(controller): use generic WaitForSync
Using index info to reconstruct a base tree...
M	pkg/internal/controller/controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/internal/controller/controller.go
CONFLICT (content): Merge conflict in pkg/internal/controller/controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 🐛fix(controller): use generic WaitForSync

Details

In response to this:

/cherrypick release-0.19

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.

[sbueringer]

@tareksha Feel free to open a manual cherry-pick PR for release-0.19

[tareksha]

@tareksha Feel free to open a manual cherry-pick PR for release-0.19

@sbueringer done #3087