Merge pull request #273 from weaveworks/libgitops_serializer_v2

Use the generic Serializer in libgitops, and fix some API machinery nits

cmd/controller/main.go

@@ -9,9 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	wks "github.com/weaveworks/wksctl/pkg/apis/wksprovider/controller/wksctl"
 	machineutil "github.com/weaveworks/wksctl/pkg/cluster/machine"
-	existinginfrav1 "github.com/weaveworks/wksctl/pkg/existinginfra/v1alpha3"
+	"github.com/weaveworks/wksctl/pkg/scheme"
 	"k8s.io/client-go/kubernetes"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -85,19 +84,14 @@ func run(cmd *cobra.Command, args []string) {
 	if err != nil {
 		log.Fatalf("failed to create Kubernetes client set: %v", err)
 	}
-	mgr, err := manager.New(cfg, manager.Options{})
+	mgr, err := manager.New(cfg, manager.Options{
+		// Use our own Scheme here with our known types, and the client-go k8s ones
+		Scheme: scheme.Scheme,
+	})
 	if err != nil {
 		log.Fatalf("failed to create the cluster manager: %v", err)
 	}
 
-	log.Info("registering scheme for all resources")
-	if err := existinginfrav1.AddToScheme(mgr.GetScheme()); err != nil {
-		log.Fatal(err)
-	}
-	if err := clusterv1.AddToScheme(mgr.GetScheme()); err != nil {
-		log.Fatal(err)
-	}
-
 	log.Info("registering controllers to the cluster manager")
 	clusterReconciler, err := wks.NewClusterReconciler(mgr.GetClient(), mgr.GetEventRecorderFor(wks.ProviderName+"-controller"))
 	if err != nil {

cmd/wksctl/main.go

@@ -6,8 +6,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/weaveworks/go-checkpoint"
-	"k8s.io/client-go/kubernetes/scheme"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 
 	"github.com/weaveworks/wksctl/cmd/wksctl/addon"
 	"github.com/weaveworks/wksctl/cmd/wksctl/apply"
@@ -20,7 +18,6 @@ import (
 	"github.com/weaveworks/wksctl/cmd/wksctl/registrysynccommands"
 	"github.com/weaveworks/wksctl/cmd/wksctl/version"
 	"github.com/weaveworks/wksctl/cmd/wksctl/zshcompletions"
-	existinginfrav1 "github.com/weaveworks/wksctl/pkg/existinginfra/v1alpha3"
 	v "github.com/weaveworks/wksctl/pkg/version"
 )
 
@@ -45,13 +42,6 @@ func configureLogger(cmd *cobra.Command, args []string) {
 }
 
 func main() {
-	if err := clusterv1.AddToScheme(scheme.Scheme); err != nil {
-		log.Fatal(err)
-	}
-	if err := existinginfrav1.AddToScheme(scheme.Scheme); err != nil {
-		log.Fatal(err)
-	}
-
 	rootCmd.PersistentFlags().BoolVarP(&options.verbose, "verbose", "v", false, "Enable verbose output")
 
 	rootCmd.AddCommand(addon.Cmd)

config/crd/cluster.weave.works_existinginfraclusters.yaml

@@ -159,7 +159,6 @@ spec:
               type: string
           required:
           - cri
-          - sshKeyPath
           - user
           type: object
         status:

go.mod

@@ -15,8 +15,6 @@ require (
 	github.com/google/go-jsonnet v0.16.0
 	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/oleiade/reflections v1.0.0 // indirect
 	github.com/pelletier/go-toml v1.8.0
 	github.com/pkg/errors v0.9.1
@@ -31,13 +29,13 @@ require (
 	github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188
 	github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
 	github.com/weaveworks/launcher v0.0.0-20180824102238-59a4fcc32c9c
+	github.com/weaveworks/libgitops v0.0.2
 	github.com/whilp/git-urls v0.0.0-20191001220047-6db9661140c0
 	golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0
 	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
 	golang.org/x/tools v0.0.0-20200708003708-134513de8882 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
 	google.golang.org/appengine v1.6.5 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/oleiade/reflections.v1 v1.0.0
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	k8s.io/api v0.18.5
@@ -50,6 +48,7 @@ require (
 	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
 	sigs.k8s.io/cluster-api v0.3.6
 	sigs.k8s.io/controller-runtime v0.6.0
+	sigs.k8s.io/kustomize/kyaml v0.1.11
 	sigs.k8s.io/yaml v1.2.0
 )
 

pkg/addons/addon.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/google/go-jsonnet"
 	log "github.com/sirupsen/logrus"
+	"github.com/weaveworks/libgitops/pkg/serializer"
 	"github.com/weaveworks/wksctl/pkg/addons/assets"
 	"github.com/weaveworks/wksctl/pkg/qjson"
 	"github.com/weaveworks/wksctl/pkg/registry"
@@ -333,18 +334,20 @@ func (a *Addon) buildJsonnet(config BuildOptions) ([]string, error) {
 		return nil, err
 	}
 
-	for filename, value := range output {
+	for filename, strValue := range output {
+		content := []byte(strValue)
 		if config.YAML {
-			data, err := yaml.JSONToYAML([]byte(value))
+			data, err := yaml.JSONToYAML(content)
 			if err != nil {
 				return nil, err
 			}
-			value, err = manifest.WithNamespace(string(data), "wkp-addons")
+			// The WithNamespace function supports either JSON or YAML
+			content, err = manifest.WithNamespace(serializer.FromBytes(data), "wkp-addons")
 			if err != nil {
 				return nil, err
 			}
 		}
-		if err := ioutil.WriteFile(filename, []byte(value), 0660); err != nil {
+		if err := ioutil.WriteFile(filename, content, 0660); err != nil {
 			return nil, err
 		}
 	}