Fix raw values missing json parsing

ironcore-scrapyard · Sep 10, 2021 · df18e7e · df18e7e
1 parent 90b033c
commit df18e7e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/api/v1alpha1/template_types.go b/api/v1alpha1/template_types.go
@@ -50,7 +50,7 @@ type TemplateSource struct {
 	Object *LocalObjectReference `json:"object,omitempty"`
 	// Value is a literal yaml value to use as source.
 	// +optional
-	Value apiextensionsv1.JSON `json:"value,omitempty"`
+	Value *apiextensionsv1.JSON `json:"value,omitempty"`
 }
 
 // LocalObjectReference references an object in a specific api version.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/template-operator/Chart.yaml b/charts/template-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: template-operator
 description: A Helm chart for the template operator
 type: application
-version: 0.1.5
+version: 0.1.6
 appVersion: 0.1.0
 engine: gotpl
 home: https://github.com/onmetal/template-operator

diff --git a/config/samples/template_v1alpha1_template.yaml b/config/samples/template_v1alpha1_template.yaml
@@ -13,19 +13,20 @@ spec:
       managed-by: template-sample
   prune: true
   sources:
-  #    - name: token
-  #      object:
-  #        apiVersion: v1
-  #        kind: Secret
-  #        namespace: default
-  #        name: default-token-rtxld
+    - name: secretName
+      value: my-secret
+  #  - name: token
+  #    object:
+  #      apiVersion: v1
+  #      kind: Secret
+  #      name: default-token-rtxld
   data:
     inline: |-
       apiVersion: v1
       kind: Secret
       metadata:
         namespace: {{ .Template.metadata.namespace }}
-        name: my-secret
+        name: {{ .Values.secretName }}
       type: Opaque
       data:
         kubeconfig: {{ .Template.metadata.name | b64enc }}
diff --git a/pkg/template/template.go b/pkg/template/template.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -179,7 +180,13 @@ func (e *Engine) resolveSources(ctx context.Context, logger logr.Logger, templat
 
 			values[src.Name] = u.Object
 		default:
-			values[src.Name] = src.Value
+			var v interface{}
+			if src.Value != nil {
+				if err := json.Unmarshal(src.Value.Raw, &v); err != nil {
+					return nil, fmt.Errorf("error unmarshaling raw value %s: %w", src.Name, err)
+				}
+			}
+			values[src.Name] = v
 		}
 	}