Merge pull request #17003 from spowelljr/fixGopogh #2586

Job	Run time
build_minikube	14m 38s
lint	4m 59s
unit_test	3m 18s
functional_baremetal_ubuntu20_04	5m 43s
functional_podman_ubuntu	8m 23s
functional_docker_ubuntu	7m 23s
functional_docker_containerd_ubuntu	8m 23s
functional_virtualbox_macos	12m 28s
upload_all_reports	23s
	1h 5m 38s

Provide feedback