Merge "Add kubernetes proxy classes"