Update controller-gen, fix make test
#581
+911
−585
Merged
make test
#581