chore(trait): keep kamelet default location

To maintain backward compatibility
apache · Oct 13, 2023 · f1882dd · f1882dd
1 parent fc70506
commit f1882dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
@@ -205,7 +205,7 @@ func (t *kameletsTrait) addKamelets(e *Environment) error {
 		if e.ApplicationProperties == nil {
 			e.ApplicationProperties = map[string]string{}
 		}
-		e.ApplicationProperties[KameletLocationProperty] = fmt.Sprintf("file:%s", t.MountPoint)
+		e.ApplicationProperties[KameletLocationProperty] = fmt.Sprintf("file:%s,classpath:/kamelets", t.MountPoint)
 		e.Resources.Add(&kameletsBundleConfigmap)
 		// resort dependencies
 		sort.Strings(e.Integration.Status.Dependencies)

diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
@@ -518,6 +518,8 @@ func (e *Environment) configureVolumesAndMounts(vols *[]corev1.Volume, mnts *[]c
 			} else if configMap.Labels[kubernetes.ConfigMapTypeLabel] == "kamelets-bundle" {
 				// Kamelets bundle configmap
 				kameletMountPoint := strings.ReplaceAll(e.ApplicationProperties[KameletLocationProperty], "file:", "")
+				// We need also to remove the default location provided
+				kameletMountPoint = strings.ReplaceAll(kameletMountPoint, ",classpath:/kamelets", "")
 				refName := "kamelets-bundle"
 				vol := getVolume(refName, "configmap", configMap.Name, "", "")
 				mnt := getMount(refName, kameletMountPoint, "", true)