Merge pull request #18078 from spowelljr/fixTidy #2979

Job	Run time
build_minikube	7m 5s
build_minikube_test_binaries	3m 31s
lint	3m 35s
unit_test	2m 34s
functional_podman_ubuntu	8m 42s
functional_virtualbox_macos	37m 22s
functional_baremetal_ubuntu20_04	5m 23s
functional_docker_containerd_ubuntu	6m 14s
functional_docker_ubuntu	7m 21s
upload_all_reports	10s
	1h 21m 57s

Provide feedback