Merge "bird is no longer required for kubernetes"