kubeadm: fix conversion macros and add kubeadm to round trip testing

2016-10-11 10:43:05 -07:00
parent d9cc8119ef
commit 25e4dccefe
12 changed files with 69 additions and 15 deletions
--- a/pkg/api/serialization_proto_test.go
+++ b/pkg/api/serialization_proto_test.go
@@ -36,7 +36,9 @@ import (
 	"k8s.io/kubernetes/pkg/util/sets"
 )

-var nonProtobaleAPIGroups = sets.NewString()
+var nonProtobaleAPIGroups = sets.NewString(
+	"kubeadm.k8s.io",
+)

 func init() {
 	codecsToTest = append(codecsToTest, func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, bool, error) {