feat(pluginpresets): pluginpreset controller resolves values from references by k-fabryczny · Pull Request #2117 · cloudoperators/greenhouse

k-fabryczny · 2026-07-03T14:30:02Z

Description

What type of PR is this? (check all applicable)

Related Tickets & Documents

Added tests?

👍 yes
🙅 no, because they aren't needed
🙋 no, because I need help
Separate ticket for tests # (issue/pr)

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Added to documentation?

📜 README.md
🤝 Documentation pages updated
🙅 no documentation needed
(if applicable) generated OpenAPI docs for CRD changes

Checklist

My code follows the style guidelines of this project
I have performed a self-review of my code
I have commented my code, particularly in hard-to-understand areas
My changes generate no new warnings
New and existing unit tests pass locally with my changes

Copilot

Pull request overview

This PR extends the PluginPreset controller to resolve valueFrom.ref references (to other PluginPresets) into concrete spec.optionValues[*].value entries on the generated Plugins, controlled via a new pluginPreset.integrationEnabled feature flag. It also updates Helm chart feature-flag wiring, adds extensive controller/e2e tests, and expands the PluginPreset documentation to cover cross-preset references.

Changes:

Add pluginPreset.integrationEnabled feature flag plumbed through features, controller wiring, and Helm charts.
Implement valueFrom.ref resolution in the PluginPreset controller (including selector-based fan-out and CEL extraction).
Add/extend unit and E2E scenarios and documentation for cross-PluginPreset references.

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
internal/features/features.go	Adds `IsPresetIntegrationEnabled()` and supporting struct field.
internal/features/features_test.go	Extends feature-flag tests to cover preset integration flag.
internal/controller/plugin/suite_test.go	Enables preset integration in controller test suite setup.
internal/controller/plugin/pluginpreset_values_resolver.go	Implements reference resolution and CEL evaluation for `valueFrom.ref`.
internal/controller/plugin/pluginpreset_controller.go	Adds `IntegrationEnabled` flag to reconciler struct.
internal/controller/plugin/pluginpreset_controller_test.go	Adds multiple integration tests for cross-preset references.
e2e/pluginpreset/scenarios/selector_reference.go	New E2E scenario: selector-based cross-preset reference.
e2e/pluginpreset/scenarios/cross_preset_reference.go	New E2E scenario: name-based cross-preset reference.
e2e/pluginpreset/scenarios/cross_preset_reference_overrides.go	New E2E scenario: references respect source `ClusterOptionOverrides`.
e2e/pluginpreset/scenarios/constants.go	Adds constants for new E2E scenarios.
e2e/pluginpreset/e2e_test.go	Registers new PluginPreset reference E2E scenarios.
docs/reference/components/pluginpreset.md	Documents `valueFrom.ref` usage, syntax, and feature flags.
dev-env/dev.values.yaml	Enables preset integration in dev values.
cmd/greenhouse/controllers.go	Wires `IsPresetIntegrationEnabled()` into PluginPreset reconciler.
charts/manager/templates/manager/feature-flag.yaml	Adds template docs + rendered value for preset integration flag.
charts/manager/templates/_helpers.tpl	Adds helper for `pluginPreset.integrationEnabled`.
charts/greenhouse/values.yaml	Adds default `global.pluginPreset.integrationEnabled: false`.
charts/greenhouse/ci/test-values.yaml	Enables preset integration for chart CI values.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+	} else {
+		resolvedValues = util.ConvertToPluginOptionValues(preset.Spec.Plugin.OptionValues)
 	}


 	if r.ExpressionEvaluationEnabled {
-		return r.resolveExpressionsForPreset(ctx, preset, cluster)
+		var err error
+		resolvedValues, err = r.resolveExpressionsForPreset(ctx, preset, cluster)
+		if err != nil {
+			return nil, fmt.Errorf("failed to resolve expressions: %w", err)
+		}
+	} else {
+		resolvedValues = util.ConvertToPluginOptionValues(preset.Spec.Plugin.OptionValues)
 	}

-	for _, ov := range preset.Spec.Plugin.OptionValues {
-		if ov.Expression != nil {
-			return nil, fmt.Errorf("option %s has expression but expressionEvaluationEnabled is disabled for PluginPreset controller", ov.Name)
+	if r.IntegrationEnabled {
+		var err error
+		resolvedValues, err = r.resolveReferencesForPreset(ctx, cluster, preset.Namespace, preset.Spec.Plugin.OptionValues, resolvedValues)
+		if err != nil {
+			return nil, fmt.Errorf("failed to resolve references: %w", err)
 		}
 	}

-	return util.ConvertToPluginOptionValues(preset.Spec.Plugin.OptionValues), nil
+	return resolvedValues, nil


+> :information_source: Expressions are only evaluated in PluginPresets.
+
+> :warning: CEL expressions on standalone Plugins are deprecated and will be removed in a future release. Use PluginPresets for expression evaluation.


+#### New simplified syntax
+```expression: spec.optionValues.filter(v, v.name == "my.value")[0].value```
+
+#### With ${...} wrapper
+```expression: ${spec.optionValues.filter(v, v.name == "my.value")[0].value}```
+
+#### Legacy syntax (backward compatible)
+```expression: object.spec.optionValues.filter(v, v.name == "my.value")[0].value```


Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

…esetToPluginOptionValues Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

…, fix tests Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Copilot AI review requested due to automatic review settings July 3, 2026 14:30

k-fabryczny requested review from a team as code owners July 3, 2026 14:30

github-actions Bot added documentation Improvements or additions to documentation feature helm-charts size/XXL labels Jul 3, 2026

Copilot started reviewing on behalf of k-fabryczny July 3, 2026 14:30 View session

k-fabryczny mentioned this pull request Jul 3, 2026

feat(pluginpresets): pluginpreset controller resolves values from references to plugins #2034

Closed

24 tasks

Copilot AI reviewed Jul 3, 2026

View reviewed changes

k-fabryczny and others added 20 commits July 20, 2026 14:43

chore(plugins): remove unused code

385cca3

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove plugin reference tests

4db5ed3

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove trackedObjects from flux controller

fda4563

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Fix linter issue

4c5af78

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove deprecated plugin integration test suite

114b5fd

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove expressionEvaluationEnabled and integrationEnabled for plugin

2975dc0

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unused fields from test

1758a55

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Improve error message for option values

8d2afed

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove outdated comment from startPluginReconciler

57467b7

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Update tests description, merge tests

ed69502

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unused constant

1b88835

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add one test case, fix second one

2058f7f

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Fix error message

059caaf

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove deprecated fields from plugin, remove unused functions, fix tests

0bbfeea

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Automatic generation of CRD API Docs

ab155b5

Fix linter problem

5733bed

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Fix doc comment

2232cc8

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Fix tests, remove expression from parameters

f7a6b44

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Restore tests, add validatePresetPluginOptionValues, remove convertPr…

561df2d

…esetToPluginOptionValues Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add nolint unparam to validatePluginOptionValues

f5eaae7

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

k-fabryczny added 24 commits July 20, 2026 14:43

Improve validatePresetPluginOptionValues function

d70ae16

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove 'expression' from error message and comment

e76fb7e

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add secret validation to plugin

635d0ec

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Improve source validatation for plugin preset

98cded2

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Align check with plugin webhook

057d5ca

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Continue on error

131d907

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove expression from plugin doc

8b3167f

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unsupported flags from plugin

92e6648

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unused const and function call

3721eae

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove TrackedObjects from plugin

d81ecd3

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unused const LabelKeyPluginIntegration

2b1c4bf

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove tracking from plugin

f223157

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unnecessary newline

ffe276d

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unused const AnnotationKeyPluginTackingID

8891620

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Make example more readable

7e31c48

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove plugipreset webhook changes,comment out expression tests for now

6d5a8c4

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unsused nolint:unparam

a428357

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add integrationEnabled flag and feature

a9a3b75

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add IntegrationEnabled to controllers

273deb0

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add IntegrationEnabled to pluginpreset controller

0618e87

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add resolving for plugin preset with tests

2bb8730

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Remove unnecessary leading newline

4f7ab65

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Add check for expression when ExpressionEvaluationEnabled is disabled…

cc4f152

…, fix tests Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Fix merge problems

05fcb76

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

k-fabryczny force-pushed the feat/v4-CEL-in-pp-1776 branch from 965b705 to 05fcb76 Compare July 20, 2026 14:44

github-actions Bot added the core-apis label Jul 20, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(pluginpresets): pluginpreset controller resolves values from references#2117

feat(pluginpresets): pluginpreset controller resolves values from references#2117
k-fabryczny wants to merge 44 commits into
mainfrom
feat/v4-CEL-in-pp-1776

k-fabryczny commented Jul 3, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		> :information_source: Expressions are only evaluated in PluginPresets.

		> :warning: CEL expressions on standalone Plugins are deprecated and will be removed in a future release. Use PluginPresets for expression evaluation.

Uh oh!

Conversation

k-fabryczny commented Jul 3, 2026

Description

What type of PR is this? (check all applicable)

Related Tickets & Documents

Added tests?

Added to documentation?

Checklist

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants