Merge "Fixed k8s, calico dashbord for MCP infra"