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

rebase: update kubernetes deps to 1.27.1 #3752

Closed
wants to merge 6 commits into from
Closed

rebase: update kubernetes deps to 1.27.1 #3752

wants to merge 6 commits into from

Conversation

riya-singhal31
Copy link
Contributor

As the k8s 1.27 is released, updating the do dependencies to 1.27.

@mergify mergify bot added the rebase update the version of an external component label Apr 17, 2023
@mergify
Copy link
Contributor

mergify bot commented Apr 18, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 18, 2023

@riya-singhal31 please rebase the PR

@riya-singhal31
Copy link
Contributor Author

@riya-singhal31 please rebase the PR

Rebased, thanks!

go.mod Outdated
@@ -35,21 +35,24 @@ require (
//
// when updating k8s.io/kubernetes, make sure to update the replace section too
//
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/api v0.27.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

we have kubernetes 1.27.1 release , instead of updating to older release lets update to new release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, sure.
Updated to 1.27.1

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 18, 2023

ceph-csi/go.mod

Lines 183 to 186 in f0e6ee0

// Required for kubernetes 1.26
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
time to remove this as we are moving to 1.27?

@riya-singhal31
Copy link
Contributor Author

ceph-csi/go.mod

Lines 183 to 186 in f0e6ee0

// Required for kubernetes 1.26
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0

time to remove this as we are moving to 1.27?

Removed the other two, leaving github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
as this is still required.

@riya-singhal31 riya-singhal31 changed the title rebase: update kubernetes deps to 1.27 rebase: update kubernetes deps to 1.27.1 Apr 18, 2023
Copy link
Collaborator

@Madhu-1 Madhu-1 left a comment

Choose a reason for hiding this comment

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

Please fix the CI failures

@mergify
Copy link
Contributor

mergify bot commented Apr 20, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

@Madhu-1
Copy link
Collaborator

Madhu-1 commented Apr 21, 2023

@riya-singhal31 please rebase the PR

@riya-singhal31
Copy link
Contributor Author

@riya-singhal31 please rebase the PR

Rebased, thanks!

@riya-singhal31
Copy link
Contributor Author

It seems like a bug in operator-sdk client.go operator-framework/operator-sdk#6396

@mergify
Copy link
Contributor

mergify bot commented Apr 21, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

@mergify
Copy link
Contributor

mergify bot commented Apr 28, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

@riya-singhal31
Copy link
Contributor Author

Thanks for the commits @nixpanic. I'll take a look and fix the rest of CIs.

@mergify
Copy link
Contributor

mergify bot commented May 2, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

@riya-singhal31 riya-singhal31 added the dependency/k8s depends on Kubernetes features label May 8, 2023
@mergify
Copy link
Contributor

mergify bot commented May 9, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented May 19, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

@Rakshith-R Rakshith-R linked an issue May 30, 2023 that may be closed by this pull request
4 tasks
@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 30, 2023

@riya-singhal31 can you please refresh the PR?

riya-singhal31 and others added 4 commits May 31, 2023 15:53
Signed-off-by: riya-singhal31 <rsinghal@redhat.com>
replaced ErrWaitTimeout with Interrupted

Signed-off-by: riya-singhal31 <rsinghal@redhat.com>
It seems `ceph-selinux` now needs `/etc/selinux/config`, otherwise
installing will fail.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
Kubernetes 1.27 is not compatible with any released controller-runtime
version. A commit that addresses the issue is only available in the
`main` branch of the project for now, so rebasing to that version.

See-also: kubernetes-sigs/controller-runtime#2223
Signed-off-by: Niels de Vos <ndevos@ibm.com>
Signed-off-by: Niels de Vos <ndevos@ibm.com>
Signed-off-by: Niels de Vos <ndevos@ibm.com>
@riya-singhal31
Copy link
Contributor Author

riya-singhal31 commented May 31, 2023

@riya-singhal31 can you please refresh the PR?

Thanks, rebased.
Fixing the linters.

@mergify
Copy link
Contributor

mergify bot commented Jun 1, 2023

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependency/k8s depends on Kubernetes features rebase update the version of an external component
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Kubernetes dependencies/CI to 1.27
3 participants