fix: preserve scalar source tag during merge

[notandruu]

Fixes #6140

This PR was written in part with the assistance of generative AI. I have reviewed and tested each change.

/kind bug

Strategic merge scalar replacement returns the patch scalar from merge2.VisitScalar, but map writeback goes through FieldSetter which preserves the existing destination style. So replacing a quoted scalar like '6%' with an integer 3 kept the old quoted style and emitted '3'. Fix: update the destination node with the origin node before returning so the patch scalar's tag and style are carried through.

[kubernetes-prow]

This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[kubernetes-prow]

Welcome @notandruu!

It looks like this is your first PR to kubernetes-sigs/kustomize 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kustomize has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[kubernetes-prow]

Hi @notandruu. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[kubernetes-prow]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: notandruu
Once this PR has been reviewed and has the lgtm label, please assign koba1t for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[notandruu]

@koba1t could you take a look when you have a moment? Happy to make any changes needed.

[koba1t]

@notandruu

You have created three PRs in rapid succession, do you understand that this type of behavior is considered "AI slop PR"?

It is also questionable whether the PR was created in accordance with the official AI guidelines.
https://www.kubernetes.dev/docs/guide/pull-requests/#ai-guidance

[notandruu]

Sorry about that I opened two PRs within the same session which understand looks like spam, and I didn't disclose AI assistance in the descriptions which I'm adding now. These each fix separate bugs I ran into and tested before submitting.