You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improved the management of MountImage instances in the installation process and removed unused code. Refactored the processor and v1beta1 packages to avoid conflicts and inconsistencies when applying the cluster configuration.
Sing, O Muse, of the skillful coder who refined The MountImage logic in the v1beta1 package And in the processor package, where he designed A better way to handle the cluster's image stack.
Walkthrough
Sort and deduplicate cluster.Status.Mounts before updating it with new MountImage instances (link, link)
Remove and append MountImage instances to cluster.Status.Mounts after updating their environment variables (link)
Modify FindImage function to return the index of the MountImage instance in addition to the pointer (link, link)
Remove SetMountImage function from pkg/types/v1beta1/utils.go as it is no longer needed (link)
Auto-merging pkg/apply/processor/install.go
CONFLICT (content): Merge conflict in pkg/apply/processor/install.go
Auto-merging pkg/types/v1beta1/cluster_args.go
CONFLICT (content): Merge conflict in pkg/types/v1beta1/cluster_args.go
error: could not apply 286c181... refactor(main): unmount override container (#4161) (#4205)
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".
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
sealos-ci-robot
added
area/apply
🤖 Generated by Copilot at a84b9d6
Summary
🔥🔧🔄
Improved the management of
MountImageinstances in the installation process and removed unused code. Refactored theprocessorandv1beta1packages to avoid conflicts and inconsistencies when applying the cluster configuration.Walkthrough
cluster.Status.Mountsbefore updating it with newMountImageinstances (link, link)MountImageinstances tocluster.Status.Mountsafter updating their environment variables (link)FindImagefunction to return the index of theMountImageinstance in addition to the pointer (link, link)SetMountImagefunction frompkg/types/v1beta1/utils.goas it is no longer needed (link)Automated changes by create-pull-request GitHub action