✨Upgrade k8s dependencies from 1.23.0 to 1.23.5

[NikhilSharmaWe]

This Bumps all k8s dependencies.
PR was made for Bumping k8s 1.23.3 to get bug fixes in kubernetes-sigs/kubebuilder kubernetes-sigs/kubebuilder#2502, these changes are required before we can do that.

[sbueringer]

Change looks fine
/lgtm

Should this be cherry-picked into release-0.11? (assuming that kubebuilder wants to build on top of a CR release and the v0.12.0 release is probably based on Kubernetes 1.24)

[NikhilSharmaWe]

Should this be cherry-picked into release-0.11? (assuming that kubebuilder wants to build on top of a CR release and the v0.12.0 release is probably based on Kubernetes 1.24)

@sbueringer Yes I think so.
@camilamacedo86 Could you please give please give your thoughts on it.

[camilamacedo86]

@NikhilSharmaWe
Just a nit: Could we change the commit description/title for something like Upgrade k8s dependencies from 1.23.0 to 1.23.5
It is used to generate the release notes, see: https://github.com/kubernetes-sigs/controller-runtime/releases

Otherwise,

/lgtm

[NikhilSharmaWe]

@camilamacedo86 Changed the commit title.

[camilamacedo86]

/lgtm

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, NikhilSharmaWe

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 [alvaroaleman]

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

[joelanford]

/cherry-pick release-0.11

[k8s-infra-cherrypick-robot]

@joelanford: #1843 failed to apply on top of branch "release-0.11":

Applying: Upgrade k8s dependencies from 1.23.0 to 1.23.5
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
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 Upgrade k8s dependencies from 1.23.0 to 1.23.5
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-0.11

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.

[NikhilSharmaWe]

@joelanford What could be the reason behind the failure to apply these changes on top of branch release-0.11? And what should be our next step in this regard ?

[sbueringer]

@NikhilSharmaWe There is a merge conflict. It should be fine if you create the cherry-pick PR against release-0.11 manually.

[NikhilSharmaWe]

@sbueringer So I must first create a create a PR against release-0.11 and then make changes manually in go.mod and go.sum.

[NikhilSharmaWe]

@sbueringer I created a PR against release-0.11 branch https://github.com/kubernetes-sigs/controller-runtime/pull/1852/commits without making any changes (so that I could add the changes in go.mod and go.sum manually) but after making the PR 5 commits are already present, is it expected? Should I add the changes in go.mod and go.sum on top of these.

[sbueringer]

If you create the new branch based on the release-branch this shouldn't happen, but I see that #1853 looks okay.

I usually use something like:

git checkout release-0.11
git pull

git checkout -b <new-branch-name>
git cherry-pick <commit-id>
<resolve merge conflicts>
git cherry-pick --continue
git push -u origin <new-branch-name>

But it doesn't matter how exactly you do it as long as the PR looks fine :)