Skip to content

Commit 56c81b7

Browse files
committed
Export BuildTemplateData and use it
Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>
1 parent baec878 commit 56c81b7

1 file changed

Lines changed: 18 additions & 32 deletions

File tree

internal/controller/plugin/pluginpreset_values_resolver.go

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,24 @@ func (r *PluginPresetReconciler) resolveExpressionsForPreset(
7373
return convertToPluginOptionValues(preset.Spec.Plugin.OptionValues), nil
7474
}
7575

76-
templateData, err := r.buildTemplateData(ctx, preset, cluster)
76+
tempPlugin := greenhousev1alpha1.Plugin{
77+
ObjectMeta: metav1.ObjectMeta{
78+
Name: preset.Name,
79+
Namespace: preset.Namespace,
80+
Labels: preset.Labels,
81+
},
82+
Spec: greenhousev1alpha1.PluginSpec{
83+
ClusterName: cluster.Name,
84+
},
85+
}
86+
87+
greenhouseValuesList, err := helm.GetGreenhouseValues(ctx, r.Client, tempPlugin)
88+
if err != nil {
89+
return nil, fmt.Errorf("failed to get greenhouse values: %w", err)
90+
}
91+
92+
templateData, err := helm.BuildTemplateData(greenhouseValuesList)
93+
7794
if err != nil {
7895
return nil, fmt.Errorf("failed to build template data: %w", err)
7996
}
@@ -371,37 +388,6 @@ func evaluateCELWithObject(expression string, object map[string]any) (any, error
371388
return cel.EvaluateWithData(expr, env, evalData)
372389
}
373390

374-
// buildTemplateData creates the template data map for CEL expression evaluation.
375-
func (r *PluginPresetReconciler) buildTemplateData(
376-
ctx context.Context,
377-
preset *greenhousev1alpha1.PluginPreset,
378-
cluster *greenhousev1alpha1.Cluster,
379-
) (map[string]any, error) {
380-
381-
tempPlugin := greenhousev1alpha1.Plugin{
382-
ObjectMeta: metav1.ObjectMeta{
383-
Name: preset.Name,
384-
Namespace: preset.Namespace,
385-
Labels: preset.Labels,
386-
},
387-
Spec: greenhousev1alpha1.PluginSpec{
388-
ClusterName: cluster.Name,
389-
},
390-
}
391-
392-
greenhouseValuesList, err := helm.GetGreenhouseValues(ctx, r.Client, tempPlugin)
393-
if err != nil {
394-
return nil, fmt.Errorf("failed to get greenhouse values: %w", err)
395-
}
396-
397-
templateData, err := helm.BuildTemplateData(greenhouseValuesList)
398-
if err != nil {
399-
return nil, fmt.Errorf("failed to build template data: %w", err)
400-
}
401-
402-
return templateData, nil
403-
}
404-
405391
// applyOverridesToPreset returns a copy of the preset with cluster-specific overrides merged.
406392
func applyOverridesToPreset(preset *greenhousev1alpha1.PluginPreset, clusterName string) *greenhousev1alpha1.PluginPreset {
407393
presetCopy := preset.DeepCopy()

0 commit comments

Comments
 (0)