Merge pull request #5 from weaveworks/register-clusters

yiannistri · web-flow · commit 022445df9f81 · 2021-11-23T16:32:22.000+02:00
Register the CAPI cluster schema.
diff --git a/main.go b/main.go
@@ -33,6 +33,7 @@ import (
 
 	capiv1alpha1 "github.com/weaveworks/cluster-bootstrap-controller/api/v1alpha1"
 	"github.com/weaveworks/cluster-bootstrap-controller/controllers"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -45,6 +46,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(capiv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(clusterv1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import (`
`33`	`33`
`34`	`34`	`capiv1alpha1 "github.com/weaveworks/cluster-bootstrap-controller/api/v1alpha1"`
`35`	`35`	`"github.com/weaveworks/cluster-bootstrap-controller/controllers"`
	`36`	`+ clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"`
`36`	`37`	`//+kubebuilder:scaffold:imports`
`37`	`38`	`)`
`38`	`39`
`@@ -45,6 +46,7 @@ func init() {`
`45`	`46`	`utilruntime.Must(clientgoscheme.AddToScheme(scheme))`
`46`	`47`
`47`	`48`	`utilruntime.Must(capiv1alpha1.AddToScheme(scheme))`
	`49`	`+ utilruntime.Must(clusterv1.AddToScheme(scheme))`
`48`	`50`	`//+kubebuilder:scaffold:scheme`
`49`	`51`	`}`
`50`	`52`