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.

Sign up for GitHub

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

Jump to bottom

update kubernetes dep to 1.31.0 #4763

Merged
merged 6 commits into from
Aug 20, 2024
Merged

update kubernetes dep to 1.31.0 #4763

merged 6 commits into from
Aug 20, 2024

Conversation

Madhu-1
Copy link
Collaborator

@Madhu-1 Madhu-1 commented Aug 14, 2024

Updating the kubernetes dependency to 1.31 release

@nixpanic
Copy link
Member

Looks like there is a conflict with controller-runtime?

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Aug 14, 2024

Looks like there is a conflict with controller-runtime?

Yes we need new release of it, We can keep this on hold for now. let me check this later

@nixpanic nixpanic marked this pull request as draft August 14, 2024 08:04
@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 14, 2024

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

@Madhu-1 Madhu-1 marked this pull request as ready for review August 19, 2024 08:43
@Madhu-1 Madhu-1 added the backport-to-release-v3.12 Label to backport from devel to release-v3.12 branch label Aug 19, 2024
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Aug 19, 2024

Added backport to 3.12 to avoid merge conflicts as this changing lot of things on the vendor side.

@Rakshith-R
Copy link
Contributor

Added backport to 3.12 to avoid merge conflicts as this changing lot of things on the vendor side.

We don't usual backport dependency changes to previous releases so it should be fine ?
I think its a big change(risky too) to backport.
3.12.0 will be using k8s v1.30. apis while 3.12.1 will be using k8s v1.31 apis

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Aug 19, 2024

Added backport to 3.12 to avoid merge conflicts as this changing lot of things on the vendor side.

We don't usual backport dependency changes to previous releases so it should be fine ? I think its a big change(risky too) to backport. 3.12.0 will be using k8s v1.30. apis while 3.12.1 will be using k8s v1.31 apis

am fine for with that, as long as we don't have problem with solving merge conflict.

@Madhu-1 Madhu-1 removed the backport-to-release-v3.12 Label to backport from devel to release-v3.12 branch label Aug 19, 2024
@nixpanic
Copy link
Member

Added backport to 3.12 to avoid merge conflicts as this changing lot of things on the vendor side.

We don't usual backport dependency changes to previous releases so it should be fine ? I think its a big change(risky too) to backport. 3.12.0 will be using k8s v1.30. apis while 3.12.1 will be using k8s v1.31 apis

am fine for with that, as long as we don't have problem with solving merge conflict.

If really needed, we can always backport this at a later time.

@Madhu-1 Madhu-1 requested a review from a team August 19, 2024 12:13
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Aug 19, 2024

@Mergifyio queue

@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 19, 2024 •
edited
Loading

queue

🛑 The pull request has been removed from the queue default

Pull request #4763 has been dequeued due to: GitHub cannot generate the files list because there are too many files to process.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@Madhu-1
rebase: update kubernetes in api folder
c806ef6 
updating the kubernetes to 1.31.0 in the
api folder.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1
rebase: update kubernetes to latest
6eb50b2 
updating the kubernetes release to the
latest in main go.mod

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1
rebase: update controller-runtime
9fcd645 
update controller-runtime to latest
release.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1
rebase: update go-ceph to latest
c3cf15e 
updating go-ceph to latest
0.29.0 release.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1
rebase: add k8s.io/cri-client to go.mod
8c3f8a1 
adding k8s.io/cri-client to the replace
section in the go.mod to fix below problem

```
running: go list -mod=readonly -m all
go: k8s.io/cri-client@v0.0.0:
invalid version: unknown revision v0.0.0
```

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1
rebase: remove prometheus from replace
3b50935 
removed prometheus/client_golang and
prometheus/common from replace section
in go.mod as they are not required anymore
to be in replace section.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@mergify mergify bot added the ok-to-test Label to trigger E2E tests label Aug 19, 2024
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.31

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Aug 19, 2024
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Aug 20, 2024

@Mergifyio refresh

@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 20, 2024

refresh

✅ Pull request refreshed

@mergify mergify bot merged commit af47630 into ceph:devel Aug 20, 2024
38 checks passed
This was referenced Aug 20, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rakshith-R Rakshith-R Rakshith-R approved these changes

@nixpanic nixpanic nixpanic approved these changes

@iPraveenParihar iPraveenParihar Awaiting requested review from iPraveenParihar

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Madhu-1 @nixpanic @Rakshith-R @ceph-csi-bot