⚠️ Update controller-runtime and client-go #1812

avorima · 2019-11-27T18:04:23Z

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/[email protected]/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/[email protected] and k8s.io/[email protected] 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 · 2019-11-27T18:04:31Z

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 · 2019-11-27T18:04:32Z

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.

vincepri · 2019-12-02T15:12:38Z

/hold

detiber · 2019-12-02T16:01:58Z

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 · 2019-12-02T20:39:32Z

/ok-to-test

ncdc · 2019-12-02T21:12:14Z

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

avorima · 2019-12-03T10:42:15Z

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

config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

config/crd/bases/cluster.x-k8s.io_clusters.yaml

config/crd/bases/cluster.x-k8s.io_kubeadmcontrolplanes.yaml

config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml

config/crd/bases/cluster.x-k8s.io_machines.yaml

config/crd/bases/cluster.x-k8s.io_machinesets.yaml

ncdc · 2019-12-03T18:26:09Z

Makefile

 generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate targets
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
+		crd:preserveUnknownFields=false \


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.

ncdc · 2019-12-03T18:26:56Z

Makefile

 	$(CONTROLLER_GEN) \
 		paths=./bootstrap/kubeadm/api/... \
-		crd:trivialVersions=true \
+		crd:trivialVersions=true,preserveUnknownFields=false \


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

ncdc · 2019-12-03T18:27:08Z

@avorima rebase needed - thanks!

- sigs.k8s.io/controller-runtime v0.4.0 - k8s.io/client-go kubernetes-1.16.0

ncdc · 2019-12-03T19:17:53Z

/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 · 2019-12-03T19:18:14Z

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

~~OWNERS~~ [ncdc]

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

avorima · 2019-12-03T19:29:44Z

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

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 27, 2019

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 27, 2019

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 27, 2019

k8s-ci-robot requested review from detiber and vincepri November 27, 2019 18:04

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 2, 2019

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 Dec 2, 2019

ncdc mentioned this pull request Dec 2, 2019

Document policy guidelines on core dependency & tooling versions #1819

Closed

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 3, 2019

detiber reviewed Dec 3, 2019

View reviewed changes

avorima force-pushed the update_dependencies branch from fb735da to b6e8073 Compare December 3, 2019 15:55

ncdc reviewed Dec 3, 2019

View reviewed changes

avorima added 5 commits December 3, 2019 19:39

Update dependencies

257aa4f

- sigs.k8s.io/controller-runtime v0.4.0 - k8s.io/client-go kubernetes-1.16.0

Update test framework dependencies

7a66893

Update tools dependencies

4c9d870

Re-generate CRDs

211bc0d

Remove preserveUnknownFields

626cfc4

avorima force-pushed the update_dependencies branch from b6e8073 to 626cfc4 Compare December 3, 2019 18:41

Add missing preserveUnkownFields and make generate

85f3e88

ncdc added this to the v0.3.0 milestone Dec 3, 2019

k8s-ci-robot assigned ncdc Dec 3, 2019

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 3, 2019

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2019

k8s-ci-robot merged commit 7a1f750 into kubernetes-sigs:master Dec 3, 2019

avorima deleted the update_dependencies branch December 3, 2019 19:34

⚠️ Update controller-runtime and client-go #1812

⚠️ Update controller-runtime and client-go #1812

Uh oh!

Conversation

avorima commented Nov 27, 2019

Uh oh!

k8s-ci-robot commented Nov 27, 2019

Uh oh!

k8s-ci-robot commented Nov 27, 2019

Uh oh!

vincepri commented Dec 2, 2019

Uh oh!

detiber commented Dec 2, 2019

Uh oh!

vincepri commented Dec 2, 2019

Uh oh!

ncdc commented Dec 2, 2019

Uh oh!

avorima commented Dec 3, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ncdc Dec 3, 2019

Choose a reason for hiding this comment

Uh oh!

ncdc Dec 3, 2019

Choose a reason for hiding this comment

Uh oh!

ncdc commented Dec 3, 2019

Uh oh!

ncdc commented Dec 3, 2019

Uh oh!

k8s-ci-robot commented Dec 3, 2019

Uh oh!

avorima commented Dec 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants