/assign @apelisse @liggitt

glad to see the test change in test/integration/client/client_test.go from #105983 wasn't needed with this PR

will defer review to @apelisse and can approve the dep update once this has lgtm

Awesome, thanks!
/lgtm
/approve

/approve

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse, jiahuif, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

@liggitt Actually, I forgot to update the integration test. We still need to update the test because the order in it was wrong.
What the test expects:
{nginx} apply {sidecar} = {sidecar, nginx}
what we want
{nginx} apply {sidecar} = {nginx, sidecar}, because we are expecting the apply to append new items from RHS.

The test was written with no assumption about the order. Now that we fix the ordering issue, we should enforce it in the test as well.

Yeah, reading the test, it looks like side-car was applied first and then nginx. So we should have nginx last which is what we have now.
/lgtm

I see container env vars have the same merge strategy as init containers. Does this change address the ordering of both fields?

Yes it does! Under the hood they are both using the list merge algorithm.

I see container env vars have the same merge strategy as init containers. Does this change address the ordering of both fields?

/triage accepted