Check for merge conflicts

Merge pull request #5351 from k0sproject/backport-5348-to-release-1.31 #2888

Sign in to view logs

Summary
Jobs
- main
Run details
- Usage
- Workflow file

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
main	2m 2s
	2m 2s