Signed-off-by: Mike Spreitzer <mspreitz@us.ibm.com> Kubernetes-commit: 9aa9d3d4b7c637a0796e5a25c312a999ac628bd9