chore(plugins): remove deprecated plugin integration and expression evaluation

api/v1alpha1/plugin_types.go

@@ -66,25 +66,13 @@ type PluginOptionValue struct {
 	Value *apiextensionsv1.JSON `json:"value,omitempty"`
 	// ValueFrom references value in another source.
 	ValueFrom *PluginValueFromSource `json:"valueFrom,omitempty"`
-	// 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.
-	Expression *string `json:"expression,omitempty"`
 }
 
 // PluginValueFromSource defines how to extract dynamic values
-// only one of secret or ref can be set
-// +kubebuilder:validation:XValidation:rule="!(has(self.secret) && has(self.ref))",message="both secret and ref cannot be set"
-// +kubebuilder:validation:XValidation:rule="has(self.secret) || has(self.ref)",message="one of secret or ref must be set"
+// +kubebuilder:validation:XValidation:rule="has(self.secret)",message="secret must be set"
 type PluginValueFromSource struct {
 	// Secret references the v1.Secret containing the value that needs to be extracted
 	Secret *SecretKeyReference `json:"secret,omitempty"`
-	// 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.
-	Ref *ExternalValueSource `json:"ref,omitempty"`
 }
 
 // ExternalValueSource defines how to extract values from external resources
@@ -217,11 +205,6 @@ type PluginStatus struct {
 	// +Optional
 	LastReconciledAt string `json:"lastReconciledAt,omitempty"`
 
-	// TrackedObjects contains a list of objects being tracked via the greenhouse.sap/tracking-id annotation.
-	// Each entry is in the format "kind/name" (e.g., "Plugin/my-plugin").
-	// +Optional
-	TrackedObjects []string `json:"trackedObjects,omitempty"`
-
 	// ImageReplication contains a list of container image references that have been
 	// successfully replicated to the configured mirror registry.
 	// Used to skip redundant replication on subsequent reconciliations.

api/well_known.go

@@ -75,12 +75,8 @@ const (
 
 	// LabelKeyPluginExposedServices is used to identify Plugins that expose services.
 	LabelKeyPluginExposedServices = "greenhouse.sap/plugin-exposed-services"
-	// LabelKeyPluginIntegration is used to identify resources that are part of plugin-plugin integration scenarios.
-	LabelKeyPluginIntegration = "greenhouse.sap/integration"
 	// LabelValuePluginIntegration will be used as list selector value to identify resources that are part of plugin-plugin integration scenarios.
 	LabelValuePluginIntegration = "true"
-	// AnnotationKeyPluginTackingID is used to identify the resources that are resolving values from the tracked plugin.
-	AnnotationKeyPluginTackingID = "greenhouse.sap/tracking-id"
 
 	FluxReconcileRequestAnnotation = "reconcile.fluxcd.io/requestedAt"
 )

charts/greenhouse/ci/test-values.yaml

@@ -12,8 +12,6 @@ global:
       postgresqlUsername: dex
   # Plugin configuration for Greenhouse.
   plugin:
-    expressionEvaluationEnabled: false
-    integrationEnabled: false
     ociMirroringEnabled: false
   # PluginPreset configuration for Greenhouse.
   pluginPreset:

charts/greenhouse/values.yaml

@@ -20,8 +20,6 @@ global:
       postgresqlUsername:
   # Plugin configuration for Greenhouse.
   plugin:
-    expressionEvaluationEnabled: false
-    integrationEnabled: false
     ociMirroringEnabled: false
   # PluginPreset configuration for Greenhouse.
   pluginPreset:

charts/manager/ci/test-values.yaml

@@ -10,8 +10,6 @@ global:
       postgresqlPort: 5432
       postgresqlUsername: dex
   plugin:
-    expressionEvaluationEnabled: false
-    integrationEnabled: false
     ociMirroringEnabled: false
   pluginPreset:
     expressionEvaluationEnabled: true

charts/manager/crds/greenhouse.sap_plugins.yaml

@@ -123,13 +123,6 @@ spec:
                 items:
                   description: PluginOptionValue 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.
-                      type: string
                     name:
                       description: Name of the values.
                       type: string
@@ -139,87 +132,6 @@ spec:
                     valueFrom:
                       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.
-                          properties:
-                            expression:
-                              description: Expression is a CEL expression to extract
-                                the value from the referenced resource
-                              type: string
-                            kind:
-                              description: |-
-                                Kind is the resource kind to target
-                                if not set, defaults to the same kind as the referencing resource (Plugin or PluginPreset)
-                              enum:
-                              - Plugin
-                              - PluginPreset
-                              type: string
-                            name:
-                              description: |-
-                                Name is the name of the resource to target
-                                this field is mutually exclusive with LabelSelector
-                              minLength: 1
-                              type: string
-                            selector:
-                              description: |-
-                                Selector selects the resources to target based on labels
-                                this field is mutually exclusive with Name
-                              properties:
-                                matchExpressions:
-                                  description: matchExpressions is a list of label
-                                    selector requirements. The requirements are ANDed.
-                                  items:
-                                    description: |-
-                                      A label selector requirement is a selector that contains values, a key, and an operator that
-                                      relates the key and values.
-                                    properties:
-                                      key:
-                                        description: key is the label key that the
-                                          selector applies to.
-                                        type: string
-                                      operator:
-                                        description: |-
-                                          operator represents a key's relationship to a set of values.
-                                          Valid operators are In, NotIn, Exists and DoesNotExist.
-                                        type: string
-                                      values:
-                                        description: |-
-                                          values is an array of string values. If the operator is In or NotIn,
-                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                                          the values array must be empty. This array is replaced during a strategic
-                                          merge patch.
-                                        items:
-                                          type: string
-                                        type: array
-                                        x-kubernetes-list-type: atomic
-                                    required:
-                                    - key
-                                    - operator
-                                    type: object
-                                  type: array
-                                  x-kubernetes-list-type: atomic
-                                matchLabels:
-                                  additionalProperties:
-                                    type: string
-                                  description: |-
-                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
-                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
-                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                  type: object
-                              type: object
-                              x-kubernetes-map-type: atomic
-                          required:
-                          - expression
-                          type: object
-                          x-kubernetes-validations:
-                          - message: exactly one of the fields in [name selector]
-                              must be set
-                            rule: '[has(self.name),has(self.selector)].filter(x,x==true).size()
-                              == 1'
                         secret:
                           description: Secret references the v1.Secret containing
                             the value that needs to be extracted
@@ -236,10 +148,8 @@ spec:
                           type: object
                       type: object
                       x-kubernetes-validations:
-                      - message: both secret and ref cannot be set
-                        rule: '!(has(self.secret) && has(self.ref))'
-                      - message: one of secret or ref must be set
-                        rule: has(self.secret) || has(self.ref)
+                      - message: secret must be set
+                        rule: has(self.secret)
                   required:
                   - name
                   type: object
@@ -437,13 +347,6 @@ spec:
                     - type
                     x-kubernetes-list-type: map
                 type: object
-              trackedObjects:
-                description: |-
-                  TrackedObjects contains a list of objects being tracked via the greenhouse.sap/tracking-id annotation.
-                  Each entry is in the format "kind/name" (e.g., "Plugin/my-plugin").
-                items:
-                  type: string
-                type: array
               uiApplication:
                 description: UIApplication contains a reference to the frontend that
                   is used for the deployed pluginDefinition version.

charts/manager/templates/_helpers.tpl

@@ -107,13 +107,6 @@ Define postgresql helpers
 {{- define "dex.backend" -}}
   {{- printf "%s" (required "global.dex.backend missing" .Values.global.dex.backend) }}
 {{- end }}
-{{/* Render the plugin expression evaluation flag */}}
-{{- define "plugin.expressionEvaluationEnabled" -}}
-  {{- printf "%t" (required "global.plugin.expressionEvaluationEnabled missing" .Values.global.plugin.expressionEvaluationEnabled) }}
-{{- end }}
-{{- define "plugin.integrationEnabled" -}}
-  {{- printf "%t" (required "global.plugin.integrationEnabled missing" .Values.global.plugin.integrationEnabled) }}
-{{- end }}
 {{- define "plugin.ociMirroringEnabled" -}}
   {{- printf "%t" (required "global.plugin.ociMirroringEnabled missing" .Values.global.plugin.ociMirroringEnabled) }}
 {{- end }}

charts/manager/templates/manager/feature-flag.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "manager.fullname" . }}-feature-flags
 data:
-  _example: >
+  _example: |
     ################################
     #                              #
     #    EXAMPLE CONFIGURATION     #
@@ -15,16 +15,9 @@ data:
     dex: |
       storage: kubernetes / postgres
     # enable plugin features
-    # expressionEvaluationEnabled allows you to enable or disable expression evaluation for plugin option values
-    # set to false to disable expression evaluation (expressions will be used as literal values)
-    # set to true to enable expression evaluation (expressions will be evaluated using CEL)
-    # integrationEnabled allows you to enable or disable plugin to plugin integration features
-    # set true to enable value references from another plugin via CEL expressions
     # ociMirroringEnabled allows you to enable or disable OCI mirroring
     # set to true to enable OCI mirroring, defaults to false
     plugin: |
-      expressionEvaluationEnabled: false / true
-      integrationEnabled: false / true
       ociMirroringEnabled: false / true
     # enable pluginPreset features
     # expressionEvaluationEnabled allows you to enable or disable CEL expression evaluation in PluginPreset
@@ -34,8 +27,6 @@ data:
   dex: |
     storage: {{ include "dex.backend" $ }}
   plugin: |
-    expressionEvaluationEnabled: {{ include "plugin.expressionEvaluationEnabled" $ }}
-    integrationEnabled: {{ include "plugin.integrationEnabled" $ }}
     ociMirroringEnabled: {{ include "plugin.ociMirroringEnabled" $ }}
   pluginPreset: |
     expressionEvaluationEnabled: {{ include "pluginPreset.expressionEvaluationEnabled" $ }}

charts/manager/templates/webhook/webhooks.yaml

@@ -238,7 +238,6 @@ webhooks:
         operations:
           - CREATE
           - UPDATE
-          - DELETE
         resources:
           - clusters
     sideEffects: None

cmd/greenhouse/controllers.go

@@ -81,15 +81,12 @@ func startOrganizationReconciler(name string, mgr ctrl.Manager) error {
 }
 
 // startPluginReconciler initializes the plugin reconciler.
-// Resolves expression evaluation feature flag from greenhouse-feature-flags.
 func startPluginReconciler(name string, mgr ctrl.Manager) error {
 	return (&plugincontrollers.PluginReconciler{
-		KubeRuntimeOpts:             kubeClientOpts,
-		ExpressionEvaluationEnabled: featureFlags.IsExpressionEvaluationEnabled(),
-		IntegrationEnabled:          featureFlags.IsIntegrationEnabled(),
-		OCIMirroringEnabled:         featureFlags.IsOCIMirroringEnabled(),
-		StoragePath:                 artifactStoragePath,
-		HTTPRetry:                   artifactRetries,
+		KubeRuntimeOpts:     kubeClientOpts,
+		OCIMirroringEnabled: featureFlags.IsOCIMirroringEnabled(),
+		StoragePath:         artifactStoragePath,
+		HTTPRetry:           artifactRetries,
 	}).SetupWithManager(name, mgr)
 }
 

dev-env/dev.values.yaml

@@ -6,8 +6,6 @@ global:
   dex:
     backend: kubernetes
   plugin:
-    expressionEvaluationEnabled: true
-    integrationEnabled: true
     ociMirroringEnabled: true
   pluginPreset:
     expressionEvaluationEnabled: true