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

Vendor k/*@v0.23 and controller-runtime@v0.11 #5421

Merged
merged 16 commits into from
Feb 14, 2022
Merged

Vendor k/*@v0.23 and controller-runtime@v0.11 #5421

merged 16 commits into from
Feb 14, 2022

Conversation

acumino
Copy link
Member

@acumino acumino commented Feb 8, 2022 •
edited

How to categorize this PR?

/area open-source
/kind task

What this PR does / why we need it:
Vendors k8s.io/*@v0.23.3, sigs.k8s.io/controller-runtime@v0.11.0 and sigs.k8s.io/controller-tools@v0.8.0 and adapts to the breaking / most notable changes

Which issue(s) this PR fixes:
Part of #5282

Special notes for your reviewer:

Release note:

The following golang dependencies have been upgraded, please consult the upstream release notes and [this issue](https://github.com/gardener/gardener/issues/5282) for guidance on upgrading your golang dependencies when vendoring this gardener version:
- `k8s.io/*` to `v0.23.3`
- `sigs.k8s.io/controller-runtime` to `v0.11.0`
- `sigs.k8s.io/controller-tools` to `v0.8.0`

@gardener-prow
Copy link
Contributor

gardener-prow bot commented Feb 8, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@gardener-robot gardener-robot added area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related kind/task General task labels Feb 8, 2022
@gardener-robot
Copy link

@acumino Thank you for your contribution.

@gardener-robot gardener-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs/second-opinion kind/test Test labels Feb 8, 2022
rfranzke
rfranzke reviewed Feb 8, 2022
View reviewed changes
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

Thanks for the PR and thanks to @timebertt helping with structuring it :)

Can you explain why this is only "Part of #5282"? What is missing and can't we do this already now to get this topic closed?

@timebertt
Copy link
Member

/retest

@acumino acumino marked this pull request as ready for review February 8, 2022 12:45
@acumino acumino requested review from a team as code owners February 8, 2022 12:45
@acumino
Copy link
Member Author

acumino commented Feb 8, 2022

Can you explain why this is only "Part of #5282"? What is missing and can't we do this already now to get this topic closed?

There are some enhancements that can be done ex - consider replacing custom coding in seed-admission-controller with builder.WebhookBuilder.{WithDefaulter,WithValidator}
and also Bumping of envtest binaries

@rfranzke
Copy link
Member

rfranzke commented Feb 8, 2022

Thanks! What is preventing us from doing this now already as part of this PR?

@acumino
Copy link
Member Author

acumino commented Feb 8, 2022

Thanks! What is preventing us from doing this now already as part of this PR?

This PR only covers the breaking changes. Other changes are not important so can be done in separate PR, so this PR will be easy to follow.
I can also make those changes here if you suggest so.

@rfranzke
Copy link
Member

rfranzke commented Feb 8, 2022

I can also make those changes here if you suggest so.

You decide. The only thing I would like to ask for is that we actively pursue the whatever other changes we plan before #5282 can be closed. I would like to prevent the situation which happened to #4772 (open since long).

@acumino
Copy link
Member Author

acumino commented Feb 9, 2022

I can also make those changes here if you suggest so.

You decide. The only thing I would like to ask for is that we actively pursue the whatever other changes we plan before #5282 can be closed. I would like to prevent the situation which happened to #4772 (open since long).

I prefer doing it separately that seems more reasonable to me as K/K kind of follow the same pattern, cause envtest is part of a different module. I will resolve all other things once this PR is merged.

rfranzke
rfranzke previously approved these changes Feb 9, 2022
View reviewed changes
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

Thanks @acumino and @timebertt !

/lgtm

acumino and others added 16 commits February 11, 2022 21:49
@acumino
Bump k8s.io/* to v0.23.3 in go.mod
469d8f5
@acumino
[automated] make revendor
2367b79
@acumino
[automated] make generate
bc682a2
@acumino
Bump c-r to v0.11.0 in go.mod
5161bf2
@acumino
[automated] make revendor
d91a01e
@acumino
Bump controller-tools to v0.8.0 in go.mod
d5e2995
@acumino
[automated] make revendor
2ffc922
@acumino
Adapt change for Logger changed to Struct
9610259 
From v1.0.0 log.Logger has been changed to struct from Interface. Logger struct has field `LogSink` interface which is same as old `Logger` interface
@acumino
Adapt changes fo NullLogger
bd52307
@acumino
Adapt chnage in Handler API
36e1468 
ref kubernetes/kubernetes#105979
@acumino
Adapt ResolverConfig field changed from a string to *string
8d93d6b 
ref kubernetes/kunernetes#104624
@acumino
Adapt changes for, In kubelet, log verbosity and flush frequency can …
18bf8f6 
…also be configured via the configuration

ref kubernetes/kubernetes#106090
@acumino
[automated] make generate
fa34688
@acumino
Avoid shallow copies of webhook
966f3a6 
ref kubernetes-sigs/controller-runtime#1667
@timebertt @acumino
Add back apiserver logging flags
02af955
@acumino
Rebase
556d2ca
@gardener gardener deleted a comment from gardener-prow bot Feb 11, 2022
timebertt
timebertt approved these changes Feb 14, 2022
View reviewed changes
Copy link
Member

@timebertt timebertt left a comment

Choose a reason for hiding this comment

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

Thanks again!
/lgtm

@timebertt timebertt merged commit 0296476 into gardener:master Feb 14, 2022
krgostev pushed a commit to krgostev/gardener that referenced this pull request Apr 21, 2022
@acumino @timebertt
Vendor k/*@v0.23 and controller-runtime@v0.11 (gardener#5421)
4d630e3 
* Bump k8s.io/* to v0.23.3 in go.mod

* [automated] make revendor

* [automated] make generate

* Bump c-r to v0.11.0 in go.mod

* [automated] make revendor

* Bump controller-tools to v0.8.0 in go.mod

* [automated] make revendor

* Adapt change for Logger changed to Struct

From v1.0.0 log.Logger has been changed to struct from Interface. Logger struct has field `LogSink` interface which is same as old `Logger` interface

* Adapt changes fo NullLogger

* Adapt chnage in Handler API

ref kubernetes/kubernetes#105979

* Adapt ResolverConfig field changed from a string to *string

ref kubernetes/kunernetes#104624

* Adapt changes for, In kubelet, log verbosity and flush frequency can also be configured via the configuration

ref kubernetes/kubernetes#106090

* [automated] make generate

* Avoid shallow copies of webhook

ref kubernetes-sigs/controller-runtime#1667

* Add back apiserver logging flags

* Rebase

Co-authored-by: Tim Ebert <timebertt@gmail.com>
krgostev pushed a commit to krgostev/gardener that referenced this pull request Jul 5, 2022
@acumino @timebertt
Vendor k/*@v0.23 and controller-runtime@v0.11 (gardener#5421)
e511a53 
* Bump k8s.io/* to v0.23.3 in go.mod

* [automated] make revendor

* [automated] make generate

* Bump c-r to v0.11.0 in go.mod

* [automated] make revendor

* Bump controller-tools to v0.8.0 in go.mod

* [automated] make revendor

* Adapt change for Logger changed to Struct

From v1.0.0 log.Logger has been changed to struct from Interface. Logger struct has field `LogSink` interface which is same as old `Logger` interface

* Adapt changes fo NullLogger

* Adapt chnage in Handler API

ref kubernetes/kubernetes#105979

* Adapt ResolverConfig field changed from a string to *string

ref kubernetes/kunernetes#104624

* Adapt changes for, In kubelet, log verbosity and flush frequency can also be configured via the configuration

ref kubernetes/kubernetes#106090

* [automated] make generate

* Avoid shallow copies of webhook

ref kubernetes-sigs/controller-runtime#1667

* Add back apiserver logging flags

* Rebase

Co-authored-by: Tim Ebert <timebertt@gmail.com>
@acumino acumino deleted the vendor-k8sio-cr branch November 21, 2022 04:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timebertt timebertt timebertt approved these changes

@rfranzke rfranzke rfranzke left review comments

@ialidzhikov ialidzhikov Awaiting requested review from ialidzhikov

Assignees

@timebertt timebertt

Labels
area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related kind/task General task kind/test Test size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@acumino @gardener-robot @timebertt @rfranzke @gardener-robot-ci-1 @gardener-robot-ci-2 @gardener-robot-ci-3