Merge pull request #6511 from nilo19/fix/cherry-pick-6136-1-28 #231

Job	Run time
build-cloud-node-manager (linux, amd64)	1m 52s
build-acr-credential-provider (linux, amd64)	48s
build-cloud-node-manager (linux, arm)	1m 48s
build-cloud-controller-manager (linux, amd64)	1m 51s
build-acr-credential-provider (linux, arm)	48s
build-cloud-controller-manager (linux, arm)	1m 55s
build-acr-credential-provider (linux, arm64)	46s
build-cloud-node-manager (linux, arm64)	1m 55s
build-cloud-controller-manager (linux, arm64)	1m 56s
build-acr-credential-provider (windows, amd64)	46s
build-cloud-node-manager (windows, amd64)	1m 57s
publish	3m 28s
	19m 50s

Provide feedback