Merge pull request #19 from flanksource/for-each

For_each field
flanksource · Jan 18, 2021 · 029fa99 · 029fa99
2 parents 8fa866e + 375f87b
commit 029fa99
Show file tree

Hide file tree

Showing 11 changed files with 420 additions and 17 deletions.
diff --git a/api/v1/template_types.go b/api/v1/template_types.go
@@ -55,6 +55,7 @@ type TemplateStatus struct {
 }
 
 type ResourceSelector struct {
+	ForEach            string               `json:"forEach,omitempty"`
 	LabelSelector      metav1.LabelSelector `json:"labelSelector,omitempty"`
 	NamespaceSelector  metav1.LabelSelector `json:"namespaceSelector,omitempty"`
 	AnnotationSelector map[string]string    `json:"annotationSelector,omitempty"`

diff --git a/config/crd/bases/templating.flanksource.com_templates.yaml b/config/crd/bases/templating.flanksource.com_templates.yaml
@@ -84,6 +84,8 @@ spec:
                   type: string
                 fieldSelector:
                   type: string
+                forEach:
+                  type: string
                 kind:
                   type: string
                 labelSelector:
@@ -206,6 +208,8 @@ spec:
                   type: string
                 fieldSelector:
                   type: string
+                forEach:
+                  type: string
                 kind:
                   type: string
                 labelSelector:

diff --git a/config/deploy/crd.yml b/config/deploy/crd.yml
@@ -67,6 +67,8 @@ spec:
                   type: string
                 fieldSelector:
                   type: string
+                forEach:
+                  type: string
                 kind:
                   type: string
                 labelSelector:
@@ -151,6 +153,8 @@ spec:
                   type: string
                 fieldSelector:
                   type: string
+                forEach:
+                  type: string
                 kind:
                   type: string
                 labelSelector:

diff --git a/config/deploy/operator.yml b/config/deploy/operator.yml
@@ -74,6 +74,8 @@ spec:
                   type: string
                 fieldSelector:
                   type: string
+                forEach:
+                  type: string
                 kind:
                   type: string
                 labelSelector:
@@ -158,6 +160,8 @@ spec:
                   type: string
                 fieldSelector:
                   type: string
+                forEach:
+                  type: string
                 kind:
                   type: string
                 labelSelector:

diff --git a/examples/for-each-test.yml b/examples/for-each-test.yml
@@ -0,0 +1,16 @@
+apiVersion: abcd.flanksource.com/v1
+kind: ABCD
+metadata:
+  name: test
+  namespace: default
+spec:
+  topics:
+    - a
+    - b
+    - c
+    - d
+  topicsMap:
+    a1: a2
+    b1: b2
+    c1: c2
+    d1: d2
diff --git a/examples/for-each.yml b/examples/for-each.yml
@@ -0,0 +1,89 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: abcds.abcd.flanksource.com
+spec:
+  group: abcd.flanksource.com
+  names:
+    kind: ABCD
+    listKind: ABCDList
+    plural: abcds
+    singular: abcd
+  scope: Namespaced
+  subresources:
+    status: {}
+  version: v1
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  validation:
+    openAPIV3Schema:
+      description: Schema validation for the ABCD CRDs
+      type: object
+      properties:
+        spec:
+          type: object
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: abcdtopics.abcd.flanksource.com
+spec:
+  group: abcd.flanksource.com
+  names:
+    kind: ABCDTopic
+    listKind: ABCDTopicList
+    plural: abcdtopics
+    singular: abcdtopic
+  scope: Namespaced
+  subresources:
+    status: {}
+  version: v1
+  versions:
+    - name: v1
+      served: true
+      storage: true
+  validation:
+    openAPIV3Schema:
+      description: Schema validation for the ABCD Topic CRDs
+      type: object
+      properties:
+        spec:
+          type: object
+---
+apiVersion: templating.flanksource.com/v1
+kind: Template
+metadata:
+  name: abcd-topic
+spec:
+  source:
+    apiVersion: abcd.flanksource.com/v1
+    kind: ABCD
+  resources:
+    - forEach: "{{.spec.topics}}"
+      apiVersion: abcd.flanksource.com/v1
+      kind: ABCDTopic
+      metadata:
+        name: "{{.metadata.name}}-{{.each}}"
+        namespace: "{{.metadata.namespace}}"
+      spec:
+        topicName: "{{.each}}"
+---
+apiVersion: templating.flanksource.com/v1
+kind: Template
+metadata:
+  name: abcd-topic-map
+spec:
+  source:
+    apiVersion: abcd.flanksource.com/v1
+    kind: ABCD
+  resources:
+    - forEach: "{{.spec.topicsMap}}"
+      apiVersion: abcd.flanksource.com/v1
+      kind: ABCDTopic
+      metadata:
+        name: "{{.metadata.name}}-{{.each.key}}"
+        namespace: "{{.metadata.namespace}}"
+      spec:
+        "{{.each.key}}": "{{.each.value}}"
diff --git a/k8s/schema_manager.go b/k8s/schema_manager.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/flanksource/commons/logger"
+	"github.com/go-logr/logr"
 	"github.com/go-openapi/jsonpointer"
 	"github.com/go-openapi/spec"
 	"github.com/pkg/errors"
@@ -25,6 +25,7 @@ type SchemaManager struct {
 	serverResources []*metav1.APIResourceList
 	clientset       *kubernetes.Clientset
 	crdClient       extapi.ApiextensionsV1beta1Interface
+	log             logr.Logger
 }
 
 type TypedField struct {
@@ -34,7 +35,7 @@ type TypedField struct {
 
 type MapInterface map[string]interface{}
 
-func NewSchemaManagerWithCache(clientset *kubernetes.Clientset, crdClient extapi.ApiextensionsV1beta1Interface, cache *SchemaCache) (*SchemaManager, error) {
+func NewSchemaManagerWithCache(clientset *kubernetes.Clientset, crdClient extapi.ApiextensionsV1beta1Interface, cache *SchemaCache, log logr.Logger) (*SchemaManager, error) {
 	s, err := cache.FetchSchema()
 	if err != nil {
 		return nil, err
@@ -50,11 +51,12 @@ func NewSchemaManagerWithCache(clientset *kubernetes.Clientset, crdClient extapi
 		serverResources: serverResources,
 		clientset:       clientset,
 		crdClient:       crdClient,
+		log:             log,
 	}
 	return mgr, nil
 }
 
-func NewSchemaManager(clientset *kubernetes.Clientset, crdClient extapi.ApiextensionsV1beta1Interface) (*SchemaManager, error) {
+func NewSchemaManager(clientset *kubernetes.Clientset, crdClient extapi.ApiextensionsV1beta1Interface, log logr.Logger) (*SchemaManager, error) {
 	bs, err := clientset.RESTClient().Get().AbsPath("openapi", "v2").DoRaw(context.TODO())
 	if err != nil {
 		return nil, err
@@ -75,6 +77,7 @@ func NewSchemaManager(clientset *kubernetes.Clientset, crdClient extapi.Apiexten
 		serverResources: serverResources,
 		clientset:       clientset,
 		crdClient:       crdClient,
+		log:             log,
 	}
 	return mgr, nil
 }
@@ -97,7 +100,6 @@ func (m *SchemaManager) DuckType(gvk schema.GroupVersionKind, object *unstructur
 }
 
 func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix string) (interface{}, error) {
-	// fmt.Printf("Prefix: %s\n", prefix)
 	if isNil(object) {
 		return nil, nil
 	}
@@ -109,7 +111,7 @@ func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix
 		if ok {
 			fieldType, err := m.FindTypeForKeyFromSchema(schema, prefix)
 			if err != nil {
-				logger.Errorf("failed to find type for key %s: %v", prefix, err)
+				m.log.V(2).Info("failed to find type for", "key", prefix, "error", err)
 				return bytes, nil
 			}
 			return transformBytesToType(bytes, fieldType)
@@ -145,7 +147,7 @@ func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix
 		value := object.(string)
 		fieldType, err := m.FindTypeForKeyFromSchema(schema, prefix)
 		if err != nil {
-			logger.Errorf("failed to find type for key %s: %v", prefix, err)
+			m.log.V(2).Info("failed to find type for", "key", prefix, "error", err)
 			return value, nil
 		}
 		newValue, err := transformStringToType(value, fieldType)
@@ -157,7 +159,7 @@ func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix
 		value := v.Int()
 		fieldType, err := m.FindTypeForKeyFromSchema(schema, prefix)
 		if err != nil {
-			logger.Errorf("failed to find type for key %s: %v", prefix, err)
+			m.log.V(2).Info("failed to find type for", "key", prefix, "error", err)
 			return value, nil
 		}
 		newValue, err := transformInt64ToType(value, fieldType)
@@ -169,7 +171,7 @@ func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix
 		value := v.Uint()
 		fieldType, err := m.FindTypeForKeyFromSchema(schema, prefix)
 		if err != nil {
-			logger.Errorf("failed to find type for key %s: %v", prefix, err)
+			m.log.V(2).Info("failed to find type for", "key", prefix, "error", err)
 			return value, nil
 		}
 		newValue, err := transformUint64ToType(value, fieldType)
@@ -181,7 +183,7 @@ func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix
 		value := int64(v.Float())
 		fieldType, err := m.FindTypeForKeyFromSchema(schema, prefix)
 		if err != nil {
-			logger.Errorf("failed to find type for key %s: %v", prefix, err)
+			m.log.V(2).Info("failed to find type for", "key", prefix, "error", err)
 			return value, nil
 		}
 		newValue, err := transformInt64ToType(value, fieldType)
@@ -193,7 +195,7 @@ func (m *SchemaManager) duckType(schema *spec.Schema, object interface{}, prefix
 		value := v.Bool()
 		fieldType, err := m.FindTypeForKeyFromSchema(schema, prefix)
 		if err != nil {
-			logger.Errorf("failed to find type for key %s: %v", prefix, err)
+			m.log.V(2).Info("failed to find type for", "key", prefix, "error", err)
 			return value, nil
 		}
 		newValue, err := transformBoolToType(value, fieldType)

diff --git a/k8s/schema_manager_test.go b/k8s/schema_manager_test.go
@@ -404,7 +404,7 @@ func duckTypeWithValue(template string) (*unstructured.Unstructured, error) {
 }
 
 func newSchemaManager() *k8s.SchemaManager {
-	sm, err := k8s.NewSchemaManager(clientset(), crdClient())
+	sm, err := k8s.NewSchemaManager(clientset(), crdClient(), testLog)
 	if err != nil {
 		logger.Fatalf("failed to get schema manager: %v", err)
 	}