Merge "Use a more generic kubectl command to check status"