Skip to content

feat(pluginpresets): evaluate CEL expressions for owned Plugins #2088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zaggy21 merged 16 commits into from
Jun 26, 2026
Merged

feat(pluginpresets): evaluate CEL expressions for owned Plugins #2088

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
46423ad
Introduce PluginPresetPluginOptionValue type
k-fabryczny Jun 21, 2026
49ee6da
Add expressionEvaluationEnabled flag for pluginPreset
k-fabryczny Jun 21, 2026
98ed17e
Add updated doc
k-fabryczny Jun 21, 2026
60fdff1
Add resolver for plugin preset controller
k-fabryczny Jun 21, 2026
93852cc
Add fixed tests
k-fabryczny Jun 21, 2026
8570bd3
Fix plugin preset doc
k-fabryczny Jun 22, 2026
567f244
Drop ref from plugin output in expression resolver
k-fabryczny Jun 22, 2026
67a56fb
Use function from util
k-fabryczny Jun 22, 2026
d125443
Disable expressionEvaluationEnabled, integrationEnabled for plugin in…
k-fabryczny Jun 23, 2026
43dea22
Restore settings for plugin, used by plugin tests
k-fabryczny Jun 23, 2026
553b3a6
Add e2e tests for pluginpreset
k-fabryczny Jun 24, 2026
b719beb
Set expressionEvaluationEnabled false by default
k-fabryczny Jun 24, 2026
4b4c290
Change WithClusterOverride signature, remove duplicated function
k-fabryczny Jun 25, 2026
b45fc05
Return error if Expression is set but ExpressionEvaluationEnabled is …
k-fabryczny Jun 25, 2026
d1d0135
Merge branch 'main' into feat/v3-CEL-in-pp
Zaggy21 Jun 25, 2026
4795628
Add updated typescript types
k-fabryczny Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/v1alpha1/pluginpreset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type PluginPresetPluginSpec struct {
DisplayName string `json:"displayName,omitempty"`

// Values are the values for a PluginDefinition instance.
OptionValues []PluginOptionValue `json:"optionValues,omitempty"`
OptionValues []PluginPresetPluginOptionValue `json:"optionValues,omitempty"`

// ReleaseNamespace is the namespace in the remote cluster to which the backend is deployed.
// Defaults to the Greenhouse managed namespace if not set.
Expand Down Expand Up @@ -111,8 +111,8 @@ type PluginPresetPluginValueFromSource struct {
// ClusterOptionOverride defines which plugin option should be override in which cluster
// +Optional
type ClusterOptionOverride struct {
ClusterName string `json:"clusterName"`
Overrides []PluginOptionValue `json:"overrides"`
ClusterName string `json:"clusterName"`
Overrides []PluginPresetPluginOptionValue `json:"overrides"`
}

const (
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions charts/greenhouse/ci/test-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ global:
expressionEvaluationEnabled: false
integrationEnabled: false
ociMirroringEnabled: false
# PluginPreset configuration for Greenhouse.
pluginPreset:
expressionEvaluationEnabled: true
linkerd_enabled: false
region: greenhouse
registry: ghcr.io/cloudoperators/greenhouse
Expand Down
3 changes: 3 additions & 0 deletions charts/greenhouse/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ global:
expressionEvaluationEnabled: false
integrationEnabled: false
ociMirroringEnabled: false
# PluginPreset configuration for Greenhouse.
pluginPreset:
expressionEvaluationEnabled: true
Comment thread
k-fabryczny marked this conversation as resolved.
Outdated

Comment thread
k-fabryczny marked this conversation as resolved.
postgresqlng:
enabled: true
Expand Down
2 changes: 2 additions & 0 deletions charts/manager/ci/test-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ global:
expressionEvaluationEnabled: false
integrationEnabled: false
ociMirroringEnabled: false
pluginPreset:
expressionEvaluationEnabled: true

controllerManager:
args:
Expand Down
34 changes: 12 additions & 22 deletions charts/manager/crds/greenhouse.sap_pluginpresets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,12 @@ spec:
type: string
overrides:
items:
description: PluginOptionValue is the value for a PluginOption.
description: PluginPresetPluginOptionValue is the value for
a PluginOption.
properties:
expression:
description: |-
Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.

Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
description: Expression is a YAML string with ${...} placeholders
that will be evaluated as CEL expressions.
type: string
name:
description: Name of the values.
Expand All @@ -90,11 +88,8 @@ spec:
description: ValueFrom references value in another source.
properties:
ref:
description: |-
Ref references values defined in another resource (Plugin, PluginPreset)

Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
description: Ref references values defined in another
resource (Plugin, PluginPreset)
properties:
expression:
description: Expression is a CEL expression to
Expand Down Expand Up @@ -310,14 +305,12 @@ spec:
optionValues:
description: Values are the values for a PluginDefinition instance.
items:
description: PluginOptionValue is the value for a PluginOption.
description: PluginPresetPluginOptionValue is the value for
a PluginOption.
properties:
expression:
description: |-
Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.

Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
description: Expression is a YAML string with ${...} placeholders
that will be evaluated as CEL expressions.
type: string
name:
description: Name of the values.
Expand All @@ -329,11 +322,8 @@ spec:
description: ValueFrom references value in another source.
properties:
ref:
description: |-
Ref references values defined in another resource (Plugin, PluginPreset)

Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
description: Ref references values defined in another
resource (Plugin, PluginPreset)
properties:
expression:
description: Expression is a CEL expression to extract
Expand Down
4 changes: 4 additions & 0 deletions charts/manager/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,7 @@ Define postgresql helpers
{{- define "plugin.ociMirroringEnabled" -}}
{{- printf "%t" (required "global.plugin.ociMirroringEnabled missing" .Values.global.plugin.ociMirroringEnabled) }}
{{- end }}
{{/* Render the pluginPreset expression evaluation flag */}}
{{- define "pluginPreset.expressionEvaluationEnabled" -}}
{{- printf "%t" (required "global.pluginPreset.expressionEvaluationEnabled missing" .Values.global.pluginPreset.expressionEvaluationEnabled) }}
{{- end }}
7 changes: 7 additions & 0 deletions charts/manager/templates/manager/feature-flag.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@ data:
expressionEvaluationEnabled: false / true
integrationEnabled: false / true
ociMirroringEnabled: false / true
# enable pluginPreset features
# expressionEvaluationEnabled allows you to enable or disable CEL expression evaluation in PluginPreset
# when enabled, expressions in PluginPreset.spec.plugin.optionValues are evaluated before creating the Plugin
pluginPreset: |
expressionEvaluationEnabled: false / true
dex: |
storage: {{ include "dex.backend" $ }}
plugin: |
expressionEvaluationEnabled: {{ include "plugin.expressionEvaluationEnabled" $ }}
integrationEnabled: {{ include "plugin.integrationEnabled" $ }}
ociMirroringEnabled: {{ include "plugin.ociMirroringEnabled" $ }}
pluginPreset: |
expressionEvaluationEnabled: {{ include "pluginPreset.expressionEvaluationEnabled" $ }}
8 changes: 7 additions & 1 deletion cmd/greenhouse/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var knownControllers = map[string]func(controllerName string, mgr ctrl.Manager)

// Plugin controllers.
"plugin": startPluginReconciler,
"pluginPreset": (&plugincontrollers.PluginPresetReconciler{}).SetupWithManager,
"pluginPreset": startPluginPresetReconciler,

"catalog": startCatalogReconciler,
"pluginDefinition": startPluginDefinitionReconciler,
Expand Down Expand Up @@ -93,6 +93,12 @@ func startPluginReconciler(name string, mgr ctrl.Manager) error {
}).SetupWithManager(name, mgr)
}

func startPluginPresetReconciler(name string, mgr ctrl.Manager) error {
return (&plugincontrollers.PluginPresetReconciler{
ExpressionEvaluationEnabled: featureFlags.IsPresetExpressionEvaluationEnabled(),
}).SetupWithManager(name, mgr)
}

func startPluginDefinitionReconciler(name string, mgr ctrl.Manager) error {
return (&plugindefinitioncontroller.PluginDefinitionReconciler{
OCIMirroringEnabled: featureFlags.IsOCIMirroringEnabled(),
Expand Down
2 changes: 2 additions & 0 deletions dev-env/dev.values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ global:
expressionEvaluationEnabled: true
Comment thread
k-fabryczny marked this conversation as resolved.
integrationEnabled: true
ociMirroringEnabled: true
pluginPreset:
expressionEvaluationEnabled: true
alerts:
enabled: false
certManager:
Expand Down
15 changes: 9 additions & 6 deletions docs/reference/api/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,8 +1089,8 @@ <h3 id="greenhouse.sap/v1alpha1.ClusterOptionOverride">ClusterOptionOverride
<td>
<code>overrides</code><br>
<em>
<a href="#greenhouse.sap/v1alpha1.PluginOptionValue">
[]PluginOptionValue
<a href="#greenhouse.sap/v1alpha1.PluginPresetPluginOptionValue">
[]PluginPresetPluginOptionValue
</a>
</em>
</td>
Expand Down Expand Up @@ -3073,8 +3073,6 @@ <h3 id="greenhouse.sap/v1alpha1.PluginOptionValue">PluginOptionValue
</h3>
<p>
(<em>Appears on:</em>
<a href="#greenhouse.sap/v1alpha1.ClusterOptionOverride">ClusterOptionOverride</a>,
<a href="#greenhouse.sap/v1alpha1.PluginPresetPluginSpec">PluginPresetPluginSpec</a>,
<a href="#greenhouse.sap/v1alpha1.PluginSpec">PluginSpec</a>)
</p>
<p>PluginOptionValue is the value for a PluginOption.</p>
Expand Down Expand Up @@ -3267,6 +3265,11 @@ <h3 id="greenhouse.sap/v1alpha1.PluginPreset">PluginPreset
</div>
<h3 id="greenhouse.sap/v1alpha1.PluginPresetPluginOptionValue">PluginPresetPluginOptionValue
</h3>
<p>
(<em>Appears on:</em>
<a href="#greenhouse.sap/v1alpha1.ClusterOptionOverride">ClusterOptionOverride</a>,
<a href="#greenhouse.sap/v1alpha1.PluginPresetPluginSpec">PluginPresetPluginSpec</a>)
</p>
<p>PluginPresetPluginOptionValue is the value for a PluginOption.</p>
<div class="md-typeset__scrollwrap">
<div class="md-typeset__table">
Expand Down Expand Up @@ -3377,8 +3380,8 @@ <h3 id="greenhouse.sap/v1alpha1.PluginPresetPluginSpec">PluginPresetPluginSpec
<td>
<code>optionValues</code><br>
<em>
<a href="#greenhouse.sap/v1alpha1.PluginOptionValue">
[]PluginOptionValue
<a href="#greenhouse.sap/v1alpha1.PluginPresetPluginOptionValue">
[]PluginPresetPluginOptionValue
</a>
</em>
</td>
Expand Down
28 changes: 6 additions & 22 deletions docs/reference/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,14 +1105,10 @@ components:
type: string
overrides:
items:
description: PluginOptionValue is the value for a PluginOption.
description: PluginPresetPluginOptionValue is the value for a PluginOption.
properties:
expression:
description: |-
Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.

Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
description: Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.
type: string
name:
description: Name of the values.
Expand All @@ -1124,11 +1120,7 @@ components:
description: ValueFrom references value in another source.
properties:
ref:
description: |-
Ref references values defined in another resource (Plugin, PluginPreset)

Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
description: Ref references values defined in another resource (Plugin, PluginPreset)
properties:
expression:
description: Expression is a CEL expression to extract the value from the referenced resource
Expand Down Expand Up @@ -1327,14 +1319,10 @@ components:
optionValues:
description: Values are the values for a PluginDefinition instance.
items:
description: PluginOptionValue is the value for a PluginOption.
description: PluginPresetPluginOptionValue is the value for a PluginOption.
properties:
expression:
description: |-
Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.

Deprecated: Expression is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Expression field.
description: Expression is a YAML string with ${...} placeholders that will be evaluated as CEL expressions.
type: string
name:
description: Name of the values.
Expand All @@ -1346,11 +1334,7 @@ components:
description: ValueFrom references value in another source.
properties:
ref:
description: |-
Ref references values defined in another resource (Plugin, PluginPreset)

Deprecated: Ref is deprecated on standalone Plugins and will be removed in a future release.
Consider using a PluginPreset to deploy Plugins utilizing the Ref field.
description: Ref references values defined in another resource (Plugin, PluginPreset)
properties:
expression:
description: Expression is a CEL expression to extract the value from the referenced resource
Expand Down
Loading
Loading