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

🌱 Move experimental addon controllers to internal #5639

Conversation

vibhorrawat
Copy link
Contributor

What this PR does / why we need it:
Move experimental addon controllers to internal and added a shim (alias.go) for exposing Reconcilers

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

@k8s-ci-robot 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: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 11, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @vibhorrawat!

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 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 Nov 11, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @vibhorrawat. 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 the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 11, 2021
@sbueringer
Copy link
Member

/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 11, 2021
@vibhorrawat
Copy link
Contributor Author

Two failures-
1- pull-cluster-api-apidiff-main Failed (Required = False)
Looking at the build logs and error suggests Incompatible changes-

*** Running go-apidiff ***
sigs.k8s.io/cluster-api/exp/addons/controllers/predicates
  Incompatible changes:
  - ResourceCreate: removed
sigs.k8s.io/cluster-api/exp/addons/controllers
  Incompatible changes:
  - (*ClusterResourceSetBindingReconciler).Reconcile: removed
  - (*ClusterResourceSetReconciler).ApplyClusterResourceSet: removed
  - (*ClusterResourceSetReconciler).Reconcile: removed
  - ErrSecretTypeNotSupported: removed

2- pull-cluster-api-verify-main Failed (Required = True)
Build logs suggest issue during make execution

 - apiGroups:
   - apiextensions.k8s.io
   resources:
@@ -229,15 +208,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - ""
   resources:
generated files are out of date, run make generate
make[1]: *** [Makefile:691: verify-gen] Error 1
make[1]: Leaving directory '/home/prow/go/src/sigs.k8s.io/cluster-api'
make: *** [Makefile:674: verify] Error 2

Any pointers to fix these?

@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 12, 2021

  1. don't worry about this, it is a non blocking check that reports changes in CAPI public APIs, and in case of this PR, they are expected given that we are moving stuff to internal
  2. this should not happen. take a look at 🌱 Move docker controller to internal #5595 (comment), this problem should be similar

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.

@vibhorrawat thanks for you fist contribution to Cluster API! Welcome to the team 🥳
changes lgtm pending green CI signal (verify only)

@sbueringer
Copy link
Member

sbueringer commented Nov 12, 2021

Same from my side. Thank you very much!

You have to add the following line:

		paths=./$(EXP_DIR)/addons/internal/... \

Below ~l.371

		paths=./$(EXP_DIR)/addons/controllers/... \

You can directly squash the change into your current commit.

P.S. You can also remove [WIP] from the PR title, that will make the verify GitHub workflows happy.

@vibhorrawat vibhorrawat force-pushed the vibhor/cleanup/addons-controllers branch from 78661f2 to d62fd67 Compare November 12, 2021 11:27
@vibhorrawat vibhorrawat changed the title [WIP] 🌱 Move experimental addon controllers to internal 🌱 Move experimental addon controllers to internal Nov 12, 2021
@k8s-ci-robot 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 Nov 12, 2021
@vibhorrawat vibhorrawat force-pushed the vibhor/cleanup/addons-controllers branch from d62fd67 to a322ba5 Compare November 12, 2021 11:31
@sbueringer
Copy link
Member

/lgtm

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

@fabriziopandini @sbueringer Thank you so much for the specific details that helped to fix the test failures. As of now, all the Required checks are passing. Kindly review and do the needful.

Looking forward for more of these to learn and familiarize myself with cluster-api 🎉

@fabriziopandini
Copy link
Member

fabriziopandini commented Nov 12, 2021

@vibhorrawat could you kindly fix one thing I forgot in the previous pass 😅

You should add this PR into API change documentation for provider implementers

@vibhorrawat vibhorrawat force-pushed the vibhor/cleanup/addons-controllers branch from a322ba5 to 4b7b077 Compare November 12, 2021 14:38
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 12, 2021
@vibhorrawat
Copy link
Contributor Author

You should add this PR into API change documentation for provider implementers

Done. Added the PR to API Change.
Kindly review.

@sbueringer your lgtm has been removed. Please re-review. 😄

@sbueringer
Copy link
Member

sbueringer commented Nov 12, 2021

Sure :)

/lgtm

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

/lgtm
/approve
yay!

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 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 Nov 12, 2021
@fabriziopandini
Copy link
Member

:-( rebase first

🌱 Move experimental addon controllers to internal

📚 Added to API Change

📚 Added to API Change and Conflict rebase
@vibhorrawat vibhorrawat force-pushed the vibhor/cleanup/addons-controllers branch from 4b7b077 to 5f932b3 Compare November 15, 2021 08:45
@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 Nov 15, 2021
@k8s-ci-robot
Copy link
Contributor

@vibhorrawat: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main 5f932b3 link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@vibhorrawat
Copy link
Contributor Author

@fabriziopandini The conflicts are resolved now. Could you please re-review this one. @sbueringer Sorry for being such a pain, had to resolve the branch conflict. Kindly re-review.

@sbueringer
Copy link
Member

@fabriziopandini The conflicts are resolved now. Could you please re-review this one. @sbueringer Sorry for being such a pain, had to resolve the branch conflict. Kindly re-review.

No worries :)

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 15, 2021
@k8s-ci-robot k8s-ci-robot merged commit 20b31e4 into kubernetes-sigs:main Nov 15, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Nov 15, 2021
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants