Signed-off-by: Marc Khouzam <marc.khouzam@montreal.ca> Kubernetes-commit: 9625872d1e4fd0d4d397b3ab732c6969a3a376fe