Allow multiple templates.

Author: bigkevmcd

api/v1alpha1/gitopsset_types.go

@@ -56,8 +56,12 @@ type GitOpsSetGenerator struct {
 
 // GitOpsSetSpec defines the desired state of GitOpsSet
 type GitOpsSetSpec struct {
-	Generators []GitOpsSetGenerator `json:"generators,omit"`
-	Template   GitOpsSetTemplate    `json:"template"`
+	// Generators generate the data to be inserted into the provided templates.
+	Generators []GitOpsSetGenerator `json:"generators,omitempty"`
+
+	// Templates are a set of YAML templates that are rendered into resources
+	// from the data supplied by the generators.
+	Templates []GitOpsSetTemplate `json:"templates,omitempty"`
 }
 
 // GitOpsSetStatus defines the observed state of GitOpsSet

api/v1alpha1/zz_generated.deepcopy.go

@@ -36,6 +36,8 @@ spec:
             description: GitOpsSetSpec defines the desired state of GitOpsSet
             properties:
               generators:
+                description: Generators generate the data to be inserted into the
+                  provided templates.
                 items:
                   description: GitOpsSet describes the configured generators.
                   properties:
@@ -77,13 +79,14 @@ spec:
                       type: object
                   type: object
                 type: array
-              template:
-                description: // ©itOpsSetTemplate describes a resource to create
-                type: object
-                x-kubernetes-preserve-unknown-fields: true
-            required:
-            - generators
-            - template
+              templates:
+                description: Templates are a set of YAML templates that are rendered
+                  into resources from the data supplied by the generators.
+                items:
+                  description: // ©itOpsSetTemplate describes a resource to create
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                type: array
             type: object
           status:
             description: GitOpsSetStatus defines the observed state of GitOpsSet

config/crd/bases/templates.weave.works_gitopssets.yaml

@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-logr/logr"
 	templatesv1 "github.com/weaveworks/gitops-sets-controller/api/v1alpha1"
-	"github.com/weaveworks/gitops-sets-controller/controllers/render/generators"
+	"github.com/weaveworks/gitops-sets-controller/controllers/templates/generators"
 )
 
 // ListGenerator is a generic JSON object list.

controllers/render/reconciler/renderer_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/google/go-cmp/cmp"
 	templatesv1 "github.com/weaveworks/gitops-sets-controller/api/v1alpha1"
-	"github.com/weaveworks/gitops-sets-controller/controllers/render/generators"
+	"github.com/weaveworks/gitops-sets-controller/controllers/templates/generators"
 	"github.com/weaveworks/gitops-sets-controller/test"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )