-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
refactor(main): unmount override container #4161
refactor(main): unmount override container #4161
Conversation
🤖 Generated by lychee actionSummary
Full action output |
Apply Sweep Rules to your PR?
|
0fd86df
to
d65da47
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅ 📢 Thoughts on this report? Let us know!. |
d65da47
to
f1388d2
Compare
1f58d0d
to
30c5ebb
Compare
pkg/apply/processor/install.go
Outdated
if index >= 0 { | ||
cluster.Status.Mounts[index] = *mount | ||
continue | ||
} | ||
cluster.Status.Mounts = append(cluster.Status.Mounts, *mount) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if index >= 0 {
cluster.Status.Mounts = append(cluster.Status.Mounts[:index], cluster.Status.Mounts[index+1:]...)
}
cluster.Status.Mounts = append(cluster.Status.Mounts, *mount)
pkg/apply/processor/install.go
Outdated
syncMounts := make([]v2.MountImage, 0) | ||
imageIndices := make(map[string]int) | ||
for _, mot := range cluster.Status.Mounts { | ||
if idx, exists := imageIndices[mot.ImageName]; exists { | ||
// 如果ImageName已经存在,替换旧的mot | ||
syncMounts[idx] = mot | ||
} else { | ||
// 如果ImageName不存在,添加新的mot并更新索引 | ||
imageIndices[mot.ImageName] = len(syncMounts) | ||
syncMounts = append(syncMounts, mot) | ||
} | ||
} | ||
cluster.Status.Mounts = syncMounts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
// de-duplicate, append the latest record to the tail.
mounts := make([]v2.MountImage, 0)
indexes := make(map[string]int)
for _, m := range cluster.Status.Mounts {
if idx, exists := indexes[m.ImageName]; exists {
mounts = append(mounts[:idx], mounts[idx+1:]...)
}
mounts = append(mounts, *m.DeepCopy())
indexes[m.ImageName] = len(mounts) - 1
}
cluster.Status.Mounts = mounts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also move this code block to L189
ef76318
to
6877b05
Compare
🤖 Generated by deploy action |
57d21f5
to
41db6ef
Compare
Signed-off-by: cuisongliu <cuisongliu@qq.com>
41db6ef
to
49bdb87
Compare
/cherry-pick release-v4.4 |
🤖 says: cherry pick action finished successfully 🎉! |
Signed-off-by: cuisongliu <cuisongliu@qq.com>
Signed-off-by: cuisongliu <cuisongliu@qq.com> (cherry picked from commit 4fed20a) Signed-off-by: cuisongliu <cuisongliu@qq.com>
* add license app to cloud. (labring#4196) Signed-off-by: yy <lingdie.yy@outlook.com> * feature(main): skip sealos.run rule (labring#4198) * Update README (labring#4197) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * add cronjob app to cloud. (labring#4201) Signed-off-by: yy <lingdie.yy@outlook.com> * fix run init job. (labring#4202) Signed-off-by: yy <lingdie.yy@outlook.com> * feat service license (labring#4195) * feat: license service Signed-off-by: jingyang <3161362058@qq.com> * done * tempalte Signed-off-by: jingyang <3161362058@qq.com> * done Signed-off-by: jingyang <3161362058@qq.com> * done Signed-off-by: jingyang <3161362058@qq.com> * docker build Signed-off-by: jingyang <3161362058@qq.com> * done Signed-off-by: jingyang <3161362058@qq.com> * license yaml Signed-off-by: jingyang <3161362058@qq.com> * image * fix type bg * env * add oss Signed-off-by: jingyang <3161362058@qq.com> * done Signed-off-by: jingyang <3161362058@qq.com> cluster done Signed-off-by: jingyang <3161362058@qq.com> done Signed-off-by: jingyang <3161362058@qq.com> cluster done Signed-off-by: jingyang <3161362058@qq.com> done cluster Signed-off-by: jingyang <3161362058@qq.com> done Signed-off-by: jingyang <3161362058@qq.com> * fix build Signed-off-by: jingyang <3161362058@qq.com> * fix oss && only zh Signed-off-by: jingyang <3161362058@qq.com> * feat checkout wechat Signed-off-by: jingyang <3161362058@qq.com> * fix ci Signed-off-by: jingyang <3161362058@qq.com> --------- Signed-off-by: jingyang <3161362058@qq.com> * Docs: update "What is Sealos?" (labring#4200) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * refactor(main): unmount override container (labring#4161) Signed-off-by: cuisongliu <cuisongliu@qq.com> * feat: Create a demo plugin Monitor (labring#4184) * feat: lens demo of web version * chore: add & remove some packages * fix: connect to desktop bug and change icon * init: plugin Monitor init * style: restore frontend/pnpm-workspace.yaml & pnpm-lock.yaml and create new ones in plugins/monitor * restore: frontend/Makefile * restore: frontend/pnpm-workspace.yaml * restore * feat:frontend license app (labring#4203) * feat:frontend license app Signed-off-by: jingyang <3161362058@qq.com> * fix Signed-off-by: jingyang <3161362058@qq.com> * fix * fix detail Signed-off-by: jingyang <3161362058@qq.com> --------- Signed-off-by: jingyang <3161362058@qq.com> * Docs: update introduction (labring#4207) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * fix license db uri (labring#4211) Signed-off-by: yy <lingdie.yy@outlook.com> * update price (labring#4212) * docs: Automated Changelog Update for v4.3.7 (labring#4210) * 🤖 add release changelog using robot. Signed-off-by: sealos-release-robot <sealos-release-robot@sealos.io> * Update CHANGELOG.md --------- Signed-off-by: sealos-release-robot <sealos-release-robot@sealos.io> Co-authored-by: cuisongliu <cuisongliu@qq.com> * 🤖 add release changelog using rebot. (labring#4213) * add alt names. (labring#4214) Signed-off-by: yy <lingdie.yy@outlook.com> * Update the workflow to automatically update the website image after the image is built (labring#4209) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * fix(costcenter): fix unit & invoice amount (labring#4194) * feat:docs add private cloud page (labring#4215) * fix scripts (labring#4217) * Fix database provider i18n. (labring#4216) Signed-off-by: zzjin <tczzjin@gmail.com> * fix user avator && url (labring#4218) * fix user avator && url Signed-off-by: jingyang <3161362058@qq.com> * modify purchase page Signed-off-by: jingyang <3161362058@qq.com> * fix height Signed-off-by: jingyang <3161362058@qq.com> * fix docs Signed-off-by: jingyang <3161362058@qq.com> * fix params * copy code * license time --------- Signed-off-by: jingyang <3161362058@qq.com> * fix oss file name && docs footer (labring#4220) * feat(frontend/desktop):support modify team limit (labring#4221) * add acme resolver monitoring (labring#4223) * feat:docs language-differentiated domain names (labring#4226) * feat:standard cluster purchase process (labring#4225) * feat:standard cluster purchase process Signed-off-by: jingyang <3161362058@qq.com> * fix cronjob Signed-off-by: jingyang <3161362058@qq.com> --------- Signed-off-by: jingyang <3161362058@qq.com> * add cloud release ci. Signed-off-by: yy <lingdie.yy@outlook.com> --------- Signed-off-by: yy <lingdie.yy@outlook.com> Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Signed-off-by: jingyang <3161362058@qq.com> Signed-off-by: cuisongliu <cuisongliu@qq.com> Signed-off-by: sealos-release-robot <sealos-release-robot@sealos.io> Signed-off-by: zzjin <tczzjin@gmail.com> Co-authored-by: cuisongliu <cuisongliu@qq.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: zhujingyang <72259332+zjy365@users.noreply.github.com> Co-authored-by: Wishrem <97738578+Wishrem@users.noreply.github.com> Co-authored-by: Jiahui <4543bxy@gmail.com> Co-authored-by: sealos-release-robot <sealos-release-robot@sealos.io> Co-authored-by: xudaotutou <13435638964@163.com> Co-authored-by: zzjin <zzjin@users.noreply.github.com>
🤖 Generated by Copilot at 0fd86df
Summary
🗑️⚡📷
This pull request adds a feature to
processor
to force override images in the cluster, and removes the redundantSetMountImage
function fromv1beta1
.Walkthrough
SetMountImage
frompkg/types/v1beta1/utils.go
(link)