Merge "Add metrics-server addon"