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

🌱 Upgrade to Go 1.17, controller-runtime v0.11.x, k8s.io v1.23.0-alpha.4 #5633

Merged
merged 5 commits into from
Nov 11, 2021
Merged

🌱 Upgrade to Go 1.17, controller-runtime v0.11.x, k8s.io v1.23.0-alpha.4 #5633

merged 5 commits into from
Nov 11, 2021

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Nov 10, 2021 •
edited
Loading

Signed-off-by: Stefan Büringer buringerst@vmware.com

What this PR does / why we need it:

This PR upgrades to the latest version of controller-runtime which:

  • requires Go 1.17
  • uses k8s.io/ v1.23.0-alpha.4

Depends on: kubernetes/test-infra#24314

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 k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 10, 2021
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 10, 2021
@sbueringer sbueringer mentioned this pull request Nov 10, 2021
Closed
@sbueringer sbueringer changed the title 🌱 Upgrade to controller-runtime v0.10.3 [WIP] 🌱 Upgrade to controller-runtime v0.11.0-beta.0 Nov 10, 2021
@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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 10, 2021
@sbueringer sbueringer force-pushed the pr-main-upgrade-cr branch 4 times, most recently from 007b38e to fce7a94 Compare November 10, 2021 19:48
@k8s-ci-robot 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 Nov 10, 2021
sbueringer
sbueringer commented Nov 10, 2021
View reviewed changes
controllers/remote/cluster_cache.go
@@ -68,7 +68,7 @@ type ClusterCacheTracker struct {
type ClusterCacheTrackerOptions struct {
// Log is the logger used throughout the lifecycle of caches.
// Defaults to a no-op logger if it's not set.
Log logr.Logger
Log *logr.Logger
Copy link
Member Author

Choose a reason for hiding this comment

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

Note: logr.Logger is now a struct not an interface. I made it a pointer to be able to check if the option is set.

I think there is simply no way to keep the API stable when go-logr changes the Logger interface to a struct (from v0.4=>v1.x)

@sbueringer sbueringer mentioned this pull request Nov 10, 2021
Merged
@sbueringer sbueringer force-pushed the pr-main-upgrade-cr branch 3 times, most recently from ad148f8 to f53b1e6 Compare November 10, 2021 21:28
@sbueringer sbueringer changed the title [WIP] 🌱 Upgrade to controller-runtime v0.11.0-beta.0 🌱 Upgrade to Go 1.17, controller-runtime v0.11.x, k8s.io v1.23.0-alpha.4 Nov 10, 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 10, 2021
@sbueringer
Copy link
Member Author

sbueringer commented Nov 10, 2021 •
edited
Loading

/hold
for:

I've tested the following locally with Go v1.17.x

make lint
make test

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 10, 2021
@sbueringer
Upgrade to Go 1.17, CR v0.11.x, CT v0.8.x, k8s.io/ v1.23.0-alpha.4
85f2df8 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
run: "make generate" (Go 1.17)
53cefa0 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Copy link
Member Author

/assign @fabriziopandini @vincepri

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2021
vincepri
vincepri approved these changes Nov 11, 2021
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm
/hold cancel

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 11, 2021
@vincepri
Copy link
Member

/retest

@vincepri
Copy link
Member

/retest

Another try

@sbueringer
Copy link
Member Author

I'll take a look

@sbueringer
run: "make generate-manifests"
0cbbca8 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
adjust internal/envtest to new CR version
d0df19b 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
adjust logging to new CR / go-logr version
3b4953a 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 11, 2021
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main

fabriziopandini
fabriziopandini reviewed Nov 11, 2021
View reviewed changes
.github/workflows/dependabot.yml
@@ -17,7 +17,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: '1.16'
go-version: '1.17'
Copy link
Member

Choose a reason for hiding this comment

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

Q: are we still using dependant or can we drop this file entirely (not blocking for this PR)

Copy link
Member Author

Choose a reason for hiding this comment

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

Afaik it's currently not running. I can drop it in a follow-up PR when we have consensus to drop it.
(/cc @randomvariable )

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 11, 2021 •
edited
Loading

@sbueringer: 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 3b4953a 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.

@sbueringer
Copy link
Member Author

full-e2e tests are essentially also green, the failed one will be fixed in #5625 (review) and is independent of this PR

@vincepri
Copy link
Member

/test pull-cluster-api-e2e-full-main

@sbueringer sbueringer mentioned this pull request Nov 11, 2021
Closed
@vincepri
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 11, 2021
@k8s-ci-robot k8s-ci-robot merged commit 4cc2fce into kubernetes-sigs:main Nov 11, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Nov 11, 2021
@sbueringer sbueringer deleted the pr-main-upgrade-cr branch November 11, 2021 17:52
@chrischdi chrischdi mentioned this pull request Apr 26, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@vincepri vincepri vincepri approved these changes

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@vincepri vincepri

@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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.
4 participants
@sbueringer @k8s-ci-robot @vincepri @fabriziopandini