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

Update k8s.io/*, sigs.k8s.io/controller-runtime dependencies #8666

Merged
merged 4 commits into from Oct 19, 2023

Conversation

rfranzke
Copy link
Member

How to categorize this PR?

/area open-source
/kind enhancement

What this PR does / why we need it:
Update k8s.io/*, sigs.k8s.io/controller-runtime dependencies to their latest patch versions.
With this, GAPI also gets the new generic feature gate UnauthenticatedHTTP2DOSMitigation like KAPI, see #8665.

Special notes for your reviewer:
/cc @timuthy

Release note:

The following Golang dependencies have been updated:
- `k8s.io/*` from `v0.28.2` to `v0.28.3`
- `sigs.k8s.io/controller-runtime` from `v0.16.2` to `v0.16.3`

@gardener-prow gardener-prow bot requested a review from timuthy October 19, 2023 06:55
@gardener-prow gardener-prow bot added area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related kind/enhancement Enhancement, improvement, extension labels Oct 19, 2023
@rfranzke
Copy link
Member Author

/cherry-pick release-v1.80

@gardener-ci-robot
Copy link
Contributor

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.80 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.80

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.

@rfranzke
Copy link
Member Author

/cherry-pick release-v1.81

@gardener-ci-robot
Copy link
Contributor

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.81 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.81

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.

@rfranzke
Copy link
Member Author

/cherry-pick release-v1.82

@gardener-prow gardener-prow bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 19, 2023
@gardener-ci-robot
Copy link
Contributor

@rfranzke: once the present PR merges, I will cherry-pick it on top of release-v1.82 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v1.82

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.

@gardener-prow gardener-prow bot added the cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. label Oct 19, 2023
Copy link
Member

@acumino acumino left a comment

Choose a reason for hiding this comment

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

You can now also remove TODO -

// TODO(acumino): Enable this test again once https://github.com/kubernetes-sigs/controller-runtime/issues/2503 is fixed.
// Describe("#ScaleKubeAPIServerToOne", func() {
// deployment := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "kube-apiserver", Namespace: seedNamespace}}
// It("should scale the KAPI deployment", func() {
// Expect(seedClient.Create(ctx, deployment)).To(Succeed())
// Expect(seedClient.Get(ctx, client.ObjectKeyFromObject(deployment), deployment)).To(Succeed())
// Expect(botanist.ScaleKubeAPIServerToOne(ctx)).To(Succeed())
// Expect(seedClient.Get(ctx, client.ObjectKeyFromObject(deployment), deployment)).To(Succeed())
// Expect(deployment.Spec.Replicas).To(Equal(pointer.Int32(1)))
// })
// })

Issue was fixed with - kubernetes-sigs/controller-runtime#2508

@rfranzke
Copy link
Member Author

/cla

@gardener-prow
Copy link
Contributor

gardener-prow bot commented Oct 19, 2023

Successfully reached out to cla-assistant.io to initialize recheck of PR #8666

@gardener-prow gardener-prow bot added cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. and removed cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. labels Oct 19, 2023
@rfranzke rfranzke requested a review from acumino October 19, 2023 08:12
Copy link
Member

@acumino acumino left a comment

Choose a reason for hiding this comment

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

Thanks
/lgtm

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2023
@gardener-prow
Copy link
Contributor

gardener-prow bot commented Oct 19, 2023

LGTM label has been added.

Git tree hash: a3ab17876adcb5b9b90def3a2da3e15b4d940efd

@gardener-prow gardener-prow bot added cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. and removed cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. cla: no Indicates the PR's author has not signed the cla-assistant.io CLA. labels Oct 19, 2023
@rfranzke
Copy link
Member Author

Running the integration tests locally on my machine succeeds without any issues... not sure why it repeatedly fails in Prow/CI.

@gardener-prow gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2023
@gardener-prow gardener-prow bot requested a review from acumino October 19, 2023 13:36
@rfranzke rfranzke force-pushed the update-deps branch 2 times, most recently from b069dac to a6627e2 Compare October 19, 2023 14:30
@gardener-prow gardener-prow bot 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 Oct 19, 2023
@rfranzke rfranzke force-pushed the update-deps branch 4 times, most recently from 9d39759 to e08fb2f Compare October 19, 2023 16:07
Copy link
Contributor

@timuthy timuthy left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2023
@gardener-prow
Copy link
Contributor

gardener-prow bot commented Oct 19, 2023

LGTM label has been added.

Git tree hash: c80a7e86d1cd25d32d4b296a26550c576332eb89

@gardener-prow
Copy link
Contributor

gardener-prow bot commented Oct 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timuthy

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

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2023
@rfranzke
Copy link
Member Author

/unhold

@gardener-prow gardener-prow bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 19, 2023
@gardener-prow gardener-prow bot merged commit b7633eb into gardener:master Oct 19, 2023
16 checks passed
@gardener-ci-robot
Copy link
Contributor

@rfranzke: #8666 failed to apply on top of branch "release-v1.80":

Applying: Update `k8s.io/*`, `sigs.k8s.io/controller-runtime`
.git/rebase-apply/patch:247: trailing whitespace.
- restored behavior as <= v3.9.0 with option to change path strategy using TrimRightSlashEnabled. 
.git/rebase-apply/patch:275: trailing whitespace.
- Use the package variable `TrimRightSlashEnabled` (default true) to control the behavior of matching routes that end with a slash `/` 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update `k8s.io/*`, `sigs.k8s.io/controller-runtime`
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v1.80

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.

@gardener-ci-robot
Copy link
Contributor

@rfranzke: #8666 failed to apply on top of branch "release-v1.81":

Applying: Update `k8s.io/*`, `sigs.k8s.io/controller-runtime`
.git/rebase-apply/patch:247: trailing whitespace.
- restored behavior as <= v3.9.0 with option to change path strategy using TrimRightSlashEnabled. 
.git/rebase-apply/patch:275: trailing whitespace.
- Use the package variable `TrimRightSlashEnabled` (default true) to control the behavior of matching routes that end with a slash `/` 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update `k8s.io/*`, `sigs.k8s.io/controller-runtime`
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v1.81

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.

@gardener-ci-robot
Copy link
Contributor

@rfranzke: new pull request created: #8677

In response to this:

/cherry-pick release-v1.82

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.

@rfranzke rfranzke deleted the update-deps branch October 20, 2023 06:13
gardener-prow bot pushed a commit that referenced this pull request Oct 20, 2023
…igs.k8s.io/controller-runtime` dependencies (#8681)

* Update `k8s.io/*`, `sigs.k8s.io/controller-runtime`

* Address PR review feedback

* WIP/DEBUG: Revert some change of k8s.io/apiserver

* Ensure resources can be listed before GAPI is ready in envtest
gardener-prow bot pushed a commit that referenced this pull request Oct 20, 2023
…igs.k8s.io/controller-runtime` dependencies (#8680)

* Update `k8s.io/*`, `sigs.k8s.io/controller-runtime`

* Address PR review feedback

* WIP/DEBUG: Revert some change of k8s.io/apiserver

* Ensure resources can be listed before GAPI is ready in envtest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants