chore(trait): drop support for scanKameletsImplicitLabelSecrets

docs/modules/ROOT/partials/apis/camel-k-crds.adoc

@@ -7921,10 +7921,7 @@ bool
 |
 
 
-Deprecated: include your properties in an explicit property file backed by a secret.
-Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-These secrets are mounted to the application and treated as plain properties file with their key/value list
-(ie .spec.data["camel.my-property"] = my-value) (default `true`).
+Deprecated: no longer available since version 2.5.
 
 
 |===

docs/modules/traits/pages/mount.adoc

@@ -59,10 +59,7 @@ changes in metadata.
 
 | mount.scan-kamelets-implicit-label-secrets
 | bool
-| Deprecated: include your properties in an explicit property file backed by a secret.
-Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-These secrets are mounted to the application and treated as plain properties file with their key/value list
-(ie .spec.data["camel.my-property"] = my-value) (default `true`).
+| Deprecated: no longer available since version 2.5.
 
 |===
 

pkg/apis/camel/v1/trait/mount.go

@@ -40,9 +40,6 @@ type MountTrait struct {
 	// marked with `camel.apache.org/integration` label to be taken in account. The resource will be watched for any kind change, also for
 	// changes in metadata.
 	HotReload *bool `property:"hot-reload" json:"hotReload,omitempty"`
-	// Deprecated: include your properties in an explicit property file backed by a secret.
-	// Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-	// These secrets are mounted to the application and treated as plain properties file with their key/value list
-	// (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+	// Deprecated: no longer available since version 2.5.
 	ScanKameletsImplicitLabelSecrets *bool `property:"scan-kamelets-implicit-label-secrets" json:"scanKameletsImplicitLabelSecrets,omitempty"`
 }

pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml

@@ -1660,11 +1660,8 @@ spec:
                           type: string
                         type: array
                       scanKameletsImplicitLabelSecrets:
-                        description: |-
-                          Deprecated: include your properties in an explicit property file backed by a secret.
-                          Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                          These secrets are mounted to the application and treated as plain properties file with their key/value list
-                          (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                        description: 'Deprecated: no longer available since version
+                          2.5.'
                         type: boolean
                       volumes:
                         description: 'A list of Persistent Volume Claims to be mounted.
@@ -3759,11 +3756,8 @@ spec:
                           type: string
                         type: array
                       scanKameletsImplicitLabelSecrets:
-                        description: |-
-                          Deprecated: include your properties in an explicit property file backed by a secret.
-                          Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                          These secrets are mounted to the application and treated as plain properties file with their key/value list
-                          (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                        description: 'Deprecated: no longer available since version
+                          2.5.'
                         type: boolean
                       volumes:
                         description: 'A list of Persistent Volume Claims to be mounted.

pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml

@@ -1535,11 +1535,8 @@ spec:
                           type: string
                         type: array
                       scanKameletsImplicitLabelSecrets:
-                        description: |-
-                          Deprecated: include your properties in an explicit property file backed by a secret.
-                          Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                          These secrets are mounted to the application and treated as plain properties file with their key/value list
-                          (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                        description: 'Deprecated: no longer available since version
+                          2.5.'
                         type: boolean
                       volumes:
                         description: 'A list of Persistent Volume Claims to be mounted.
@@ -3516,11 +3513,8 @@ spec:
                           type: string
                         type: array
                       scanKameletsImplicitLabelSecrets:
-                        description: |-
-                          Deprecated: include your properties in an explicit property file backed by a secret.
-                          Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                          These secrets are mounted to the application and treated as plain properties file with their key/value list
-                          (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                        description: 'Deprecated: no longer available since version
+                          2.5.'
                         type: boolean
                       volumes:
                         description: 'A list of Persistent Volume Claims to be mounted.

pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml

@@ -7551,11 +7551,8 @@ spec:
                           type: string
                         type: array
                       scanKameletsImplicitLabelSecrets:
-                        description: |-
-                          Deprecated: include your properties in an explicit property file backed by a secret.
-                          Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                          These secrets are mounted to the application and treated as plain properties file with their key/value list
-                          (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                        description: 'Deprecated: no longer available since version
+                          2.5.'
                         type: boolean
                       volumes:
                         description: 'A list of Persistent Volume Claims to be mounted.

pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml

@@ -7623,11 +7623,8 @@ spec:
                               type: string
                             type: array
                           scanKameletsImplicitLabelSecrets:
-                            description: |-
-                              Deprecated: include your properties in an explicit property file backed by a secret.
-                              Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                              These secrets are mounted to the application and treated as plain properties file with their key/value list
-                              (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                            description: 'Deprecated: no longer available since version
+                              2.5.'
                             type: boolean
                           volumes:
                             description: 'A list of Persistent Volume Claims to be

pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml

@@ -7621,11 +7621,8 @@ spec:
                               type: string
                             type: array
                           scanKameletsImplicitLabelSecrets:
-                            description: |-
-                              Deprecated: include your properties in an explicit property file backed by a secret.
-                              Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
-                              These secrets are mounted to the application and treated as plain properties file with their key/value list
-                              (ie .spec.data["camel.my-property"] = my-value) (default `true`).
+                            description: 'Deprecated: no longer available since version
+                              2.5.'
                             type: boolean
                           volumes:
                             description: 'A list of Persistent Volume Claims to be

pkg/trait/kamelets.go

@@ -52,18 +52,6 @@ const (
 	kameletMountPointAnnotation = "camel.apache.org/kamelet.mount-point"
 )
 
-type configurationKey struct {
-	kamelet         string
-	configurationID string
-}
-
-func newConfigurationKey(kamelet, configurationID string) configurationKey {
-	return configurationKey{
-		kamelet:         kamelet,
-		configurationID: configurationID,
-	}
-}
-
 type kameletsTrait struct {
 	BaseTrait
 	traitv1.KameletsTrait `property:",squash"`
@@ -267,30 +255,6 @@ func (t *kameletsTrait) addKameletAsSource(e *Environment, kamelet *v1.Kamelet)
 	return nil
 }
 
-// Deprecated: use explicit secret configuration instead.
-func (t *kameletsTrait) listConfigurationSecrets(e *Environment) ([]string, error) {
-	listConfigurationSecrets := make([]string, 0)
-	for _, k := range t.getConfigurationKeys() {
-		options := metav1.ListOptions{
-			LabelSelector: fmt.Sprintf("%s=%s", kameletLabel, k.kamelet),
-		}
-		if k.configurationID != "" {
-			options.LabelSelector = fmt.Sprintf("%s=%s,%s=%s", kameletLabel, k.kamelet, kameletConfigurationLabel, k.configurationID)
-		}
-		secrets, err := t.Client.CoreV1().Secrets(e.Integration.Namespace).List(e.Ctx, options)
-		if err != nil {
-			return nil, err
-		}
-		for _, item := range secrets.Items {
-			if item.Labels != nil && item.Labels[kameletConfigurationLabel] != k.configurationID {
-				continue
-			}
-			listConfigurationSecrets = append(listConfigurationSecrets, item.Name)
-		}
-	}
-	return listConfigurationSecrets, nil
-}
-
 func (t *kameletsTrait) getKameletKeys() []string {
 	answer := make([]string, 0)
 	for _, item := range strings.Split(t.List, ",") {
@@ -306,36 +270,6 @@ func (t *kameletsTrait) getKameletKeys() []string {
 	return answer
 }
 
-func (t *kameletsTrait) getConfigurationKeys() []configurationKey {
-	answer := make([]configurationKey, 0)
-	for _, item := range t.getKameletKeys() {
-		answer = append(answer, newConfigurationKey(item, ""))
-	}
-	for _, item := range strings.Split(t.List, ",") {
-		i := strings.Trim(item, " \t\"")
-		if strings.Contains(i, "/") {
-			parts := strings.SplitN(i, "/", 2)
-			newKey := newConfigurationKey(parts[0], parts[1])
-			alreadyPresent := false
-			for _, existing := range answer {
-				if existing == newKey {
-					alreadyPresent = true
-					break
-				}
-			}
-			if !alreadyPresent {
-				answer = append(answer, newKey)
-			}
-		}
-	}
-	sort.Slice(answer, func(i, j int) bool {
-		o1 := answer[i]
-		o2 := answer[j]
-		return o1.kamelet < o2.kamelet || (o1.kamelet == o2.kamelet && o1.configurationID < o2.configurationID)
-	})
-	return answer
-}
-
 func integrationSourceFromKameletSource(e *Environment, kamelet *v1.Kamelet, source v1.SourceSpec, name string) (v1.SourceSpec, error) {
 	if source.Type == v1.SourceTypeTemplate {
 		// Kamelets must be named "<kamelet-name>.extension"

pkg/trait/kamelets_test.go

@@ -67,16 +67,6 @@ func TestConfigurationWithKamelets(t *testing.T) {
 	assert.True(t, enabled)
 	assert.Nil(t, condition)
 	assert.Equal(t, []string{"c0", "c1", "c2", "complex-.-.-1a", "complex-.-.-1b", "complex-.-.-1c"}, trait.getKameletKeys())
-	assert.Equal(t, []configurationKey{
-		newConfigurationKey("c0", ""),
-		newConfigurationKey("c1", ""),
-		newConfigurationKey("c2", ""),
-		newConfigurationKey("complex-.-.-1a", ""),
-		newConfigurationKey("complex-.-.-1b", ""),
-		newConfigurationKey("complex-.-.-1b", "a"),
-		newConfigurationKey("complex-.-.-1c", ""),
-		newConfigurationKey("complex-.-.-1c", "b"),
-	}, trait.getConfigurationKeys())
 }
 
 func TestKameletLookup(t *testing.T) {
@@ -369,12 +359,6 @@ func TestKameletConfigLookup(t *testing.T) {
 	assert.True(t, enabled)
 	assert.Nil(t, condition)
 	assert.Equal(t, []string{"timer"}, trait.getKameletKeys())
-	assert.Equal(t, []configurationKey{newConfigurationKey("timer", "")}, trait.getConfigurationKeys())
-
-	list, err := trait.listConfigurationSecrets(environment)
-	require.NoError(t, err)
-	assert.Contains(t, list, "my-secret", "my-secret3")
-	assert.NotContains(t, list, "my-secret2")
 }
 
 func TestKameletNamedConfigLookup(t *testing.T) {
@@ -431,15 +415,6 @@ func TestKameletNamedConfigLookup(t *testing.T) {
 	assert.True(t, enabled)
 	assert.Nil(t, condition)
 	assert.Equal(t, []string{"timer"}, trait.getKameletKeys())
-	assert.Equal(t, []configurationKey{
-		newConfigurationKey("timer", ""),
-		newConfigurationKey("timer", "id2"),
-	}, trait.getConfigurationKeys())
-
-	list, err := trait.listConfigurationSecrets(environment)
-	require.NoError(t, err)
-	assert.Contains(t, list, "my-secret", "my-secret2")
-	assert.NotContains(t, list, "my-secret3")
 }
 
 func TestKameletConditionFalse(t *testing.T) {

pkg/trait/mount.go

@@ -25,11 +25,9 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/utils/ptr"
 
 	serving "knative.dev/serving/pkg/apis/serving/v1"
 
-	v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
 	traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
 	"github.com/apache/camel-k/v2/pkg/util/boolean"
 	"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -60,9 +58,6 @@ func (t *mountTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
 	// Look for secrets which may have been created by service binding trait
 	t.addServiceBindingSecret(e)
 
-	// Look for implicit secrets which may be required by kamelets
-	condition := t.addImplicitKameletsSecrets(e)
-
 	// Validate resources and pvcs
 	for _, c := range t.Configs {
 		if !strings.HasPrefix(c, "configmap:") && !strings.HasPrefix(c, "secret:") {
@@ -75,7 +70,7 @@ func (t *mountTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
 		}
 	}
 
-	return true, condition, nil
+	return true, nil, nil
 }
 
 func (t *mountTrait) Apply(e *Environment) error {
@@ -191,48 +186,3 @@ func (t *mountTrait) addServiceBindingSecret(e *Environment) {
 		}
 	})
 }
-
-// Deprecated: to be removed in future releases.
-func (t *mountTrait) addImplicitKameletsSecrets(e *Environment) *TraitCondition {
-	featureUsed := false
-	if trait := e.Catalog.GetTrait(kameletsTraitID); trait != nil {
-		kamelets, ok := trait.(*kameletsTrait)
-		if !ok {
-			return NewIntegrationCondition(
-				"Mount",
-				v1.IntegrationConditionTraitInfo,
-				corev1.ConditionTrue,
-				traitConfigurationReason,
-				"Unexpected error happened while casting to kamelets trait",
-			)
-		}
-		if !ptr.Deref(t.ScanKameletsImplicitLabelSecrets, true) {
-			return nil
-		}
-		implicitKameletSecrets, err := kamelets.listConfigurationSecrets(e)
-		if err != nil {
-			return NewIntegrationCondition(
-				"Mount",
-				v1.IntegrationConditionTraitInfo,
-				corev1.ConditionTrue,
-				traitConfigurationReason,
-				err.Error(),
-			)
-		}
-		for _, secret := range implicitKameletSecrets {
-			featureUsed = true
-			t.Configs = append(t.Configs, "secret:"+secret)
-		}
-	}
-
-	if featureUsed {
-		return NewIntegrationCondition(
-			"Mount",
-			v1.IntegrationConditionTraitInfo,
-			corev1.ConditionTrue,
-			traitConfigurationReason,
-			"Implicit Kamelet labelling secrets are deprecated and may be removed in future releases. Make sure to use explicit mount.config secrets instead.",
-		)
-	}
-	return nil
-}