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

docs: Automated CherryPick Update for release-v4.4 #4105

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

sealos-ci-robot
Copy link
Member

@sealos-ci-robot sealos-ci-robot commented Oct 17, 2023

🤖 Generated by Copilot at 974d8aa

Summary

🌎🛠️🌡️

Add global environment variables for cluster mounts. This change modifies the preProcess function in pkg/apply/processor/create.go to merge the cluster spec's env field with the existing environment variables for each mount object.

env from spec
merges with mount variables
autumn of cluster

Walkthrough

  • Add global environment variables for the cluster (link)

Automated changes by create-pull-request GitHub action

@sweep-ai
Copy link

sweep-ai bot commented Oct 17, 2023

Apply Sweep Rules to your PR?

  • Apply: Leftover TODOs in the code should be handled.
  • Apply: All new business logic should have corresponding unit tests in the tests/ directory.
  • Apply: Any clearly inefficient or repeated code should be optimized or refactored.

@codecov
Copy link

codecov bot commented Oct 17, 2023

Codecov Report

All modified lines are covered by tests ✅

📢 Thoughts on this report? Let us know!.

@cuisongliu cuisongliu added this to the v4.3 milestone Oct 17, 2023
@cuisongliu cuisongliu merged commit 33aee73 into release-v4.4 Oct 17, 2023
126 checks passed
@cuisongliu cuisongliu deleted the cherry-pick-release-v4.4-4100 branch October 17, 2023 04:58
@sealos-ci-robot
Copy link
Member Author

/cherry-pick release-v4.3

@sealos-ci-robot
Copy link
Member Author

🤖 says: Error cherry-picking.

Auto-merging pkg/apply/processor/create.go
CONFLICT (content): Merge conflict in pkg/apply/processor/create.go
error: could not apply 33aee73... fix: merge cluster.spec.env (#4100) (#4105)
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 Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants