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

Upgrade k8s dependencies from 1.23.0 to 1.23.5 #1843

Merged
merged 1 commit into from Mar 22, 2022

Conversation

NikhilSharmaWe
Copy link
Member

@NikhilSharmaWe NikhilSharmaWe commented Mar 22, 2022

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.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 22, 2022
@NikhilSharmaWe NikhilSharmaWe changed the title Bumped k8s dependencies 🌱Bumped k8s dependencies Mar 22, 2022
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 22, 2022
@NikhilSharmaWe NikhilSharmaWe changed the title 🌱Bumped k8s dependencies Bumped k8s dependencies Mar 22, 2022
@sbueringer
Copy link
Member

sbueringer commented Mar 22, 2022

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)

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2022
@NikhilSharmaWe
Copy link
Member Author

NikhilSharmaWe commented Mar 22, 2022

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
Copy link
Member

camilamacedo86 commented Mar 22, 2022

@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

@k8s-ci-robot k8s-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2022
@NikhilSharmaWe
Copy link
Member Author

NikhilSharmaWe commented Mar 22, 2022

@camilamacedo86 Changed the commit title.

@camilamacedo86 camilamacedo86 changed the title Bumped k8s dependencies Upgrade k8s dependencies from 1.23.0 to 1.23.5 Mar 22, 2022
@camilamacedo86
Copy link
Member

camilamacedo86 commented Mar 22, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2022
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Mar 22, 2022

[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:

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 Mar 22, 2022
@k8s-ci-robot k8s-ci-robot merged commit c46b410 into kubernetes-sigs:master Mar 22, 2022
12 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v0.10.x milestone Mar 22, 2022
@joelanford
Copy link
Member

joelanford commented Mar 28, 2022

/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
Copy link
Member Author

NikhilSharmaWe commented Mar 29, 2022

@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
Copy link
Member

sbueringer commented Mar 29, 2022

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

@NikhilSharmaWe
Copy link
Member Author

NikhilSharmaWe commented Mar 29, 2022

@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
Copy link
Member Author

NikhilSharmaWe commented Mar 29, 2022

@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
Copy link
Member

sbueringer commented Mar 29, 2022

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 :)

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants