Fix issue with returning errors, and not adding scheme (#1049)

codegen/cmd/injection-gen/generators/packages.go

@@ -409,6 +409,7 @@ func reconcilerPackages(basePackage string, groupPkgName string, gv clientgentyp
 					imports:             generator.NewImportTracker(),
 					clientPkg:           clientPackagePath,
 					informerPackagePath: informerPackagePath,
+					schemePkg:           filepath.Join(customArgs.VersionedClientSetPackage, "scheme"),
 				})
 
 				return generators

codegen/cmd/injection-gen/generators/reconciler_controller.go

@@ -33,6 +33,7 @@ type reconcilerControllerGenerator struct {
 	filtered      bool
 
 	clientPkg           string
+	schemePkg           string
 	informerPackagePath string
 }
 
@@ -85,6 +86,14 @@ func (g *reconcilerControllerGenerator) GenerateType(c *generator.Context, t *ty
 			Package: g.informerPackagePath,
 			Name:    "Get",
 		}),
+		"schemeScheme": c.Universe.Function(types.Name{
+			Package: "k8s.io/client-go/kubernetes/scheme",
+			Name:    "Scheme",
+		}),
+		"schemeAddToScheme": c.Universe.Function(types.Name{
+			Package: g.schemePkg,
+			Name:    "Scheme",
+		}),
 	}
 
 	sw.Do(reconcilerControllerNewImpl, m)
@@ -116,4 +125,7 @@ func NewImpl(ctx context.Context, r Interface) *{{.controllerImpl|raw}} {
 	return impl
 }
 
+func init() {
+	{{.schemeAddToScheme|raw}}({{.schemeScheme|raw}})
+}
 `

codegen/cmd/injection-gen/generators/reconciler_reconciler.go

@@ -245,11 +245,13 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
 		var event *{{.reconcilerReconcilerEvent|raw}}
 		if reconciler.EventAs(reconcileEvent, &event) {
 			r.Recorder.Eventf(resource, event.EventType, event.Reason, event.Format, event.Args...)
+			return nil
 		} else {
 			r.Recorder.Event(resource, {{.corev1EventTypeWarning|raw}}, "InternalError", reconcileEvent.Error())
+			return reconcileEvent.Error()
 		}
 	}
-	return reconcileEvent
+	return nil
 }
 `