Vendor k/*@v0.22 and controller-runtime@v0.10 #4825

timebertt · 2021-10-12T10:07:57Z

How to categorize this PR?

/area open-source
/kind task

What this PR does / why we need it:

Vendors k8s.io/*@v0.22.2, sigs.k8s.io/controller-runtime@v0.10.2 and sigs.k8s.io/controller-tools@v0.7.0 and adapts to the breaking / most notable changes (see #4772).

Which issue(s) this PR fixes:

Main part of #4772, a few optional follow-ups will be done in dedicated PRs to keep this one limited to the minimum scope.

Special notes for your reviewer:

To ease the review, changes are split into dedicated commits, each targeting "one step" / "one adaption" to an upstream change.
Commits marked with [automated] are results of some make commands as denoted in the commit message, but no other manual changes (skip these commits in the review).
/squash

Release note:

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

timebertt · 2021-10-12T10:28:58Z

check-generate was failing because I already upgraded to go1.17 on my machine (see #4822):

>> make generate
make generate needs to be run:
 M landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.conversion.go
 M landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.deepcopy.go
 M landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.defaults.go
...

Added another commit running make generate with go1.16.

Another reason for #4519.

timebertt · 2021-10-12T13:45:41Z

I successfully validated the following:

create shoot
delete shoot
hibernate shoot
wake up shoot
delete hibernated shoot
migrate shoot
delete migrated shoot

Hence, this PR is ready for review 🚀
/ready

rfranzke · 2021-10-14T06:20:38Z

/assign

rfranzke · 2021-10-14T06:20:42Z

/rebase

github.com/go-openapi/spec seems to be orphaned after previous make generate

Also, upgrade setup-envtest (doesn't have a tagged release yet, so use release commit instead)

Maps (e.g. labels, selectors, resource requirements) might be sorted differently than expected. Hence, use semantic equality instead of strict equality, as this is what matters to us. Also, DeepEqual outputs yaml and adds a nice diff indicator instead of printing some large confusing go struct representation.

ref kubernetes/kubernetes#102823

There were several changes in the fake clients that might cause the failure to happen just now.

These tests were not preparing the test objects correctly: they only updated them in memory but not on the fake client. This wasn't caught until now because the fake client mimicked the real json decoder, which didn't unset fields not present on the server. Now that the fake client zeroes fields, the tests started failing (which is correct). So fix the tests. ref kubernetes-sigs/controller-runtime#1651

Now that the c-r client zeroes fields before decoding into the object, we can drop our workarounds for this, so basically drop kutil.CreateResetObjectFunc and its usages. ref kubernetes-sigs/controller-runtime#1640

webhookConfig.SetGroupVersionKind is not needed anymore with kubernetes-sigs/controller-runtime#1665

but with go 1.16.9

timebertt · 2021-10-14T07:13:15Z

Done.
/remove needs/rebase

rfranzke

Very well done, thanks!

pkg/operation/botanist/clusteridentity_test.go

timebertt · 2021-10-14T11:41:57Z

@rfranzke thanks a lot for your review. I addressed your suggestions, PTAL :)

rfranzke

/lgtm

* Upgrade to k8s.io/*@v0.22.2 in go.mod * [automated] make revendor * [automated] make generate * [automated] make revendor github.com/go-openapi/spec seems to be orphaned after previous make generate * Upgrade to c-r@v0.10.2 in go.mod Also, upgrade setup-envtest (doesn't have a tagged release yet, so use release commit instead) * [automated] make revendor * Upgrade to controller-tools@v0.7.0 in go.mod * [automated] make revendor * Add missing WarningsOn{Create,Update} to rest strategies * Replace dot imports for github.com/onsi/gomega/types Fix linting errors: `Assertion` redeclared in this block (typecheck) * Switch to typed values for WebhookInstallOptions.*Webhooks ref kubernetes-sigs/controller-runtime#1626 * RequestCertificate now takes an optional requestedDuration ref kubernetes/kubernetes#99494 * Switch to matchers.DeepEqual to test semantic equality Maps (e.g. labels, selectors, resource requirements) might be sorted differently than expected. Hence, use semantic equality instead of strict equality, as this is what matters to us. Also, DeepEqual outputs yaml and adds a nice diff indicator instead of printing some large confusing go struct representation. * Add new memorySwap field to expected kubelet config ref kubernetes/kubernetes#102823 * Round condition.lastUpdateTime to seconds in test There were several changes in the fake clients that might cause the failure to happen just now. * Correct unit tests falsely succeeding These tests were not preparing the test objects correctly: they only updated them in memory but not on the fake client. This wasn't caught until now because the fake client mimicked the real json decoder, which didn't unset fields not present on the server. Now that the fake client zeroes fields, the tests started failing (which is correct). So fix the tests. ref kubernetes-sigs/controller-runtime#1651 * Remove workarounds for missing zeroing in json decoder Now that the c-r client zeroes fields before decoding into the object, we can drop our workarounds for this, so basically drop kutil.CreateResetObjectFunc and its usages. ref kubernetes-sigs/controller-runtime#1640 * Drop setting webhook gvk explicitly in envtest webhookConfig.SetGroupVersionKind is not needed anymore with kubernetes-sigs/controller-runtime#1665 * Add some follow-up TODO comments * [automated] make generate but with go 1.16.9 * Address review comments

gardener-robot-ci-1 added the reviewed/ok-to-test label Oct 12, 2021

gardener-robot added area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related kind/task General task merge/squash size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 12, 2021

gardener-robot-ci-2 added needs/ok-to-test and removed reviewed/ok-to-test labels Oct 12, 2021

gardener-robot-ci-3 added the reviewed/ok-to-test label Oct 12, 2021

gardener-robot-ci-1 removed the reviewed/ok-to-test label Oct 12, 2021

gardener-robot marked this pull request as ready for review October 12, 2021 13:45

gardener-robot requested review from a team as code owners October 12, 2021 13:45

timebertt mentioned this pull request Oct 13, 2021

Update to go1.17 #4822

Merged

2 tasks

gardener-robot assigned rfranzke Oct 14, 2021

gardener-robot added the needs/rebase label Oct 14, 2021

timebertt added 9 commits October 14, 2021 09:04

Upgrade to k8s.io/*@v0.22.2 in go.mod

9f87921

[automated] make revendor

5a77b88

[automated] make generate

82113d0

[automated] make revendor

c804b82

github.com/go-openapi/spec seems to be orphaned after previous make generate

Upgrade to c-r@v0.10.2 in go.mod

5b68865

Also, upgrade setup-envtest (doesn't have a tagged release yet, so use release commit instead)

[automated] make revendor

9975a28

Upgrade to controller-tools@v0.7.0 in go.mod

62ea16b

[automated] make revendor

e90def9

Add missing WarningsOn{Create,Update} to rest strategies

3bcdf83

timebertt added 8 commits October 14, 2021 09:12

Add new memorySwap field to expected kubelet config

a64e4d0

ref kubernetes/kubernetes#102823

Round condition.lastUpdateTime to seconds in test

42c8772

There were several changes in the fake clients that might cause the failure to happen just now.

Remove workarounds for missing zeroing in json decoder

5d7d61b

Now that the c-r client zeroes fields before decoding into the object, we can drop our workarounds for this, so basically drop kutil.CreateResetObjectFunc and its usages. ref kubernetes-sigs/controller-runtime#1640

Drop setting webhook gvk explicitly in envtest

59c805a

webhookConfig.SetGroupVersionKind is not needed anymore with kubernetes-sigs/controller-runtime#1665

Add some follow-up TODO comments

a3fdd65

[automated] make generate

25433f5

but with go 1.16.9

timebertt force-pushed the vendor/kk-cr branch from 68aeada to 25433f5 Compare October 14, 2021 07:12

gardener-robot-ci-1 added the reviewed/ok-to-test label Oct 14, 2021

gardener-robot removed the needs/rebase label Oct 14, 2021

gardener-robot-ci-2 removed the reviewed/ok-to-test label Oct 14, 2021

rfranzke reviewed Oct 14, 2021

View reviewed changes

pkg/operation/botanist/clusteridentity_test.go Outdated Show resolved Hide resolved

pkg/operation/botanist/clusteridentity_test.go Outdated Show resolved Hide resolved

Address review comments

2162a1d

gardener-robot-ci-2 added the reviewed/ok-to-test label Oct 14, 2021

timebertt requested a review from rfranzke October 14, 2021 11:42

gardener-robot-ci-3 removed the reviewed/ok-to-test label Oct 14, 2021

rfranzke approved these changes Oct 14, 2021

View reviewed changes

gardener-robot added reviewed/lgtm and removed needs/review labels Oct 14, 2021

timebertt merged commit 8abb827 into gardener:master Oct 14, 2021

timebertt deleted the vendor/kk-cr branch October 14, 2021 12:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vendor k/*@v0.22 and controller-runtime@v0.10 #4825

Vendor k/*@v0.22 and controller-runtime@v0.10 #4825

timebertt commented Oct 12, 2021 •

edited

timebertt commented Oct 12, 2021

timebertt commented Oct 12, 2021 •

edited

rfranzke commented Oct 14, 2021

rfranzke commented Oct 14, 2021

timebertt commented Oct 14, 2021

rfranzke left a comment

timebertt commented Oct 14, 2021

rfranzke left a comment

Vendor k/*@v0.22 and controller-runtime@v0.10 #4825

Vendor k/*@v0.22 and controller-runtime@v0.10 #4825

Conversation

timebertt commented Oct 12, 2021 • edited

timebertt commented Oct 12, 2021

timebertt commented Oct 12, 2021 • edited

rfranzke commented Oct 14, 2021

rfranzke commented Oct 14, 2021

timebertt commented Oct 14, 2021

rfranzke left a comment

Choose a reason for hiding this comment

timebertt commented Oct 14, 2021

rfranzke left a comment

Choose a reason for hiding this comment

timebertt commented Oct 12, 2021 •

edited

timebertt commented Oct 12, 2021 •

edited