Change kustomize edit fix to split patchesStrategicMerge entries before converting them to patch entries.

[brianpursley]

Change kustomize edit fix to split patchesStrategicMerge entries before converting them to patch entries.

Fixes #5040

[brianpursley]

Hmm, I think there might be something wrong with the GitHub action. make lint succeeds locally, but is "terminated" without a descriptive error when run on GitHub.

----------------------------------------------------------
Running command in /api
----------------------------------------------------------
make[1]: Entering directory '/home/runner/work/kustomize/kustomize/api'
Makefile:7: warning: overriding recipe for target 'test'
../Makefile-modules.mk:23: warning: ignoring old recipe for target 'test'
Makefile:10: warning: overriding recipe for target 'build'
../Makefile-modules.mk:38: warning: ignoring old recipe for target 'build'
/home/runner/go/bin/golangci-lint \
  -c $KUSTOMIZE_ROOT/.golangci.yml \
  --path-prefix api \
  run ./...
make[1]: *** [../Makefile-modules.mk:17: lint] Terminated
make: *** wait: No child processes.  Stop.
make: *** Waiting for unfinished jobs....
make: *** wait: No child processes.  Stop.
Error: The operation was canceled.

[koba1t]

@brianpursley

Hmm, I think there might be something wrong with the GitHub action. make lint succeeds locally, but is "terminated" without a descriptive error when run on GitHub

This lint failure may fix after doing rebase master. I found the same problem on a few PRs.
I'm guessing Github Actions exec merge master before running CI.

So if this lint error happened after the merge process, rebase master is needed to find problems.

[brianpursley]

Ah, thanks @koba1t

That makes sense. I'll give that a try

[koba1t]

Hmm...
My PR updating golangci-lint passed the lint check.

[koba1t]

So, Maybe this lint failure was caused by a down for GitHub Actions.
Could you try to re-run actions?

If that lint fails again, we update golangci-lint quickly.

[koba1t]

Hi @brianpursley
My PR is merged.
Could you retry rebase master?

[k8s-ci-robot]

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

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/test-infra repository.

[brianpursley]

/assign @KnVerey

[koba1t]

/triage accepted
/ok-to-test
/priority important-soon
/kind feature

[pre]

Could this PR receive some attention and love?

We have quite a big manifest repository and our linting is currently swamped with the warnings from

# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.

Getting rid of the warning would be great, but splitting the files manually is busywork if multi-file support for kustomize edit fix is just around the corner.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: brianpursley
Once this PR has been reviewed and has the lgtm label, please ask for approval from knverey. For more information see the Kubernetes Code Review Process.

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

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

[brianpursley]

@pre sorry this fell off my radar. I made some changes and resolved the open comments. We'll see if we can get this back on track.

[brianpursley]

/assign @natasha41575

[pre]

tide Pending — Not mergeable. Needs approved, lgtm labels

Otherwise OK ?

[stormqueen1990]

/cc

[stormqueen1990]

Code-wise, this looks good to me, but it looks like merging #5194 also fixed #5040. I tried to reproduce the issue with the latest release of kustomize (v5.2.1, released on Oct 19th) and was unable to.

[natasha41575]

@stormqueen1990 Thanks for taking a look!

It looks like #5194 changes patchesStrategicMerge to accept a file that contains multiple patches. Meaning that when you run kustomize edit fix to convert patches to patchesStrategicMerge, it no longer throws an error when you have a file with multiple patches.

In that case, I think this PR is not needed anymore, @brianpursley can you please confirm before we close this?

[natasha41575]

@brianpursley closing this per my understanding in #5059 (comment), please LMK if I misunderstood something and you'd like to reopen it.