This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3526fcfc4b3e6d44c48d0e640b1d7fa03ae019b7
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Mon Dec 18 11:54:09 2023 +0100
fix(ci): don't stop on single Kamelet error
---
pkg/install/kamelets.go | 9 +++++++--
script/Makefile | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pkg/install/kamelets.go b/pkg/install/kamelets.go
index 1a7d41ddf..212ff990f 100644
--- a/pkg/install/kamelets.go
+++ b/pkg/install/kamelets.go
@@ -114,12 +114,17 @@ func KameletCatalog(ctx context.Context, c client.Client,
namespace string) erro
return err
}
v := hasServerSideApply.Load()
+ var bundleKamError error
if vb, ok := v.(bool); ok && vb {
if !once {
- return serverSideApply(gCtx, c, kamelet)
+ bundleKamError = serverSideApply(gCtx,
c, kamelet)
}
} else {
- return clientSideApply(gCtx, c, kamelet)
+ bundleKamError = clientSideApply(gCtx, c,
kamelet)
+ }
+ // We only log the error. If we returned the error, the
creation of the ITP would have stopped
+ if bundleKamError != nil {
+ log.Error(bundleKamError, "Error occurred
whilst applying bundled kamelet")
}
return nil
})
diff --git a/script/Makefile b/script/Makefile
index c0a25a37f..0fb0f2637 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -86,7 +86,7 @@ STAGING_RUNTIME_REPO :=
INSTALL_DEFAULT_KAMELETS ?= true
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Make sure to use a released tag or empty if you want to get the latest
development bits
-KAMELET_CATALOG_REPO_TAG := v4.0.0
+KAMELET_CATALOG_REPO_TAG := v4.2.0
# When performing integration tests, it is not necessary to always execute
build, especially
# in e2e tests when lots of tests are being executed sequentially & the build
has already taken place.
