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

[linghaoSu]

Fixes #18725

Before:

After

Checklist:

• Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
• The title of the PR states what changed and the related issues number (used for the release note).
• The title of the PR conforms to the Toolchain Guide
• I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
• I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
• Does this PR require documentation updates?
• I've updated documentation as required by this PR.
• I have signed off all my commits as required by DCO
• I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
• My build is green (troubleshooting builds).
• My new feature complies with the feature status guidelines.
• I have added a brief description of why this PR is necessary and/or what this PR solves.
• Optional. My organization is added to USERS.md.
• Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

[bunnyshell]

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

• 🚀 /bns:deploy to deploy the environment

[bunnyshell]

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

• 🚀 /bns:deploy to deploy the environment

[codecov]

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]

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

[alexef]

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]

@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]

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

[alexef]

couple of questions

[linghaoSu]

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 :)

[linghaoSu]

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.

[linghaoSu]

Hi @crenshaw-dev,

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

[crenshaw-dev]

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]

linghaoSu#1

[crenshaw-dev]

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

[crenshaw-dev]

/cherry-pick release-2.13

[gcp-cherry-pick-bot]

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

[crenshaw-dev]

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

[linghaoSu]

Hi @crenshaw-dev,

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

[linghaoSu]

@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.