✨ scheme should have all builtin types registered by default

Mengqi Yu · Mengqi Yu · commit 10541635ddcf · 2019-06-19T11:10:00.000-07:00
diff --git a/pkg/scaffold/v2/main.go b/pkg/scaffold/v2/main.go
@@ -119,6 +119,7 @@ import (
 	"flag"
     "os"
 
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
     ctrl "sigs.k8s.io/controller-runtime"
     "sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -129,7 +130,7 @@ import (
 )
 
 var (
-    scheme = runtime.NewScheme()
+	scheme   = clientgoscheme.Scheme
     setupLog = ctrl.Log.WithName("setup")
 )
 
diff --git a/testdata/project-v2/main.go b/testdata/project-v2/main.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	scheme   = runtime.NewScheme()
+	scheme   = clientgoscheme.Scheme
 	setupLog = ctrl.Log.WithName("setup")
 )
 

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ import (`
`119`	`119`	`"flag"`
`120`	`120`	`"os"`
`121`	`121`
	`122`	`+ clientgoscheme "k8s.io/client-go/kubernetes/scheme"`
`122`	`123`	`_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"`
`123`	`124`	`ctrl "sigs.k8s.io/controller-runtime"`
`124`	`125`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`@@ -129,7 +130,7 @@ import (`
`129`	`130`	`)`
`130`	`131`
`131`	`132`	`var (`
`132`		`- scheme = runtime.NewScheme()`
	`133`	`+ scheme = clientgoscheme.Scheme`
`133`	`134`	`setupLog = ctrl.Log.WithName("setup")`
`134`	`135`	`)`
`135`	`136`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"os"`
`22`	`22`
`23`	`23`	`corev1 "k8s.io/api/core/v1"`
`24`		`- "k8s.io/apimachinery/pkg/runtime"`
	`24`	`+ clientgoscheme "k8s.io/client-go/kubernetes/scheme"`
`25`	`25`	`_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"`
`26`	`26`	`ctrl "sigs.k8s.io/controller-runtime"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`var (`
`34`		`- scheme = runtime.NewScheme()`
	`34`	`+ scheme = clientgoscheme.Scheme`
`35`	`35`	`setupLog = ctrl.Log.WithName("setup")`
`36`	`36`	`)`
`37`	`37`