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

:warning: Update controller-runtime and client-go #1812

Merged
merged 6 commits into from Dec 3, 2019

Conversation

@avorima
Copy link
Contributor

avorima commented Nov 27, 2019

What this PR does / why we need it:

Projects created by kubebuilder v2.2.0 can't use CAPI as dependency.

# sigs.k8s.io/controller-runtime/pkg/metrics
/home/mv/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.4.0/pkg/metrics/workqueue.go:32:48: cannot use composite literal (type workqueueMetricsProvider) as type workqueue.MetricsProvider in argument to workqueue.SetProvider:
        workqueueMetricsProvider does not implement workqueue.MetricsProvider (missing NewDeprecatedAddsMetric method)
kubebuilder version
Version: version.Version{KubeBuilderVersion:"2.2.0", KubernetesVendor:"1.15.5", GitCommit:"0824a139f59e109c9e418a0b6e71a53c6e9e144f", BuildDate:"2019-11-20T00:00:24Z", GoOs:"unknown", GoArch:"unknown"}

Updating to sigs.k8s.io/controller-runtime@v0.4.0 and k8s.io/client-go@kubernetes-1.16.0 fixes this issue.

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 #

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 27, 2019

Welcome @avorima!

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

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Nov 27, 2019

Hi @avorima. 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/L label Nov 27, 2019
@k8s-ci-robot k8s-ci-robot requested review from detiber and vincepri Nov 27, 2019
@vincepri

This comment has been minimized.

Copy link
Member

vincepri commented Dec 2, 2019

/hold

@detiber

This comment has been minimized.

Copy link
Member

detiber commented Dec 2, 2019

Are there any runtime implications for this update? For example does it affect the minimum version of k8s we can run a management cluster on?

@vincepri

This comment has been minimized.

Copy link
Member

vincepri commented Dec 2, 2019

/ok-to-test

@ncdc

This comment has been minimized.

Copy link
Contributor

ncdc commented Dec 2, 2019

@avorima thanks for your PR. I'd like to hold merging this for now, while we take some time to document some policy guidelines around when it's ok to update dependency versions. I filed #1819 for that.

@k8s-ci-robot k8s-ci-robot added size/XL and removed size/L labels Dec 3, 2019
@avorima

This comment has been minimized.

Copy link
Contributor Author

avorima commented Dec 3, 2019

@ncdc Sure. It seems I underestimated the scope of a version bump, there's still a bit of work to be done. I'll try to get the checks to pass.

@avorima avorima force-pushed the avorima:update_dependencies branch from fb735da to b6e8073 Dec 3, 2019
Makefile Outdated
@@ -134,6 +134,7 @@ generate: $(CONTROLLER_GEN) ## Generate code
generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate targets
$(CONTROLLER_GEN) \
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
crd:preserveUnknownFields=false \

This comment has been minimized.

Copy link
@ncdc

ncdc Dec 3, 2019

Contributor

We shouldn't have this line here - this invocation of controller-gen is to generate the DeepCopy go functions. We generate CRDs in the generate-manifests target.

rbac:roleName=manager-role \
output:crd:dir=./config/crd/bases \
webhook
$(CONTROLLER_GEN) \
paths=./bootstrap/kubeadm/api/... \
crd:trivialVersions=true \
crd:trivialVersions=true,preserveUnknownFields=false \

This comment has been minimized.

Copy link
@ncdc

ncdc Dec 3, 2019

Contributor

@vincepri can we merge this controller-gen call with the one right above?

@ncdc

This comment has been minimized.

Copy link
Contributor

ncdc commented Dec 3, 2019

@avorima rebase needed - thanks!

avorima added 5 commits Nov 27, 2019
- sigs.k8s.io/controller-runtime v0.4.0
- k8s.io/client-go kubernetes-1.16.0
@avorima avorima force-pushed the avorima:update_dependencies branch from b6e8073 to 626cfc4 Dec 3, 2019
@ncdc ncdc added this to the v0.3.0 milestone Dec 3, 2019
@ncdc

This comment has been minimized.

Copy link
Contributor

ncdc commented Dec 3, 2019

/hold cancel
/lgtm
/approve

@avorima FYI, this only changes the master branch, which is for the upcoming v0.3.0 release. We don't plan to backport this to the release-0.2 branch.

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 3, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avorima, ncdc

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 merged commit 7a1f750 into kubernetes-sigs:master Dec 3, 2019
11 of 12 checks passed
11 of 12 checks passed
tide Not mergeable. Needs approved, lgtm labels.
Details
Header rules No header rules processed
Details
Pages changed All files already uploaded
Details
Mixed content No mixed content detected
Details
Redirect rules 3 redirect rules processed
Details
cla/linuxfoundation avorima authorized
Details
deploy/netlify Deploy preview ready!
Details
pull-cluster-api-build Job succeeded.
Details
pull-cluster-api-integration Job succeeded.
Details
pull-cluster-api-make Job succeeded.
Details
pull-cluster-api-test Job succeeded.
Details
pull-cluster-api-verify Job succeeded.
Details
@avorima

This comment has been minimized.

Copy link
Contributor Author

avorima commented Dec 3, 2019

@ncdc That's fine. I can work around the import issue now, which was my main goal. Thanks!

@avorima avorima deleted the avorima:update_dependencies branch Dec 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.