fix(controller/ui): fix pod with sidecar state #19843

linghaoSu · 2024-09-09T03:49:11Z

Fixes #18725

Before:

After

Checklist:

bunnyshell · 2024-09-09T03:49:17Z

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

🚀 /bns:deploy to deploy the environment

bunnyshell · 2024-09-09T03:49:18Z

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

🚀 /bns:deploy to deploy the environment

codecov · 2024-09-09T05:17:42Z

Codecov Report

Attention: Patch coverage is 96.66667% with 1 line in your changes missing coverage. Please review.

Please upload report for BASE (master@cf498f6). Learn more about missing BASE report.
Report is 16 commits behind head on master.

Files with missing lines	Patch %	Lines
controller/cache/info.go	96.66%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##             master   #19843   +/-   ##
=========================================
  Coverage          ?   56.04%           
=========================================
  Files             ?      322           
  Lines             ?    44768           
  Branches          ?        0           
=========================================
  Hits              ?    25088           
  Misses            ?    17081           
  Partials          ?     2599

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

alexef · 2024-10-07T09:07:39Z

@linghaoSu why is this still a draft? anything missing?

alexef · 2024-10-07T09:09:54Z

I assume you also want to test in https://github.com/argoproj/argo-cd/blob/1e359c8c0d25dc3a223ab184c1d623bb4d68aa5a/controller/cache/info_test.go? Let me know if you have time to continue with this PR, otherwise I can also try to take over.

We really need this fix to land.

linghaoSu · 2024-10-08T01:22:33Z

@alexef Sorry for the delay. I'll try to get it done this week.

My fix pr in the dashboard is closed, so I'll refer to the merged fixes for this one.

linghaoSu · 2024-10-08T10:30:33Z

Hi @alexef, I believe this PR is ready for review. Could you please take a look?

References the dashboard pr: https://github.com/kubernetes/dashboard/pull/9483/files#diff-207a2dad9e596869b3612d332964328e081f20fb9cbeb6f9bbb41dfa13472152R39-R124

controller/cache/info.go

ui/src/app/applications/components/utils.tsx

controller/cache/info_test.go

alexef

couple of questions

linghaoSu · 2024-10-09T10:45:08Z

I included restartable initContainers in the total container calculation, following the approach used in kubectl.

https://github.com/kubernetes/kubernetes/blob/f7fef0384ec1c666e6b68cae83a3b3c6d95aa7b0/pkg/printers/internalversion/printers.go#L887-L892

@alexef If it's convenient, could you please review it again?

alexef

great. now we only need an approver :)

Signed-off-by: linghaoSu <linghao.su@daocloud.io>

…play Signed-off-by: linghaoSu <linghao.su@daocloud.io>

linghaoSu · 2024-10-12T02:55:48Z

Hi @crenshaw-dev,

I believe this PR is ready for review. Could you please take a look? This issue has 16 thumbs up, so it might be helpful to address it.

If you spot any potential issues with this PR, please let me know, and I'll be happy to work on fixing them.

Thanks!

crenshaw-dev

Thanks for the PR! Just a few nitpicks and requests for code coverage.

controller/cache/info.go

controller/cache/info_test.go

controller/cache/info.go

ui/src/app/applications/components/utils.tsx

Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Linghao Su <slh001@live.cn>

Signed-off-by: linghaoSu <linghao.su@daocloud.io>

linghaoSu · 2024-10-14T13:38:23Z

Hi @crenshaw-dev,

Thank you for your suggestions! I believe I've addressed all the comments. Could you please take another look?

crenshaw-dev · 2024-10-15T17:20:25Z

Looking good! Bear with me a bit, I want to scope-creep this PR a bit to solve some problems with the UI code:

Notice the Init: 1) message. I think we can fix that pretty easily. I'll open a PR against yours.

crenshaw-dev · 2024-10-15T18:01:21Z

linghaoSu#1

crenshaw-dev

This LGTM, will follow up with the UI fix. Thanks!

crenshaw-dev · 2024-10-15T19:05:42Z

/cherry-pick release-2.13

gcp-cherry-pick-bot · 2024-10-15T19:05:52Z

Cherry-pick failed with Merge error e80de49043f3ba0d876bc30f6aab789e8f8d413f into temp-cherry-pick-529385-release-2.13

crenshaw-dev · 2024-10-15T19:06:10Z

@linghaoSu would you mind opening cherry-picks for 2.10-2.13?

* fix(controller): change pod status calculate with sidecar Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(controller): add restartable sidecar count in total container display Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(controller): update info test case conditions Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Linghao Su <slh001@live.cn> * fix(controller): add more test case to cover more conditions Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(ui): check is condition exist before for of Signed-off-by: linghaoSu <linghao.su@daocloud.io> --------- Signed-off-by: linghaoSu <linghao.su@daocloud.io> Signed-off-by: Linghao Su <slh001@live.cn> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

linghaoSu · 2024-10-16T02:27:52Z

Hi @crenshaw-dev,

I've manually cherry-picked this fix to 2.10-2.13. Could you please take a look at those PRs?

* fix(controller): change pod status calculate with sidecar Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(controller): add restartable sidecar count in total container display Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(controller): update info test case conditions Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Linghao Su <slh001@live.cn> * fix(controller): add more test case to cover more conditions Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(ui): check is condition exist before for of Signed-off-by: linghaoSu <linghao.su@daocloud.io> --------- Signed-off-by: linghaoSu <linghao.su@daocloud.io> Signed-off-by: Linghao Su <slh001@live.cn> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: austin5219 <3936059+austin5219@users.noreply.github.com>

linghaoSu · 2024-10-16T03:12:50Z

@crenshaw-dev , However in 2.10 and 2.11, RestartPolicy is not a valid field in InitContainer, so this would cause a lint error. Perhaps we shouldn't cherry-pick this fix to those two releases.

* fix(controller): change pod status calculate with sidecar * fix(controller): add restartable sidecar count in total container display * fix(controller): update info test case conditions * fix(controller): add more test case to cover more conditions * fix(ui): check is condition exist before for of --------- Signed-off-by: linghaoSu <linghao.su@daocloud.io> Signed-off-by: Linghao Su <slh001@live.cn> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix(controller): change pod status calculate with sidecar Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(controller): add restartable sidecar count in total container display Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(controller): update info test case conditions Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Linghao Su <slh001@live.cn> * fix(controller): add more test case to cover more conditions Signed-off-by: linghaoSu <linghao.su@daocloud.io> * fix(ui): check is condition exist before for of Signed-off-by: linghaoSu <linghao.su@daocloud.io> --------- Signed-off-by: linghaoSu <linghao.su@daocloud.io> Signed-off-by: Linghao Su <slh001@live.cn> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Adrian Aneci <aneci@adobe.com>

linghaoSu mentioned this pull request Sep 22, 2024

REQUEST: New membership for @linghaoSu argoproj/argoproj#323

Closed

6 tasks

linghaoSu force-pushed the fix/sidecar-state branch from 020c9de to 79ace2c Compare October 8, 2024 10:27

linghaoSu force-pushed the fix/sidecar-state branch from 79ace2c to 5cbbc7d Compare October 8, 2024 13:55

linghaoSu marked this pull request as ready for review October 8, 2024 13:55

linghaoSu requested a review from a team as a code owner October 8, 2024 13:55

linghaoSu force-pushed the fix/sidecar-state branch 2 times, most recently from eefd2ce to b08fc2e Compare October 9, 2024 01:40

alexef reviewed Oct 9, 2024

View reviewed changes

controller/cache/info.go Outdated Show resolved Hide resolved

alexef reviewed Oct 9, 2024

View reviewed changes

controller/cache/info.go Outdated Show resolved Hide resolved

alexef reviewed Oct 9, 2024

View reviewed changes

ui/src/app/applications/components/utils.tsx Show resolved Hide resolved

alexef reviewed Oct 9, 2024

View reviewed changes

controller/cache/info_test.go Show resolved Hide resolved

alexef approved these changes Oct 9, 2024

View reviewed changes

linghaoSu added 2 commits October 12, 2024 10:40

fix(controller): change pod status calculate with sidecar

dde0a64

Signed-off-by: linghaoSu <linghao.su@daocloud.io>

fix(controller): add restartable sidecar count in total container dis…

75d6b80

…play Signed-off-by: linghaoSu <linghao.su@daocloud.io>

linghaoSu force-pushed the fix/sidecar-state branch from 8ca555d to 75d6b80 Compare October 12, 2024 02:49

crenshaw-dev changed the title ~~fix(controller): fix pod with sidercar state~~ fix(controller): fix pod with sidecar state Oct 12, 2024

crenshaw-dev changed the title ~~fix(controller): fix pod with sidecar state~~ fix(controller/ui): fix pod with sidecar state Oct 12, 2024

crenshaw-dev requested changes Oct 12, 2024

View reviewed changes

crenshaw-dev reviewed Oct 12, 2024

View reviewed changes

ui/src/app/applications/components/utils.tsx Show resolved Hide resolved

fix(controller): update info test case conditions

d7e6058

Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Linghao Su <slh001@live.cn>

linghaoSu added 2 commits October 14, 2024 21:19

fix(controller): add more test case to cover more conditions

da69897

Signed-off-by: linghaoSu <linghao.su@daocloud.io>

fix(ui): check is condition exist before for of

475ab2d

Signed-off-by: linghaoSu <linghao.su@daocloud.io>

crenshaw-dev approved these changes Oct 15, 2024

View reviewed changes

crenshaw-dev merged commit e80de49 into argoproj:master Oct 15, 2024
27 checks passed

linghaoSu mentioned this pull request Oct 16, 2024

fix(controller/ui): fix pod with sidecar state (cherry-pick #19843) #20393

Merged

linghaoSu mentioned this pull request Oct 16, 2024

fix(controller/ui): fix pod with sidecar state (cherry-pick #19843) #20394

Merged

linghaoSu mentioned this pull request Oct 16, 2024

fix(controller/ui): fix pod with sidecar state (cherry-pick #19843) #20395

Closed

linghaoSu mentioned this pull request Oct 16, 2024

fix(controller/ui): fix pod with sidecar state (cherry-pick #19843) #20396

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(controller/ui): fix pod with sidecar state #19843

fix(controller/ui): fix pod with sidecar state #19843

linghaoSu commented Sep 9, 2024 •

edited

Loading

bunnyshell bot commented Sep 9, 2024 •

edited

Loading

bunnyshell bot commented Sep 9, 2024 •

edited

Loading

codecov bot commented Sep 9, 2024 •

edited

Loading

alexef commented Oct 7, 2024

alexef commented Oct 7, 2024

linghaoSu commented Oct 8, 2024

linghaoSu commented Oct 8, 2024 •

edited

Loading

alexef left a comment

linghaoSu commented Oct 9, 2024

alexef left a comment

linghaoSu commented Oct 12, 2024

crenshaw-dev left a comment

linghaoSu commented Oct 14, 2024

crenshaw-dev commented Oct 15, 2024

crenshaw-dev commented Oct 15, 2024

crenshaw-dev left a comment

crenshaw-dev commented Oct 15, 2024

gcp-cherry-pick-bot bot commented Oct 15, 2024

crenshaw-dev commented Oct 15, 2024

linghaoSu commented Oct 16, 2024

linghaoSu commented Oct 16, 2024

fix(controller/ui): fix pod with sidecar state #19843

fix(controller/ui): fix pod with sidecar state #19843

Conversation

linghaoSu commented Sep 9, 2024 • edited Loading

Before:

After

bunnyshell bot commented Sep 9, 2024 • edited Loading

❌ Preview Environment deleted from Bunnyshell

bunnyshell bot commented Sep 9, 2024 • edited Loading

❌ Preview Environment deleted from Bunnyshell

codecov bot commented Sep 9, 2024 • edited Loading

Codecov Report

alexef commented Oct 7, 2024

alexef commented Oct 7, 2024

linghaoSu commented Oct 8, 2024

linghaoSu commented Oct 8, 2024 • edited Loading

alexef left a comment

Choose a reason for hiding this comment

linghaoSu commented Oct 9, 2024

alexef left a comment

Choose a reason for hiding this comment

linghaoSu commented Oct 12, 2024

crenshaw-dev left a comment

Choose a reason for hiding this comment

linghaoSu commented Oct 14, 2024

crenshaw-dev commented Oct 15, 2024

crenshaw-dev commented Oct 15, 2024

crenshaw-dev left a comment

Choose a reason for hiding this comment

crenshaw-dev commented Oct 15, 2024

gcp-cherry-pick-bot bot commented Oct 15, 2024

crenshaw-dev commented Oct 15, 2024

linghaoSu commented Oct 16, 2024

linghaoSu commented Oct 16, 2024

linghaoSu commented Sep 9, 2024 •

edited

Loading

bunnyshell bot commented Sep 9, 2024 •

edited

Loading

bunnyshell bot commented Sep 9, 2024 •

edited

Loading

codecov bot commented Sep 9, 2024 •

edited

Loading

linghaoSu commented Oct 8, 2024 •

edited

Loading