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

Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. #4281

Merged
merged 2 commits into from
Nov 10, 2023

Conversation

lingdie
Copy link
Collaborator

@lingdie lingdie commented Nov 9, 2023

🤖 Generated by Copilot at 96c7d24

Summary

📁🆙🌐

This pull request adds a new dependency on sealos-networkmanager-protoapi to the account controller and the pay service, and updates the go modules and workspaces to support it. It also updates some kubernetes modules to the latest patch versions. The purpose of these changes is to enable network configuration through the network manager service, which is a new component of the sealos project.

Sing, O Muse, of the sealos project and its mighty controllers
That in their code did weave a workspace for their go modules
And how they updated their dependencies with skill and care
To match the network manager service, the new star in their cluster

Walkthrough

  • Add a new dependency on the sealos-networkmanager-protoapi module to communicate with the network manager service from the account controller (link, link)
  • Update the grpc dependency version to match the version used by the sealos-networkmanager-protoapi module and avoid version conflicts (link, link)
  • Add a new file go.work to define a workspace for the go modules in the controllers directory and share dependencies (link, link)
  • Update the kubernetes modules versions to match the latest patch releases and get the bug fixes and improvements (link)
  • Update the pkg module version to use the latest version of the common utilities and types for the controllers (link)
  • Update the kube-openapi dependency version to match the version used by the kubernetes modules and avoid version conflicts (link)
  • Update the compute dependency version to match the version used by the kubernetes modules and avoid version conflicts (link)
  • Update the x/net dependency version to match the version used by the sealos-networkmanager-protoapi module and avoid version conflicts (link)
  • Update the x/term dependency version to match the version used by the kubernetes modules and avoid version conflicts (link)
  • Update the kr/pretty module version to match the version used by the sealos-networkmanager-protoapi module and avoid version conflicts (link)
  • Add new indirect dependencies on various modules that are required by the sealos-networkmanager-protoapi module, such as genproto, grpc, crypt, cncf/xds/go, dustin/go-humanize, envoyproxy/go-control-plane, felixge/httpsnoop, go-openapi/jsonreference, gobuffalo/flect, golang-jwt/jwt/v4, google/go-cmp, go.uber.org/zap, hashicorp/go-immutable-radix, kr/pretty, onsi/gomega, pelletier/go-toml, rogpeppe/go-internal, stretchr/testify, ugorji/go, x/crypto, x/mod, x/sync, x/sys, x/tools, jsonpatch/v2, klog/v2, structured-merge-diff/v4 (link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link)
  • Remove an indirect dependency on the mistifyio/go-zfs module, which is no longer used by any of the modules in the workspace (link)

Copy link

Whoa! Easy there, Partner!

This PR is too big. Please break it up into smaller PRs.

@sealos-ci-robot
Copy link
Member

sealos-ci-robot commented Nov 9, 2023

🤖 Generated by lychee action

Summary

Status Count
🔍 Total 981
✅ Successful 312
⏳ Timeouts 0
🔀 Redirected 0
👻 Excluded 668
❓ Unknown 0
🚫 Errors 0

Full action output

Full Github Actions output

Copy link

sweep-ai bot commented Nov 9, 2023

Apply Sweep Rules to your PR?

  • Apply: All new business logic should have corresponding unit tests.
  • Apply: Refactor large functions to be more modular.

Copy link

codecov bot commented Nov 9, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

📢 Thoughts on this report? Let us know!

@lingdie lingdie changed the title add controllers go work. add sub go work. Nov 9, 2023
@lingdie
Copy link
Collaborator Author

lingdie commented Nov 9, 2023

After bump k8s v0.25.6 to v0.27.4 in main go.mod and images-cri-shim's go.mod, you can see output:

image

and at the same time, controllers are still using v0.25.6 and make build successed:

image

@lingdie lingdie changed the title add sub go work. Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. Nov 9, 2023
@bxy4543 bxy4543 added the need-e2e-apply-test need-e2e-apply-test label Nov 9, 2023
@sealos-ci-robot
Copy link
Member

🤖 says: E2E ARM64 Apply Test Result: Success 🎉🎉! , E2E AMD64 Apply Test Result: Success 🎉🎉!
See: https://github.com/labring/sealos/actions/runs/6808536366

@cuisongliu cuisongliu added this to the v4.4 milestone Nov 10, 2023
@cuisongliu cuisongliu merged commit e6a9868 into labring:main Nov 10, 2023
86 checks passed
@sealos-ci-robot
Copy link
Member

/cherry-pick release-v4.4

@sealos-ci-robot
Copy link
Member

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): controllers/account/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of controllers/account/go.mod left in tree.
CONFLICT (modify/delete): controllers/account/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of controllers/account/go.sum left in tree.
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (implicit dir rename): Existing file/dir at go.work in the way of implicit directory rename(s) putting the following path(s) there: controllers/go.work.
Auto-merging go.work
CONFLICT (implicit dir rename): Existing file/dir at go.work.sum in the way of implicit directory rename(s) putting the following path(s) there: controllers/go.work.sum.
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
CONFLICT (modify/delete): service/database/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/database/go.mod left in tree.
CONFLICT (modify/delete): service/database/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/database/go.sum left in tree.
CONFLICT (modify/delete): service/pay/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/pay/go.mod left in tree.
CONFLICT (modify/delete): service/pay/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/pay/go.sum left in tree.
error: could not apply e6a9868... Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@sealos-ci-robot
Copy link
Member

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/6819789179

lingdie added a commit to lingdie/sealos that referenced this pull request Nov 10, 2023
cuisongliu pushed a commit that referenced this pull request Nov 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants