Automated cherry pick of #3999 #4199 upstream cluster autoscaler release 1.22#4268
Merged
k8s-ci-robot merged 3 commits intokubernetes:cluster-autoscaler-release-1.22 from gjtempleton:automated-cherry-pick-of-#3999-#4199-upstream-cluster-autoscaler-release-1.22Aug 16, 2021
+188-24